HCoop / hcoop / debian / courier-authlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Import Debian package 0.61.0-1+lenny1
[hcoop/debian/courier-authlib.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index d4a7d38..4faed97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,18 @@
-# $Id: Makefile.am,v 1.123 2007/10/07 02:50:45 mrsam Exp $
+# $Id: Makefile.am,v 1.134 2008/07/12 19:40:55 mrsam Exp $
 #
-# Copyright 1998 - 2007 Double Precision, Inc.  See COPYING for
+# Copyright 1998 - 2008 Double Precision, Inc.  See COPYING for
 # distribution information.
 
 AUTOMAKE_OPTIONS=dist-bzip2
 
-SUBDIRS=@LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
-DIST_SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
 
 INCLUDES = $(LTDLINCL)
 
 modules=@LIBAUTHUSERDB@ \
        @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
        @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \
-       @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
+       @LIBAUTHCUSTOM@ @LIBAUTHPIPE@
 
 pkglibexecdir=$(libexecdir)/courier-authlib
 pkglibexec_SCRIPTS=authsystem.passwd
@@ -27,14 +26,13 @@ bin_PROGRAMS=courierauthconfig
 
 EXTRA_LTLIBRARIES=libauthuserdb.la \
        libauthpam.la libauthpwd.la libauthshadow.la \
-       libauthvchkpw.la \
        libauthpgsql.la \
        libauthldap.la \
        libauthmysql.la \
        libauthcustom.la \
        libauthpipe.la
 
-CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
+CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h \
        authpgsqlrc.h authpiperc.h authdaemon \
        authlib.3 authlib.html packageversion.h \
        authchangepwdir.h sbindir.h pkglibdir.h pkgincludedir.h \
@@ -44,7 +42,7 @@ CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
 DISTCLEANFILES=dbobj.config README_authlib.html
 
 commonlibdep=libcourierauthcommon.la
-commonldflags=-module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
+commonldflags=-module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
 commonlibadd=libcourierauthcommon.la
 
 libcourierauthcommon_t=@CRYPTLIBS@
@@ -56,19 +54,19 @@ libcourierauthcommon_la_SOURCES= \
        authsyschangepwd.c authsyscommon.c \
        cramlib.c cramlib.h \
        checkpassword.c cryptpassword.c \
-       $(checkpasswordmd5c) $(checkpasswordsha1c)
+       checkpasswordmd5.c checkpasswordsha1.c
 
 libcourierauthcommon_la_DEPENDENCIES=libcourierauth.la
 libcourierauthcommon_la_LIBADD=libcourierauth.la
-libcourierauthcommon_la_LDFLAGS=$(libcourierauthcommon_t:%=-Wl,%)
+libcourierauthcommon_la_LDFLAGS=$(libcourierauthcommon_t:%=-Wl,%) -avoid-version
 
 libcourierauth_la_SOURCES=authdaemon.c authdaemonlib.c preauthdaemon.c \
        authmoduser2.c authmoduser3.c debug.c \
        courierauthdebug.h \
        authoption.c
-libcourierauth_la_LIBADD=@HMACLIB@ @MD5LIB@ @SHA1LIB@ numlib/libnumlib.la \
+libcourierauth_la_LIBADD=libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
        random128/librandom128.la rfc822/libencode.la
-libcourierauth_la_LDFLAGS=@NETLIBS@
+libcourierauth_la_LDFLAGS=@NETLIBS@ -avoid-version
 
 # The userdb module
 
@@ -85,8 +83,8 @@ libauthpam_t=-lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@
 
 libauthpam_la_SOURCES=authpam.c preauthpam.c authwait.h
 libauthpam_la_DEPENDENCIES=$(commonlibdep)
-libauthpam_la_LIBADD=$(commonlibadd)
-libauthpam_la_LDFLAGS=$(commonldflags) $(libauthpam_t)
+libauthpam_la_LIBADD=$(commonlibadd) $(libauthpam_t)
+libauthpam_la_LDFLAGS=$(commonldflags)
 
 # The authpwd module
 
@@ -101,22 +99,8 @@ libauthshadow_t=@SHADOWLIBS@
 
 libauthshadow_la_SOURCES=authshadow.c preauthshadow.c
 libauthshadow_la_DEPENDENCIES=$(commonlibdep)
-libauthshadow_la_LIBADD=$(commonlibadd)
-libauthshadow_la_LDFLAGS=$(commonldflags) $(libauthshadow_t)
-
-# The authvchkpw module
-
-libauthvchkpw_t=@VPOPMAILLIBS@ @LIBM@
-libauthvchkpw_la_SOURCES=authvchkpw.c authvchkpwlib.c preauthvchkpw.c
-libauthvchkpw_la_DEPENDENCIES=$(commonlibdep)
-libauthvchkpw_la_LIBADD=$(commonlibadd)
-libauthvchkpw_la_LDFLAGS=$(commonldflags) $(libauthvchkpw_t)
-
-authvchkpw.lo: authvchkpw.c vpopmail_config.h
-preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
-
-vpopmail_config.h:
-       echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
+libauthshadow_la_LIBADD=$(commonlibadd) $(libauthshadow_t)
+libauthshadow_la_LDFLAGS=$(commonldflags)
 
 # The authpgsql module
 
@@ -124,12 +108,11 @@ libauthpgsql_t=@PGSQL_LIBS@ @LIBM@ @NETLIBS@
 
 libauthpgsql_la_SOURCES=authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
 libauthpgsql_la_DEPENDENCIES=$(commonlibdep)
-libauthpgsql_la_LIBADD=$(commonlibadd)
-libauthpgsql_la_LDFLAGS=$(commonldflags) $(libauthpgsql_t)
+libauthpgsql_la_LIBADD=$(commonlibadd) $(libauthpgsql_t)
+libauthpgsql_la_LDFLAGS=$(commonldflags)
 
 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
 
-
 if HAVE_AUTHPGSQL
 
 install-authpgsqlrc:
@@ -160,8 +143,8 @@ authpgsqlrc.h:
 libauthldap_t=@LDAPLIBS@ @NETLIBS@
 libauthldap_la_SOURCES=authldap.c preauthldap.c authldaplib.c authldap.h
 libauthldap_la_DEPENDENCIES=$(commonlibdep)
-libauthldap_la_LIBADD=$(commonlibadd)
-libauthldap_la_LDFLAGS=$(commonldflags) $(libauthldap_t)
+libauthldap_la_LIBADD=$(commonlibadd) $(libauthldap_t)
+libauthldap_la_LDFLAGS=$(commonldflags)
 
 authldaplib.lo: authldaplib.c authldaprc.h
 
@@ -194,8 +177,8 @@ libauthmysql_t=@MYSQL_LIBS@ @LIBM@ @NETLIBS@
 
 libauthmysql_la_SOURCES=authmysql.c preauthmysql.c authmysqllib.c authmysql.h
 libauthmysql_la_DEPENDENCIES=$(commonlibdep)
-libauthmysql_la_LIBADD=$(commonlibadd)
-libauthmysql_la_LDFLAGS=$(commonldflags) $(libauthmysql_t)
+libauthmysql_la_LIBADD=$(commonlibadd) $(libauthmysql_t)
+libauthmysql_la_LDFLAGS=$(commonldflags)
 
 authmysqllib.lo: authmysqllib.c authmysqlrc.h
 
@@ -248,19 +231,6 @@ noinst_PROGRAMS= \
        authdaemontest authmksock \
        authdaemondprog
 
-
-if HAVE_MD5
-checkpasswordmd5c=checkpasswordmd5.c
-else
-checkpasswordmd5c=
-endif
-
-if HAVE_SHA1
-checkpasswordsha1c=checkpasswordsha1.c
-else
-checkpasswordsha1c=
-endif
-
 install-authdaemonrc:
        $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
        sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
@@ -284,7 +254,6 @@ HTMLFILES=README.html NEWS.html INSTALL.html \
 
 EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
        authldap.schema \
-       checkpasswordmd5.c checkpasswordsha1.c \
        authldaprc authmysqlrc authpgsqlrc README.ldap \
        README.authmysql.myownquery \
        README.authdebug.html.in \
@@ -317,15 +286,16 @@ libcourierauthsasl_la_SOURCES=\
        authsaslcram.c authsasllogin.c authsaslplain.c \
        authsaslfrombase64.c authsasltobase64.c
 libcourierauthsasl_la_LIBADD=libcourierauth.la
-libcourierauthsasl_la_LDFLAGS=-export-symbols-regex '^auth_sasl$$'
+libcourierauthsasl_la_LDFLAGS=-export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
 
 libcourierauthsaslclient_la_SOURCES=courierauthsaslclient.h \
        authsaslclient.c authsaslclient.h authsaslclientcram.c \
        authsaslclientcrammd5.c authsaslclientcramsha1.c \
        authsaslclientlogin.c authsaslclientplain.c \
+       authsaslclientexternal.c \
        authsaslfrombase64.c authsasltobase64.c
 libcourierauthsaslclient_la_LIBADD=libcourierauth.la
-libcourierauthsaslclient_la_LDFLAGS=-export-symbols-regex '^auth_sasl_client$$'
+libcourierauthsaslclient_la_LDFLAGS=-export-symbols-regex '^auth_sasl_client$$' -avoid-version
 
 include_HEADERS=courier_auth_config.h courierauth.h courierauthsasl.h \
        courierauthsaslclient.h courierauthdebug.h
@@ -375,7 +345,7 @@ man1=authpasswd.1 authtest.1
 man_MANS=$(man1) $(man3)
 
 BUILT1=authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
-       authdaemonrc.h vpopmail_config.h packageversion.h \
+       authdaemonrc.h packageversion.h \
        authchangepwdir.h sbindir.h \
        pkglibdir.h pkgincludedir.h mailusergroup.h \
        README_authlib.html
@@ -423,8 +393,6 @@ install-exec-hook:
        test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
                $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
                                $(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-               $(INSTALL_SCRIPT) userdb/vchkpw2userdb \
-                               $(DESTDIR)$(sbindir)/vchkpw2userdb ; \
                $(INSTALL_SCRIPT) userdb/pw2userdb \
                                $(DESTDIR)$(sbindir)/pw2userdb ; \
                $(INSTALL_SCRIPT) userdb/makeuserdb \
@@ -435,17 +403,19 @@ install-exec-hook:
                                $(DESTDIR)$(sbindir)/userdbpw ; \
                $(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
                                $(DESTDIR)$(sbindir)/userdb-test-cram-md5
+       for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
+
 
 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
        rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
        test "@AUTHUSERDB@" = "" && exit 0 ;\
                rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
-                               $(DESTDIR)$(sbindir)/vchkpw2userdb \
                                $(DESTDIR)$(sbindir)/pw2userdb \
                                $(DESTDIR)$(sbindir)/makeuserdb \
                                $(DESTDIR)$(sbindir)/userdb \
                                $(DESTDIR)$(sbindir)/userdbpw \
                                $(DESTDIR)$(sbindir)/userdb-test-cram-md5
+       for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0; done
 
 authlib.html: authlib.html.in
        CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
@@ -615,19 +585,17 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
        mv @PACKAGE@.lpspec.new @PACKAGE@.lpspec
 
 upload-beta:
+       test -z "$(SFPASSWD)" && exit 1; exit 0
        rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
        socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta
-       ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@-dev && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
-       scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@-dev/@PACKAGE@-@VERSION@
+       rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
+       ../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` "" "" @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
 
 upload-dist:
        rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
        socksify cvs tag -F -r @PACKAGE@-latest \
                `echo @PACKAGE@-@VERSION@ | tr '.' '-'`
-       socksify perl -e 'use Net::FTP; $$ftp=Net::FTP->new("upload.sourceforge.net.", Debug => 1, Passive => 1 ) || die; $$ftp->login("anonymous", "anonymous") || die; $$ftp->cwd("/incoming") && $$ftp->binary() && $$ftp->hash(1) && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2") && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2.sig") && exit 0; die;'
-       ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@ && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
-       scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@/@PACKAGE@-@VERSION@
-
+       rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
 
 release-dist:
        test -z "$(SFPASSWD)" && exit 1; exit 0
courier-authlib packaging