Hello community, here is the log from the commit of package quota for openSUSE:Factory checked in at 2016-01-07 00:24:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quota (Old) and /work/SRC/openSUSE:Factory/.quota.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quota" Changes: -------- --- /work/SRC/openSUSE:Factory/quota/quota.changes 2014-12-01 14:00:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2016-01-07 00:24:41.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Jan 5 10:23:28 UTC 2016 - [email protected] + +- Add patch to set variables upstream rather than in spec: + * 0001-Set-fPIC-and-pie-as-default-params-when-building.patch + +------------------------------------------------------------------- +Mon Jan 4 15:07:35 UTC 2016 - [email protected] + +- Version update to 4.03 release + * Various small updates and fixes + * Translations update + * autotools based buildsystem +- Refresh patch: + * quota-4.01-warnquota.patch +- Delete obsolete patch: + * quota-4.00-makefile.patch + +------------------------------------------------------------------- Old: ---- quota-4.00-makefile.patch quota-4.02.tar.gz New: ---- 0001-Set-fPIC-and-pie-as-default-params-when-building.patch quota-4.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quota.spec ++++++ --- /var/tmp/diff_new_pack.hz5CGl/_old 2016-01-07 00:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hz5CGl/_new 2016-01-07 00:24:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package quota # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,22 @@ Name: quota -Version: 4.02 +Version: 4.03 Release: 0 Summary: Disk Quota System License: GPL-2.0 and BSD-3-Clause Group: System/Filesystems Url: http://sourceforge.net/projects/linuxquota/ -Source0: http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz +# Tarball repacked, missing subfolder, will be fixed in next release +Source0: %{name}-%{version}.tar.gz Source1: sysconfig.nfs-quota Source2: quotad.service Source3: quotad_env.sh -Patch1: %{name}-4.00-makefile.patch +# PATCH-FIX-UPSTREAM Add pic and pie hardening to build +Patch1: 0001-Set-fPIC-and-pie-as-default-params-when-building.patch Patch2: %{name}-4.01-warnquota.patch +# needed for Patch1 BuildRequires: automake BuildRequires: dbus-1-devel BuildRequires: e2fsprogs-devel @@ -54,27 +58,27 @@ Requires: rpcbind Requires: sysconfig Requires(post): %fillup_prereq -Provides: quota:%{_initddir}/quotad %{?systemd_requires} %description nfs The quotad init script, which provides quota support on NFS mounts. %prep -%setup -q -n quota-tools -%patch1 +%setup -q +%patch1 -p1 %patch2 %build -autoreconf -fiv +autoreconf -fvi %configure \ - --sysconfdir=%{_sysconfdir} \ - --enable-netlink \ - --enable-strip-binaries=no + --docdir=%{_docdir}/%{name} \ + --disable-silent-rules \ + --disable-ldapmail \ + --enable-rpcsetquota make %{?_smp_mflags} %install -make install ROOTDIR=%{buildroot} +%make_install #installing ldap-scripts install -m 755 ldap-scripts/*pl %{buildroot}%{_sbindir}/ @@ -110,8 +114,9 @@ %config %{_sysconfdir}/quotagrpadmins %config %{_sysconfdir}/quotatab %config %{_sysconfdir}/warnquota.conf -%doc README.* doc -%doc %{_mandir}/man?/* +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/* +%{_mandir}/man?/* %{_bindir}/quota %{_bindir}/quotasync %{_sbindir}/applySystemQuotas.pl ++++++ 0001-Set-fPIC-and-pie-as-default-params-when-building.patch ++++++ >From add4f4954adc27ad7b2a698a1d3ac0fcd981602a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> Date: Tue, 5 Jan 2016 11:20:52 +0100 Subject: [PATCH] Set -fPIC and -pie as default params when building --- Makefile.am | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7c7a866..77f8400 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 +AM_LDFLAGS = -pie BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c diff --git a/configure.ac b/configure.ac index cb33781..489c281 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ # ================ # Check for cflags # ================ -CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC" AC_ARG_ENABLE([werror], [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], [enable_werror="$enableval"], -- 2.6.4 ++++++ quota-4.01-warnquota.patch ++++++ --- /var/tmp/diff_new_pack.hz5CGl/_old 2016-01-07 00:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.hz5CGl/_new 2016-01-07 00:24:43.000000000 +0100 @@ -1,3 +1,5 @@ +Index: warnquota.conf +=================================================================== --- warnquota.conf.orig +++ warnquota.conf @@ -1,21 +1,37 @@ @@ -20,11 +22,11 @@ +# +FAIL = "configure /etc/warnquota.conf before running warnquota" + -+# -+# command used for sending mails # -; ; and # type comments are allowed -# and even blank lines ++# command used for sending mails ++# +MAIL_CMD ▷⋅= "/usr/lib/sendmail -t" -# values can be quoted: @@ -50,12 +52,15 @@ # Text in the beginning of the mail (if not specified, default text is used) # This way text can be split to more lines # Line breaks are done by '|' character -@@ -45,27 +61,31 @@ GROUP_SIGNATURE = See you!| Your admin +@@ -45,33 +61,27 @@ GROUP_SIGNATURE = See you!| Your admin # #Here you can set a charset for emails sent by warnquota (e.g. UTF-8) #CHARSET = -# If you are using LDAP mail lookups. --# host, port, tls, binddn, and bindpw are straight forward. ++ ++############################################################## ++# Configuration for LDAP (if you are using LDAP mail lookups) + # host, port, tls, binddn, and bindpw are straight forward. -# LDAP_BASEDN is your search base dn -# LDAP_SEARCH_ATTRIBUTE is the attr for the value you are looking for -# LDAP_MAIL_ATTRIBUTE is the attribute you want used for the mail address @@ -69,38 +74,35 @@ -# Otherwise you should specify LDAP_HOST and LDAP_PORT -# LDAP_HOST = ldap -# LDAP_PORT = 389 +-# LDAP_TLS = false (false|never|allow|try|demand) use StarTLS +-# false - don't use starTLS +-# never - don't ask for a certificate +-# allow - request certificate, proceed even if not verified +-# try - request certificate, terminate if bad, proceed if not sent +-# demand - request certificate, proceed only if verified -# LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg -# LDAP_BINDPW = YourReadOnlyUserPassword -# LDAP_BASEDN = YourSearchBase -# LDAP_SEARCH_ATTRIBUTE = uid -# LDAP_MAIL_ATTRIBUTE = mailLocalAddress -# LDAP_DEFAULT_MAIL_DOMAIN = YourDefaultMailDomain.com -+ -+############################################################## -+# Configuration for LDAP (if you are using LDAP mail lookups) -+ # host, port, tls, binddn, and bindpw are straight forward. +############################################################## -+ - # --# end of example warnquota.conf file +# Your search base dn +# +# LDAP_BASEDN + - # +# The attr for the value you are looking for +# +# LDAP_SEARCH_ATTRIBUTE -+# + -+# +# The attribute you want used for the mail address +# +# LDAP_MAIL_ATTRIBUTE + -+# +# The default domain if the attribute isn't found +# +# LDAP_DEFAULT_MAIL_DOMAIN + -+# end of warnquota.conf file + # + # end of example warnquota.conf file + # ++++++ quota-4.02.tar.gz -> quota-4.03.tar.gz ++++++ ++++ 45000 lines of diff (skipped)
