diff options
author | jlam <jlam@pkgsrc.org> | 2004-11-19 14:54:55 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-11-19 14:54:55 +0000 |
commit | c28d2d2a4893bdcdb5b7261891c11f38385fc484 (patch) | |
tree | 599b0608782f7fc37469c2be7d2a2ca4d52c8442 /security/PAM | |
parent | 38e87d6598fb59e5b79d43fe7515d29c29059d46 (diff) | |
download | pkgsrc-c28d2d2a4893bdcdb5b7261891c11f38385fc484.tar.gz |
Fix brokenness I introduced in the conversion of security/PAM to use
libtool: the PAM libraries weren't being built with -DPAM_DYNAMIC, which
made it impossible to dlopen PAM modules.
Bump PKGREVISION.
Diffstat (limited to 'security/PAM')
-rw-r--r-- | security/PAM/Makefile | 4 | ||||
-rw-r--r-- | security/PAM/buildlink3.mk | 4 | ||||
-rw-r--r-- | security/PAM/distinfo | 18 | ||||
-rw-r--r-- | security/PAM/patches/patch-ad | 11 | ||||
-rw-r--r-- | security/PAM/patches/patch-ae | 8 | ||||
-rw-r--r-- | security/PAM/patches/patch-af | 11 | ||||
-rw-r--r-- | security/PAM/patches/patch-ah | 4 | ||||
-rw-r--r-- | security/PAM/patches/patch-at | 7 | ||||
-rw-r--r-- | security/PAM/patches/patch-au | 4 | ||||
-rw-r--r-- | security/PAM/patches/patch-av | 4 | ||||
-rw-r--r-- | security/PAM/patches/patch-aw | 4 |
11 files changed, 50 insertions, 29 deletions
diff --git a/security/PAM/Makefile b/security/PAM/Makefile index c68f683467e..f48f32af3d6 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2004/11/16 07:46:57 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2004/11/19 14:54:55 jlam Exp $ # DISTNAME= Linux-PAM-0.77 PKGNAME= ${DISTNAME:S/Linux-//} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= http://www.kernel.org/pub/linux/libs/pam/pre/library/ \ ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/ \ diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index 60218ab87f0..44f9f3f7e6f 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2004/11/16 07:46:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2004/11/19 14:54:55 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= pam .if !empty(PAM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.pam+= PAM>=0.75 -BUILDLINK_RECOMMENDED.pam+= PAM>=0.77nb3 +BUILDLINK_RECOMMENDED.pam+= PAM>=0.77nb4 BUILDLINK_PKGSRCDIR.pam?= ../../security/PAM .endif # PAM_BUILDLINK3_MK diff --git a/security/PAM/distinfo b/security/PAM/distinfo index ed8fe52da5b..d8253e9d182 100644 --- a/security/PAM/distinfo +++ b/security/PAM/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.10 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: distinfo,v 1.11 2004/11/19 14:54:55 jlam Exp $ SHA1 (Linux-PAM-0.77.tar.gz) = 58dff29aec3c0b6a9e9b53af6fb643056ce0f304 Size (Linux-PAM-0.77.tar.gz) = 442569 bytes SHA1 (patch-aa) = 99f4889c24ff71a9e40e0e913d6071b78a326877 SHA1 (patch-ab) = 02fbb08bc8f74860eada3bdb23333ec5c191f124 SHA1 (patch-ac) = dfd528bc187fcfeaedaee0418549ac6a65c644f4 -SHA1 (patch-ad) = 9e43f70d1b772727c0ef4e14e6cb12a15128c9a3 -SHA1 (patch-ae) = a630453cc887fabee3a52cceea1e2aa5cec3f9ca -SHA1 (patch-af) = a6ca640f46457998146f4ea5efb06577b76fc57d +SHA1 (patch-ad) = 336101bd1779715eac39f4ef5e923745defd438f +SHA1 (patch-ae) = 58c67c5ba430d2c5788717c6c7373dbf84d7b424 +SHA1 (patch-af) = 10917af14f4bfd27c7872144ca215efdfe68d132 SHA1 (patch-ag) = 6329935d62d0ff82b6bf12783a600ccee28032aa -SHA1 (patch-ah) = 5fb98628d5fcec8a7a76f3743d5e960b3279ba18 +SHA1 (patch-ah) = 93ae27987cda8a7bc04957066a569470f035aac8 SHA1 (patch-ai) = 950c9e949c72eaf904452d8afefc0f994101e5a8 SHA1 (patch-aj) = d47bc58c3dc810497290d6ec4a3646380b5fa4d7 SHA1 (patch-ak) = 491aa837ee756269d57d642aeba999d1f8cc8187 @@ -21,8 +21,8 @@ SHA1 (patch-ap) = 0a923b67a909dde6f72129b0c853088f9d48bd91 SHA1 (patch-aq) = 91587c5b9c6587221708247decb0e82f665ae2bf SHA1 (patch-ar) = b8072ebbc1a38c26d44c0e087a2b8b93f1eb7768 SHA1 (patch-as) = e4fdfef53c097985c2aa8ff8225fed1caa812c10 -SHA1 (patch-at) = c4ec24d53daf467a05b7e5875625d4ba37288cb1 -SHA1 (patch-au) = 21000d628f7d1c99ea8914069f1db41fc37dcab0 -SHA1 (patch-av) = bc74f55d71f84abe3c3c80b970b049343c3716af -SHA1 (patch-aw) = fe1ddef649a736459ff998b6abd96d7b3f522838 +SHA1 (patch-at) = 48d8874962407ad79a84aa8610d3ff490af2fe4b +SHA1 (patch-au) = 6c1327faf2ec9f1ff74f01443075852bf94f3788 +SHA1 (patch-av) = 98c7b6ea2ba655cb405492eddba2f9d246b08817 +SHA1 (patch-aw) = d56fd3ca5093af306b0ceab5f81cb7bc6fd237de SHA1 (patch-ax) = 16f4ef37306f05a9792684440a802bed727b03df diff --git a/security/PAM/patches/patch-ad b/security/PAM/patches/patch-ad index 215a838e2a0..64acce0a177 100644 --- a/security/PAM/patches/patch-ad +++ b/security/PAM/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.5 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2004/11/19 14:54:55 jlam Exp $ --- libpam/Makefile.orig 2001-12-09 16:44:58.000000000 -0500 +++ libpam/Makefile @@ -11,6 +11,15 @@ $NetBSD: patch-ad,v 1.5 2004/11/16 07:46:57 jlam Exp $ ifeq ($(WITH_LIBDEBUG),yes) LIBNAME=libpamd +@@ -22,7 +22,7 @@ dummy: ../Make.Rules all + + # --------------------------------------------- + +-CFLAGS += $(DYNAMIC) $(STATIC) $(MOREFLAGS) \ ++CFLAGS += $(DYNAMIC) $(STATIC) $(LTCFLAGS) $(MOREFLAGS) \ + -DLIBPAM_VERSION_MAJOR=$(MAJOR_REL) \ + -DLIBPAM_VERSION_MINOR=$(MINOR_REL) + @@ -36,6 +36,10 @@ LIBPAMFULL = $(LIBPAMNAME)$(MODIFICATION LIBPAMSTATIC = $(LIBNAME).a diff --git a/security/PAM/patches/patch-ae b/security/PAM/patches/patch-ae index bce44d12cb9..45f5dc3716a 100644 --- a/security/PAM/patches/patch-ae +++ b/security/PAM/patches/patch-ae @@ -1,11 +1,13 @@ -$NetBSD: patch-ae,v 1.5 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-ae,v 1.6 2004/11/19 14:54:55 jlam Exp $ --- libpam_misc/Makefile.orig 2002-06-27 00:04:54.000000000 -0400 +++ libpam_misc/Makefile -@@ -16,7 +16,12 @@ VERSION=.$(MAJOR_REL) +@@ -15,8 +15,13 @@ endif + VERSION=.$(MAJOR_REL) MODIFICATION=.$(MINOR_REL) - CFLAGS += $(MOREFLAGS) $(DYNAMIC) $(STATIC) +-CFLAGS += $(MOREFLAGS) $(DYNAMIC) $(STATIC) ++CFLAGS += $(MOREFLAGS) $(DYNAMIC) $(STATIC) $(LTCFLAGS) +ifeq ($(DYNAMIC_LIBPAM),yes) LINKLIBS += -L$(absolute_objdir)/libpam -lpam +endif diff --git a/security/PAM/patches/patch-af b/security/PAM/patches/patch-af index 367a2ebe616..6c69cccffe1 100644 --- a/security/PAM/patches/patch-af +++ b/security/PAM/patches/patch-af @@ -1,7 +1,16 @@ -$NetBSD: patch-af,v 1.4 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-af,v 1.5 2004/11/19 14:54:55 jlam Exp $ --- libpamc/Makefile.orig 2001-02-10 02:17:53.000000000 -0500 +++ libpamc/Makefile +@@ -15,7 +15,7 @@ endif + VERSION=.$(MAJOR_REL) + MODIFICATION=.$(MINOR_REL) + +-CFLAGS += $(MOREFLAGS) $(DYNAMIC) $(STATIC) ++CFLAGS += $(MOREFLAGS) $(DYNAMIC) $(STATIC) $(LTCFLAGS) + + # dynamic library names + @@ -27,6 +27,10 @@ LIBNAMEDFULL = $(LIBNAMEDNAME)$(MODIFICA LIBNAMEDSTATIC = $(LIBNAME).a diff --git a/security/PAM/patches/patch-ah b/security/PAM/patches/patch-ah index c985965900e..747624fc41b 100644 --- a/security/PAM/patches/patch-ah +++ b/security/PAM/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.5 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-ah,v 1.6 2004/11/19 14:54:55 jlam Exp $ --- modules/Simple.Rules.orig 2001-12-09 17:15:11.000000000 -0500 +++ modules/Simple.Rules @@ -46,7 +46,7 @@ $NetBSD: patch-ah,v 1.5 2004/11/16 07:46:57 jlam Exp $ $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(STATIC) $(TARGET_ARCH) -c $< -o $@ +%.lo : %.c -+ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) -DPAM_DYNAMIC $(TARGET_ARCH) -c $< ++ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(LTCFLAGS) $(TARGET_ARCH) -c $< + dirs: ifdef DYNAMIC diff --git a/security/PAM/patches/patch-at b/security/PAM/patches/patch-at index 4582abcda5a..ac08892e660 100644 --- a/security/PAM/patches/patch-at +++ b/security/PAM/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.4 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-at,v 1.5 2004/11/19 14:54:55 jlam Exp $ --- Make.Rules.in.orig 2002-06-27 00:04:54.000000000 -0400 +++ Make.Rules.in -@@ -75,10 +75,13 @@ WITH_MEMORY_DEBUG=@WITH_MEMORY_DEBUG@ +@@ -75,10 +75,14 @@ WITH_MEMORY_DEBUG=@WITH_MEMORY_DEBUG@ WITH_LIBDEBUG=@WITH_LIBDEBUG@ WITH_PAMLOCKING=@WITH_PAMLOCKING@ WITH_LCKPWDF=@WITH_LCKPWDF@ @@ -15,12 +15,13 @@ $NetBSD: patch-at,v 1.4 2004/11/16 07:46:57 jlam Exp $ +LIBTOOL_LIBPAM=yes +STATIC= +DYNAMIC= ++LTCFLAGS=-DPAM_DYNAMIC +LIBTOOL=@LIBTOOL@ +SHLIBTOOL=@SHLIBTOOL@ # Location of libraries when installed on the system FAKEROOT=@FAKEROOT@ -@@ -104,7 +107,7 @@ LIBDL=@LIBDL@ +@@ -104,7 +108,7 @@ LIBDL=@LIBDL@ MKDIR=@MKDIR@ INSTALL=@INSTALL@ RANLIB=@RANLIB@ diff --git a/security/PAM/patches/patch-au b/security/PAM/patches/patch-au index b57338d7339..c8e63df8283 100644 --- a/security/PAM/patches/patch-au +++ b/security/PAM/patches/patch-au @@ -1,4 +1,4 @@ -$NetBSD: patch-au,v 1.4 2004/11/16 07:46:57 jlam Exp $ +$NetBSD: patch-au,v 1.5 2004/11/19 14:54:55 jlam Exp $ --- modules/pam_filter/Makefile.orig 2001-11-11 02:43:54.000000000 -0500 +++ modules/pam_filter/Makefile @@ -15,7 +15,7 @@ $NetBSD: patch-au,v 1.4 2004/11/16 07:46:57 jlam Exp $ $(CC) $(CFLAGS) $(STATIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ +%.lo : %.c -+ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) -DPAM_DYNAMIC $(TARGET_ARCH) -c $< ++ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(LTCFLAGS) $(TARGET_ARCH) -c $< + ifdef DYNAMIC LIBSHARED = $(TITLE).so diff --git a/security/PAM/patches/patch-av b/security/PAM/patches/patch-av index 76afc559bcc..ba8761466ea 100644 --- a/security/PAM/patches/patch-av +++ b/security/PAM/patches/patch-av @@ -1,4 +1,4 @@ -$NetBSD: patch-av,v 1.4 2004/11/16 07:46:58 jlam Exp $ +$NetBSD: patch-av,v 1.5 2004/11/19 14:54:55 jlam Exp $ --- modules/pam_tally/Makefile.orig 2001-06-27 02:20:43.000000000 -0400 +++ modules/pam_tally/Makefile @@ -15,7 +15,7 @@ $NetBSD: patch-av,v 1.4 2004/11/16 07:46:58 jlam Exp $ $(CC) $(CFLAGS) $(STATIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ +%.lo : %.c -+ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -DPAM_DYNAMIC $(TARGET_ARCH) -c $< ++ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(LTCFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< ifdef DYNAMIC LIBSHARED = $(TITLE).so diff --git a/security/PAM/patches/patch-aw b/security/PAM/patches/patch-aw index eed6738364b..a39f3f5d3e2 100644 --- a/security/PAM/patches/patch-aw +++ b/security/PAM/patches/patch-aw @@ -1,4 +1,4 @@ -$NetBSD: patch-aw,v 1.4 2004/11/16 07:46:58 jlam Exp $ +$NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $ --- modules/pam_unix/Makefile.orig 2001-02-11 01:33:53.000000000 -0500 +++ modules/pam_unix/Makefile @@ -41,7 +41,7 @@ $NetBSD: patch-aw,v 1.4 2004/11/16 07:46:58 jlam Exp $ $(CC) $(CFLAGS) $(STATIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ +%.lo : %.c -+ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -DPAM_DYNAMIC $(TARGET_ARCH) -c $< ++ $(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(LTCFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< + dummy: @echo "**** This is not a top-level Makefile " |