- libtoolize (build needs lt1.4, but lt1.3 script is included)

- rlimit_locks patch now adds locks support to pam_limits

Changed files:
    pam-rlimit_locks.patch -> 1.2
    pam.spec -> 1.102

diff --git a/pam-rlimit_locks.patch b/pam-rlimit_locks.patch
index f947bb530e368be9c751904e99c2cde2a3c5a5a0..e5064a94df83e76aa26c6006a090273e8b76dec0 100644 (file)
--- a/pam-rlimit_locks.patch
+++ b/pam-rlimit_locks.patch
@@ -1,21 +1,62 @@
-diff -urN pam-pld-0.74.0.org/modules/pam_limits/pam_limits.c pam-pld-0.74.0/modules/pam_limits/pam_limits.c
---- pam-pld-0.74.0.org/modules/pam_limits/pam_limits.c Fri Feb  2 16:17:15 2001
-+++ pam-pld-0.74.0/modules/pam_limits/pam_limits.c     Fri Feb  2 16:20:42 2001
-@@ -237,7 +237,7 @@
+diff -Nur pam-pld-0.74.3.orig/modules/pam_limits/limits.skel pam-pld-0.74.3/modules/pam_limits/limits.skel
+--- pam-pld-0.74.3.orig/modules/pam_limits/limits.skel Mon Jul  5 16:34:40 1999
++++ pam-pld-0.74.3/modules/pam_limits/limits.skel      Fri Jun 15 19:44:05 2001
+@@ -25,6 +25,7 @@
+ #        - cpu - max CPU time (MIN)
+ #        - nproc - max number of processes
+ #        - as - address space limit
++#        - locks - file locks (requires kernel >= 2.4)
+ #        - maxlogins - max number of logins for this user
+ #        - priority - the priority to run user process with
+ #
+diff -Nur pam-pld-0.74.3.orig/modules/pam_limits/pam_limits.c pam-pld-0.74.3/modules/pam_limits/pam_limits.c
+--- pam-pld-0.74.3.orig/modules/pam_limits/pam_limits.c        Mon Dec  4 15:18:44 2000
++++ pam-pld-0.74.3/modules/pam_limits/pam_limits.c     Fri Jun 15 19:40:38 2001
+@@ -236,9 +236,12 @@
+ 
      D(("called."));
  
-     for(i = 0; i < RLIM_NLIMITS; i++) 
+-    for(i = 0; i < RLIM_NLIMITS; i++) 
 -      retval |= getrlimit(i, &pl->limits[i].limit);
-+      retval |= (i == RLIMIT_LOCKS) ? 0 : getrlimit(i, &pl->limits[i].limit);
-     
+-    
++    for(i = 0; i < RLIM_NLIMITS; i++)
++      if(i != RLIMIT_LOCKS)
++          retval |= getrlimit(i, &pl->limits[i].limit);
++        else
++          getrlimit(i, &pl->limits[i].limit);
++
      pl->limits[RLIMIT_CPU].src_soft = LIMITS_DEF_NONE;
      pl->limits[RLIMIT_CPU].src_hard = LIMITS_DEF_NONE;
-@@ -498,7 +498,7 @@
+ 
+@@ -269,6 +272,9 @@
+     pl->limits[RLIMIT_AS].src_soft = LIMITS_DEF_NONE;
+     pl->limits[RLIMIT_AS].src_hard = LIMITS_DEF_NONE;
+ 
++    pl->limits[RLIMIT_LOCKS].src_soft = LIMITS_DEF_NONE;
++    pl->limits[RLIMIT_LOCKS].src_hard = LIMITS_DEF_NONE;
++
+     pl->priority = 0;
+     pl->login_limit = -2;
+     pl->login_limit_def = LIMITS_DEF_NONE;
+@@ -310,6 +316,8 @@
+       limit_item = RLIMIT_MEMLOCK;
+     else if (strcmp(lim_item, "as") == 0)
+       limit_item = RLIMIT_AS;
++    else if (strcmp(lim_item, "locks") == 0)
++      limit_item = RLIMIT_LOCKS;
+     else if (strcmp(lim_item, "maxlogins") == 0) {
+       limit_item = LIMIT_LOGIN;
+       pl->flag_numsyslogins = 0;
+@@ -498,7 +506,11 @@
      for (i=0; i<RLIM_NLIMITS; i++) {
          if (pl->limits[i].limit.rlim_cur > pl->limits[i].limit.rlim_max)
              pl->limits[i].limit.rlim_cur = pl->limits[i].limit.rlim_max;
 -        retval |= setrlimit(i, &pl->limits[i].limit);
-+        retval |= (i == RLIMIT_LOCKS) ? 0 :  setrlimit(i, &pl->limits[i].limit);
++      if(i != RLIMIT_LOCKS)
++          retval |= setrlimit(i, &pl->limits[i].limit);
++      else if(setrlimit(i, &pl->limits[i].limit) &&
++            (pl->limits[i].src_soft!=LIMITS_DEF_NONE || pl->limits[i].src_hard!=LIMITS_DEF_NONE))
++          _pam_log(LOG_WARNING,"cannot set RLIMIT_LOCKS (kernel < 2.4?)");
      }
      
      if (retval != PAM_SUCCESS)

diff --git a/pam.spec b/pam.spec
index f74aa74be765312d93e7979fe4072af41d8d9b96..281f9c605e0be2f6ad7d6c9b20fd327ee04894cc 100644 (file)
--- a/pam.spec
+++ b/pam.spec
@@ -102,6 +102,7 @@ Biblioteki statyczne PAM.
 
 %package pam_pwdb
 Summary:       pam_pwdb module
+Summary(pl):   Modu³ pam_pwdb
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -111,8 +112,12 @@ Requires:  pwdb >= 0.54-2
 %description pam_pwdb
 pam_pwdb module.
 
+%description pam_pwdb -l pl
+Modu³ pam_pwdb.
+
 %package pam_radius
 Summary:       pam_radius module
+Summary(pl):   Modu³ pam_radius
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -122,8 +127,12 @@ Requires:  pwdb >= 0.54-2
 %description pam_radius
 pam_radius module.
 
+%description pam_radius -l pl
+Modu³ pam_radius.
+
 %package pam_skey
 Summary:       pam_skey module
+Summary(pl):   Modu³ pam_skey
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -133,8 +142,12 @@ Requires:  skey
 %description pam_skey
 pam_skey module.
 
+%description pam_skey -l pl
+Modu³ pam_skey.
+
 %package pam_opie
 Summary:       pam_opie module
+Summary(pl):   Modu³ pam_opie
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -144,8 +157,12 @@ Requires:  opie
 %description pam_opie
 pam_opie module.
 
+%description pam_opie -l pl
+Modu³ pam_opie.
+
 %package pam_tcpd
 Summary:       pam_tcpd module
+Summary(pl):   Modu³ pam_tcpd
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -155,8 +172,12 @@ Requires:  libwrap
 %description pam_tcpd
 pam_tcpd module.
 
+%description pam_tcpd -l pl
+Modu³ pam_tcpd.
+
 %package pam_cap
 Summary:       pam_cap module
+Summary(pl):   Modu³ pam_cap
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -166,11 +187,15 @@ Requires: libcap
 %description pam_cap
 pam_cap module.
 
+%description pam_cap -l pl
+Modu³ pam_cap.
+
 %prep
 %setup -q -n %{name}-pld-%{version}
 %patch0 -p1
 
 %build
+libtoolize --copy --force
 %configure \
        %{?_with_pwexport:--enable-want-pwexport-module} \
        --enable-strong-crypto