Hello community,
here is the log from the commit of package pure-ftpd for openSUSE:Factory
checked in at 2013-01-24 10:32:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old)
and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd", Maintainer is "mvysko...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2012-12-19
11:52:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2013-01-24
10:32:32.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Jan 23 08:43:56 UTC 2013 - mvysko...@suse.com
+
+- fix bnc#789833: pure-ftpd login failes
+ * pure-ftpd-1.0.36-cap-audit-control.patch
+- remove oes related patches have never used at openSUSE
+ * pure-ftpd-1.0.20-oes_remote_server.patch
+ * pure-ftpd-1.0.22-oes-bugfix-534424.patch
+- change old PreReq to Requires(pre)
+- add version to pureftpd symbol
+
+-------------------------------------------------------------------
Old:
----
pure-ftpd-1.0.20-oes_remote_server.patch
pure-ftpd-1.0.22-oes-bugfix-534424.patch
New:
----
pure-ftpd-1.0.36-cap-audit-control.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pure-ftpd.spec ++++++
--- /var/tmp/diff_new_pack.O34jBh/_old 2013-01-24 10:32:33.000000000 +0100
+++ /var/tmp/diff_new_pack.O34jBh/_new 2013-01-24 10:32:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pure-ftpd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,6 @@
#
-# check if oes specific patches will be applied or not
-%define with_oes 0
-
Name: pure-ftpd
Version: 1.0.36
Release: 0
@@ -47,9 +44,9 @@
Patch7: %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch
# PATCH-FEATURE-OPENSUSE %{name}-1.0.32-portrange.patch -- Add
PassivePortRange to "%numpairc_switch_for".
Patch8: %{name}-1.0.32-portrange.patch
-# OES patches - see %with_oes
-Patch100: %{name}-1.0.20-oes_remote_server.patch
-Patch101: pure-ftpd-1.0.22-oes-bugfix-534424.patch
+# PATCH-FIX-OPENSUSE: bnc#789833
+# won't be upstreamed, can be dropped when systemd will be only one init
system and kernel get AUDIT_LOGINUID_IMMUTABLE
+Patch9: pure-ftpd-1.0.36-cap-audit-control.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gpg-offline
BuildRequires: libcap-devel
@@ -57,10 +54,10 @@
BuildRequires: openldap2-devel
BuildRequires: pam-devel
BuildRequires: postgresql-devel
-PreReq: %insserv_prereq
-PreReq: coreutils
+Requires(pre): %insserv_prereq
+Requires(pre): coreutils
Provides: ftp-server
-Provides: pureftpd
+Provides: pureftpd = %{version}-%{release}
%{!?_initddir: %global _initddir /etc/init.d}
%if 0%{?suse_version} > 1140
@@ -88,11 +85,7 @@
%patch5
%patch7
%patch8
-# uncomment this if you want to have the OES remote_server feature
-%if %{with_oes}
-%patch100 -p0
-%patch101 -p1
-%endif
+%patch9 -p1
%build
CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector"
++++++ pure-ftpd-1.0.36-cap-audit-control.patch ++++++
Index: pure-ftpd-1.0.36/src/caps_p.h
===================================================================
--- pure-ftpd-1.0.36.orig/src/caps_p.h
+++ pure-ftpd-1.0.36/src/caps_p.h
@@ -7,7 +7,8 @@
# endif
cap_value_t cap_keep_startup[] = {
-# if defined(USE_PAM) && defined(CAP_AUDIT_WRITE)
+# if defined(USE_PAM) && defined(CAP_AUDIT_CONTROL) && defined(CAP_AUDIT_WRITE)
+ CAP_AUDIT_CONTROL,
CAP_AUDIT_WRITE,
# endif
CAP_SETGID,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
