From c62c1a7a45a231ec4722980102ba2e0d6b65c3d829886c428d37463ed9dda983 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Feb 2015 08:07:47 +0000 Subject: [PATCH] Accepting request 287612 from home:elvigia:branches:network - rsync-no-libattr.patch: Use AC_SEARCH_LIBS([getxattr], [attr]) instead of AC_CHECK_LIB(attr,getxattr) so libattr is not injected as a dependency when glibc is enough since several years to use getxattr. OBS-URL: https://build.opensuse.org/request/show/287612 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=43 --- rsync-no-libattr.patch | 11 +++++++++++ rsync.changes | 8 ++++++++ rsync.spec | 4 +++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 rsync-no-libattr.patch diff --git a/rsync-no-libattr.patch b/rsync-no-libattr.patch new file mode 100644 index 0000000..f37694a --- /dev/null +++ b/rsync-no-libattr.patch @@ -0,0 +1,11 @@ +--- rsync-3.1.1.orig/configure.ac ++++ rsync-3.1.1/configure.ac +@@ -1082,7 +1082,7 @@ else + AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs]) + AC_DEFINE(SUPPORT_XATTRS, 1) + AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs]) +- AC_CHECK_LIB(attr,getxattr) ++ AC_SEARCH_LIBS([getxattr], [attr]) + ;; + darwin*) + AC_MSG_RESULT(Using OS X xattrs) diff --git a/rsync.changes b/rsync.changes index 4e80351..592a9ee 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 25 02:23:49 UTC 2015 - crrodriguez@opensuse.org + +- rsync-no-libattr.patch: Use AC_SEARCH_LIBS([getxattr], [attr]) + instead of AC_CHECK_LIB(attr,getxattr) so libattr is + not injected as a dependency when glibc is enough since + several years to use getxattr. + ------------------------------------------------------------------- Mon Feb 2 18:42:25 UTC 2015 - vcizek@suse.com diff --git a/rsync.spec b/rsync.spec index 1d93623..6ce2049 100644 --- a/rsync.spec +++ b/rsync.spec @@ -43,6 +43,7 @@ Source11: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.ta Source12: %{name}.keyring Patch3: system-zlib.diff Patch4: rsync-CVE-2014-9512.patch +Patch5: rsync-no-libattr.patch BuildRequires: autoconf BuildRequires: libacl-devel BuildRequires: openslp-devel @@ -86,7 +87,7 @@ patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff # fate#312479 patch -p1 < patches/time-limit.diff - +%patch5 -p1 %build autoreconf -fiv export CFLAGS="%optflags -fPIC -DPIC -fPIE" @@ -96,6 +97,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie" --enable-slp \ --enable-acl-support \ --enable-xattr-support +make reconfigure make %{?_smp_mflags} %install