head 1.8; access; symbols pkgsrc-2014Q1:1.7.0.34 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.32 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.30 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.28 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.26 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.24 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.22 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.20 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.18 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.16 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.14 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.12 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.10 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.8 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.6 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.4 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.2 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.6.0.46 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.44 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.42 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.40 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.38 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.36 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.34 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.32 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.30 pkgsrc-2008Q1:1.6.0.28 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.26 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.24 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.22 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.20 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.18 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.16 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.14 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.12 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.4.0.6 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.4 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 buildlink2-base:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2014.06.10.13.54.30; author joerg; state dead; branches; next 1.7; commitid Bfz6AmAQXMitTYDx; 1.7 date 2010.02.02.17.09.28; author tnn; state Exp; branches; next 1.6; 1.6 date 2004.11.19.14.54.55; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.11.16.07.46.57; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.01.08.00.07.26; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.12.23.21.23.58; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.01.29.17.10.11; author jlam; state dead; branches; next 1.1; 1.1 date 2000.10.21.18.41.54; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.10.21.18.41.54; author rh; state Exp; branches; next ; desc @@ 1.8 log @Remove outdated security/PAM. @ text @$NetBSD: patch-ad,v 1.7 2010/02/02 17:09:28 tnn Exp $ --- libpam/Makefile.orig 2001-12-09 21:44:58.000000000 +0000 +++ libpam/Makefile @@@@ -6,7 +6,7 @@@@ include ../Make.Rules # need to tell libpam about the default directory for PAMs -MOREFLAGS=-D"DEFAULT_MODULE_PATH=\"$(SECUREDIR)/\"" +MOREFLAGS=-D"DEFAULT_MODULE_PATH=\"$(PAM_MODULEDIR)/\"" 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 +# libtool library name + +LIBPAMLIBTOOL = $(LIBNAME).la + ifdef STATIC @@echo Did you mean to set STATIC\? MODULES = $(shell cat ../modules/_static_module_objects) @@@@ -56,7 +60,7 @@@@ LIBOBJECTS = pam_item.o pam_strerror.o p ifeq ($(DYNAMIC_LIBPAM),yes) # libpam.so needs -ldl, too. DLIBOBJECTS = $(addprefix dynamic/,$(LIBOBJECTS) $(STATICOBJ)) -ifeq ($(STATICOBJ),yes) +ifdef STATICOBJ dynamic/pam_static.o: pam_static.c ../modules/_static_module_objects $(CC) $(CFLAGS) -c pam_static.c -o $@@ endif @@@@ -70,10 +74,28 @@@@ static/pam_static.o: pam_static.c ../mod endif endif +ifeq ($(LIBTOOL_LIBPAM),yes) +LALIBOBJECTS = $(LIBOBJECTS:.o=.lo) $(STATICOBJ:.o=.lo) +ifdef STATICOBJ +pam_static.lo: pam_static.c ../modules/_static_module_objects + $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c pam_static.c +endif +endif + # --------------------------------------------- ## rules -all: dirs $(LIBPAM) $(LIBPAMSTATIC) ../Make.Rules +ifeq ($(DYNAMIC_LIBPAM),yes) +LIBS_TO_BUILD+= $(LIBPAM) +endif +ifeq ($(STATIC_LIBPAM),yes) +LIBS_TO_BUILD+= $(LIBPAMSTATIC) +endif +ifeq ($(LIBTOOL_LIBPAM),yes) +LIBS_TO_BUILD+= $(LIBPAMLIBTOOL) +endif + +all: dirs $(LIBS_TO_BUILD) ../Make.Rules dirs: ifeq ($(DYNAMIC_LIBPAM),yes) @@@@ -89,6 +111,9 @@@@ dynamic/%.o : %.c static/%.o : %.c $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@@ +%.lo : %.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< + $(LIBPAM): $(DLIBOBJECTS) ifeq ($(DYNAMIC_LIBPAM),yes) ifeq ($(USESONAME),yes) @@@@ -111,7 +136,26 @@@@ ifeq ($(STATIC_LIBPAM),yes) $(RANLIB) $@@ endif -install: all +$(LIBPAMLIBTOOL): $(LALIBOBJECTS) +ifeq ($(LIBTOOL_LIBPAM),yes) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@@ \ + $(MODULES) $(LINKLIBS) \ + -rpath $(libdir) -version-info $(MAJOR_REL):$(MINOR_REL) +endif + +install: all install-headers + +ifeq ($(DYNAMIC_LIBPAM),yes) +install: install-dynamic +endif +ifeq ($(STATIC_LIBPAM),yes) +install: install-static +endif +ifeq ($(LIBTOOL_LIBPAM),yes) +install: install-libtool +endif + +install-headers: $(MKDIR) $(FAKEROOT)$(INCLUDED) $(FAKEROOT)$(libdir) $(INSTALL) -m 644 include/security/pam_appl.h $(FAKEROOT)$(INCLUDED) $(INSTALL) -m 644 include/security/pam_modules.h $(FAKEROOT)$(INCLUDED) @@@@ -121,6 +165,8 @@@@ install: all ifdef MEMORY_DEBUG $(INSTALL) -m 644 include/security/pam_malloc.h $(FAKEROOT)$(INCLUDED) endif + +install-dynamic: ifeq ($(DYNAMIC_LIBPAM),yes) $(INSTALL) -m $(SHLIBMODE) $(LIBPAM) $(FAKEROOT)$(libdir)/$(LIBPAMFULL) $(LDCONFIG) @@@@ -129,10 +175,17 @@@@ ifeq ($(DYNAMIC_LIBPAM),yes) ln -sf $(LIBPAMNAME) $(LIBPAM) ) endif endif + +install-static: ifeq ($(STATIC_LIBPAM),yes) $(INSTALL) -m 644 $(LIBPAMSTATIC) $(FAKEROOT)$(libdir) endif +install-libtool: +ifeq ($(LIBTOOL_LIBPAM),yes) + $(LIBTOOL) --mode=install $(INSTALL) -c $(LIBPAMLIBTOOL) $(FAKEROOT)$(libdir) +endif + remove: rm -f $(FAKEROOT)$(INCLUDED)/_pam_types.h rm -f $(FAKEROOT)$(INCLUDED)/_pam_macros.h @@@@ -143,9 +196,13 @@@@ remove: rm -f $(FAKEROOT)$(libdir)/$(LIBPAM) $(LDCONFIG) rm -f $(FAKEROOT)$(libdir)/$(LIBPAMSTATIC) +ifeq ($(LIBTOOL_LIBPAM),yes) + $(LIBTOOL) --mode=uninstall rm $(FAKEROOT)$(libdir)$(LIBPAMLIBTOOL) +endif clean: rm -f a.out core *~ static/*.o dynamic/*.o - rm -f *.a *.o *.so ./include/security/*~ + rm -f *.a *.la *.lo *.o *.so .libs/* ./include/security/*~ if [ -d dynamic ]; then rmdir dynamic ; fi if [ -d static ]; then rmdir static ; fi + if [ -d .libs ]; then rmdir .libs ; fi @ 1.7 log @sprinkle --tag=CC for libtool @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @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. @ text @d3 1 a3 1 --- libpam/Makefile.orig 2001-12-09 16:44:58.000000000 -0500 d51 1 a51 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pam_static.c d78 1 a78 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< d90 1 a90 1 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@@ \ @ 1.5 log @Libtoolize security/PAM so that the appropriate options are passed to the compiler to build shared modules, and so that it builds correctly across different platforms. Bump the PKGREVISION. In particular, this should fix problems building this package on NetBSD/amd64. @ text @d14 9 @ 1.4 log @bl3ify @ text @d3 2 a4 2 --- libpam/Makefile.orig Sun Dec 9 16:44:58 2001 +++ libpam/Makefile Thu Sep 11 19:50:44 2003 d14 95 a108 1 @@@@ -125,8 +125,9 @@@@ d111 2 a112 6 ifneq ($(DYNTYPE),"sl") - ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBPAM) ; \ - ln -sf $(LIBPAMNAME) $(LIBPAM) ) + ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBPAM) $(LIBPAMNAME); \ + ln -sf $(LIBPAMFULL) $(LIBPAMNAME); \ + ln -sf $(LIBPAMFULL) $(LIBPAM) ) d115 2 d118 26 @ 1.3 log @Update security/PAM to 0.77. Changes from version 0.75 include: * Numerous bug fixes for most of the PAM modules, including several string length checks and fixes (update recommended!). * fix for legacy behavior of pam_setcred and pam_close_session in the case that pam_authenticate and pam_open_session hadn't been called * pam_unix: - don't zero out password strings during password changing function * pam_wheel: - feature: can use the module to provide wheel access to non-root accounts. * pam_limits: - added '%' domain for maxlogins limiting, now '*' and @@group have the old meaning (every) and '%' the new one (all) - handle negative priority limits (which can apply to the superuser too). * pam_userdb: - require that all of typed password matches that in database * pam_access: - added the 'fieldsep=' argument, made a PAM_RHOST of "" equivalent to NULL Incidentally, cups-1.1.18 will once again do PAM authentication using pam_unix.so if built against PAM-0.77. @ text @d4 11 a14 2 +++ libpam/Makefile @@@@ -125,8 +125,9 @@@@ ifeq ($(DYNAMIC_LIBPAM),yes) @ 1.2 log @Update security/PAM to 0.75. Note that this release contains backwardly incompatible changes to libpam.so; prior versions were buggy so upgrading is highly recommended. Pkgsrc changes from version 0.72 include: * Honor ${PKG_SYSCONFDIR}: the config files are now found in /etc/pam.conf and /etc/pam/*.conf, or in the appropriate ${PKG_SYSCONFBASE} directory. * Convert to use the general INSTALL/DEINSTALL scripts. Changes from version 0.72 include: * bug fixes to almost every PAM module * pam_pwdb replaced with pam_unix * fixed a small security hole (more of a user confusion issue) with the unix and pwdb password helper binaries. * improved handling of the setcred/close_session and update chauthtok stack. *Warning* This is a backwardly incompatible change, but 'more sane' than before. (Bug 129775 - agmorgan) * added support for '/' symbols in pam_time and pam_group config files (support for modern terminal devices). Fixed infinite loop problem with '\\[^\n]' in these files. * added accessconf= feature to pam_access @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2000/10/21 18:41:54 rh Exp $ d3 14 a16 11 --- modules/pam_deny/Makefile.orig Sun Jul 12 07:17:16 1998 +++ modules/pam_deny/Makefile @@@@ -40,7 +40,7 @@@@ export DYNAMIC=-DPAM_DYNAMIC export CC=gcc export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ - -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ + -ansi -Wall -Wwrite-strings \ -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ -Wshadow -pedantic -fPIC @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of PAM-0.72, a pluggable authentication module mechanism @ text @@