packages: pure-ftpd/audit_cap.patch, pure-ftpd/pure-ftpd.spec, pure-ftpd/pu...

[arekm]

Author: arekm                        Date: Fri Dec  4 12:35:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.27; drop controversial patch

---- Files affected:
packages/pure-ftpd:
   audit_cap.patch (1.1 -> 1.2) , pure-ftpd.spec (1.188 -> 1.189) , pure-ftpd-nosymlinks-hideuidmismatch.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/pure-ftpd/audit_cap.patch
diff -u packages/pure-ftpd/audit_cap.patch:1.1 packages/pure-ftpd/audit_cap.patch:1.2
--- packages/pure-ftpd/audit_cap.patch:1.1	Fri Nov 13 00:13:11 2009
+++ packages/pure-ftpd/audit_cap.patch	Fri Dec  4 13:35:04 2009
@@ -1,12 +1,13 @@
 --- pure-ftpd-1.0.24/src/caps_p.h~	2009-10-24 11:45:57.000000000 +0200
 +++ pure-ftpd-1.0.24/src/caps_p.h	2009-11-13 00:05:52.489631491 +0100
-@@ -14,7 +14,8 @@
+@@ -13,7 +13,8 @@
+     CAP_NET_BIND_SERVICE,
      CAP_SYS_CHROOT,
      CAP_SYS_NICE,
-     CAP_NET_ADMIN,
 -    CAP_DAC_READ_SEARCH
 +    CAP_DAC_READ_SEARCH,
-+    CAP_AUDIT_WRITE
++	CAP_AUDIT_WRITE
  };
  
  cap_value_t cap_keep_login[] = {
+

================================================================
Index: packages/pure-ftpd/pure-ftpd.spec
diff -u packages/pure-ftpd/pure-ftpd.spec:1.188 packages/pure-ftpd/pure-ftpd.spec:1.189
--- packages/pure-ftpd/pure-ftpd.spec:1.188	Fri Nov 13 00:15:04 2009
+++ packages/pure-ftpd/pure-ftpd.spec	Fri Dec  4 13:35:05 2009
@@ -13,13 +13,13 @@
 Summary:	Small, fast and secure FTP server
 Summary(pl.UTF-8):	Mały, szybki i bezpieczny serwer FTP
 Name:		pure-ftpd
-Version:	1.0.24
+Version:	1.0.27
 Release:	2%{?with_extra:extra}
 Epoch:		0
 License:	BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ license}
 Group:		Daemons
 Source0:	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	2f0869166ddb3a9cbe5e4887eae6e74d
+# Source0-md5:	7d18544384aa1649d483ba86518ed34e
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -31,7 +31,6 @@
 Patch1:		%{name}-path_to_ssl_cert_in_config.patch
 Patch2:		%{name}-pure-pw_passwd.patch
 Patch3:		%{name}-mysql_config.patch
-Patch4:		%{name}-nosymlinks-hideuidmismatch.patch
 Patch5:		%{name}-passwd_location.patch
 Patch6:		%{name}-additionalgid.patch
 Patch7:		audit_cap.patch
@@ -95,7 +94,6 @@
 %setup -q -a 5
 %patch0 -p0
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -228,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2009/12/04 12:35:05  arekm
+- up to 1.0.27; drop controversial patch
+
 Revision 1.188  2009/11/12 23:15:04  zbyniu
 - patch for CAP_AUDIT_WRITE added; pam file fixed (/etc/ftpd/ftpusers); rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pure-ftpd/audit_cap.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pure-ftpd/pure-ftpd.spec?r1=1.188&r2=1.189&f=u