Merge branch 'master' into next

[ipfire-2.x.git] / lfs / pam

diff --git a/lfs/pam b/lfs/pam
index 8fde8d038463dee8ece1dfde577c3515017b1356..96e8956f992233c449572e73872445516c3df846 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 0.99.4.0
+VER        = 0.99.10.0
 
 THISAPP    = Linux-PAM-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 267ea71253615342261f9fc486d06647
+$(DL_FILE)_MD5 = be4dd1d34ac5933408e13e48f3eb710a
 
 install : $(TARGET)
 
@@ -72,7 +70,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.3.0-hostname.patch
+       $(UPDATE_AUTOMAKE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.10.0-rlimit-build-fix.patch
        cd $(DIR_APP) && ./configure --libdir=/usr/lib \
                            --sbindir=/lib/security \
                            --enable-securedir=/lib/security \
@@ -83,9 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod -v 4755 /lib/security/unix_chkpwd
        mv -v /lib/security/pam_tally /sbin
        mv -v /usr/lib/libpam*.so.0* /lib
-       ln -v -sf ../../lib/libpam.so.0.81.3 /usr/lib/libpam.so
+       ln -v -sf ../../lib/libpam.so.0.81.10 /usr/lib/libpam.so
        ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so
-       ln -v -sf ../../lib/libpam_misc.so.0.81.2 /usr/lib/libpam_misc.so
+       ln -v -sf ../../lib/libpam_misc.so.0.81.3 /usr/lib/libpam_misc.so
        -mkdir -p /etc/pam.d
        cp $(DIR_SRC)/config/pam/* /etc/pam.d
        chown root.root -R /etc/pam.d