all: scripts to create installable *.deb packages.

7 files changed, 25 insertions, 14 deletions

diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog
index 18aab74..e3a1a4a 100644
--- a/sqwebmail/ChangeLog
+++ b/sqwebmail/ChangeLog
@@ -1,3 +1,8 @@
+2022-04-14  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* Add scripts to create installable .deb packages, update
+	documentation.
+
 2022-03-23  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* configure.ac: Search for either "ispell" or "aspell".
diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am
index 083f71c..9cf514b 100644
--- a/sqwebmail/Makefile.am
+++ b/sqwebmail/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS=@CPPAUTH@
 
 CLEANFILES=htmllibdir.h ldapsearch webgpg ldapaddressbook.dist \
 	cron.cmd sqwebmail.msg TIMEZONELIST
-DISTCLEANFILES=webmail.authpam
+DISTCLEANFILES=webmail.authpam common.authpam
 
 SUBDIRS=images html
 
@@ -68,7 +68,7 @@ $(GITFILES): %: %.git
 endif
 
 EXTRA_DIST=$(DOCS) sqwebmail.pamconf sqwebmail-system-auth.pamconf\
-	 sqwebmail-system-auth2.pamconf\
+	 sqwebmail-common.pamconf sqwebmail-system-auth2.pamconf\
            strdup.c strcasecmp.c strncasecmp.c sv-make_timezonelist.pl\
            $(ISPELLSOURCES) \
 	testhtml.tst testhtml.txt testlogindomainlist.sh testlogindomainlist.txt
@@ -107,19 +107,17 @@ sqwebmail_LDFLAGS=-static
 sqwebpasswd_SOURCES=sqwebpasswd.c
 sqwebpasswd_LDADD=@NETLIBS@ @LDAUTH@ -lcourierauth
 
-HTML2TXT=`which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
-
 SECURITY: SECURITY.html
 	rm -f SECURITY
-	$(HTML2TXT) $(srcdir)/SECURITY.html >SECURITY
+	elinks -dump -no-numbering $(srcdir)/SECURITY.html >SECURITY
 
 BUGS: BUGS.html
 	rm -f BUGS
-	$(HTML2TXT) $(srcdir)/BUGS.html >BUGS
+	elinks -dump -no-numbering $(srcdir)/BUGS.html >BUGS
 
 TODO: TODO.html
 	rm -f TODO
-	$(HTML2TXT) $(srcdir)/TODO.html >TODO
+	elinks -dump -no-numbering $(srcdir)/TODO.html >TODO
 
 TIMEZONELIST: sv-make_timezonelist.pl
 	rm -f TIMEZONELIST
diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac
index 1f5e2dc..d23672a 100644
--- a/sqwebmail/configure.ac
+++ b/sqwebmail/configure.ac
@@ -98,7 +98,7 @@ fi
 AC_ARG_WITH(ispell,
 [  --without-ispell      Do not compile ispell support
   --with-ispell=prog    Pathname to ispell (if not in default path)],
-	ispell="$withval", [ AC_PATH_PROGS(ispell, ispell aspell, N, $LPATH) ] )
+	ispell="$withval", [ AC_PATH_PROGS(ispell, aspell ispell, N, $LPATH) ] )
 
 case $ispell in
 "/"*)
@@ -458,6 +458,12 @@ then
 	fi
 fi
 
+if test -f /etc/pam.d/common-auth
+then
+	cp -f $srcdir/sqwebmail-common.pamconf webmail.authpam
+fi
+
+
 AC_ARG_WITH(mailuser, [], mailuser="$withval",
 	AC_MSG_ERROR(--with-mailuser missing))
 AC_ARG_WITH(mailgroup, [], mailgroup="$withval",
diff --git a/sqwebmail/html/Makefile.am b/sqwebmail/html/Makefile.am
index ba38a4d..a88ffa1 100644
--- a/sqwebmail/html/Makefile.am
+++ b/sqwebmail/html/Makefile.am
@@ -29,7 +29,7 @@ install-perms-recursive:
 install-perms-local:
 	@${srcdir}/lstsoftlinks `cat ${srcdir}/*/LANGUAGE_PREF | sort | awk ' { print $$2 } ' | sort | uniq` | sort | uniq | while read F ; \
 	do echo "$(htmllibdir)/$$F 644 bin bin" ; done >>permissions.dat
-	@echo "$(htmllibdir) 555 bin bin"  >>permissions.dat
+	@echo "$(htmllibdir) 755 bin bin"  >>permissions.dat
 
 clone:
 	@test -d ${srcdir}/${to} || exit 0; echo ${srcdir}/${to} already exists. ; exit 1
@@ -39,7 +39,5 @@ clone:
 	echo ${to} >${srcdir}/${to}/LANGUAGE
 	cd ${srcdir}/${to} ; pref=`awk ' { print $$1 }' <LANGUAGE_PREF` ; echo $$pref ${to} >LANGUAGE_PREF
 
-HTML2TXT=`which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
-
 README_LANG.txt: README_LANG.html
-	$(HTML2TXT) README_LANG.html >README_LANG.txt
+	elinks -dump -no-numbering README_LANG.html >README_LANG.txt
diff --git a/sqwebmail/html/en-us/Makefile.am b/sqwebmail/html/en-us/Makefile.am
index 5f5bded..0ec4435 100644
--- a/sqwebmail/html/en-us/Makefile.am
+++ b/sqwebmail/html/en-us/Makefile.am
@@ -35,7 +35,7 @@ clonedist: distdir
 	-rm -rf $(distdir)
 
 install-perms:
-	@echo "$(htmllibdir) 555 bin bin" >permissions.dat
+	@echo "$(htmllibdir) 755 bin bin" >permissions.dat
 	@for f in $(conf) ; do\
 		echo $(htmllibdir)/$$f 644 bin bin config >>permissions.dat ;\
 		done
diff --git a/sqwebmail/html/en-us/configure.ac b/sqwebmail/html/en-us/configure.ac
index ab788e4..fc54ed1 100644
--- a/sqwebmail/html/en-us/configure.ac
+++ b/sqwebmail/html/en-us/configure.ac
@@ -1,6 +1,6 @@
 dnl
 
-AC_INIT(sqwebmail, 0.11, [courier-sqwebmail@lists.sourceforge.net])
+AC_INIT(sqwebmail-en-us, 0.1, [courier-sqwebmail@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
diff --git a/sqwebmail/sqwebmail-common.pamconf b/sqwebmail/sqwebmail-common.pamconf
new file mode 100644
index 0000000..ad8dcee
--- /dev/null
+++ b/sqwebmail/sqwebmail-common.pamconf
@@ -0,0 +1,4 @@
+@include common-auth
+@include common-account
+@include common-session
+@include common-password