April 2017 - openSUSE Commits - openSUSE Mailing Lists

commit keyutils for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package keyutils for openSUSE:Factory checked in at 2017-04-03 11:04:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keyutils (Old) and /work/SRC/openSUSE:Factory/.keyutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "keyutils" Mon Apr 3 11:04:36 2017 rev:30 rq:483310 version:1.5.9 Changes: -------- --- /work/SRC/openSUSE:Factory/keyutils/keyutils.changes 2015-02-06 10:52:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.keyutils.new/keyutils.changes 2017-04-03 11:04:37.711746740 +0200 @@ -1,0 +2,6 @@ +Tue Mar 21 15:31:03 UTC 2017 - meissner(a)suse.com + +- move binaries from /bin to /usr/bin (bsc#1029969) +- keyutils-usr-move.patch: also adjust the request-key.conf file + +------------------------------------------------------------------- New: ---- keyutils-usr-move.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keyutils.spec ++++++ --- /var/tmp/diff_new_pack.i9l7XL/_old 2017-04-03 11:04:38.475638816 +0200 +++ /var/tmp/diff_new_pack.i9l7XL/_new 2017-04-03 11:04:38.479638251 +0200 @@ -1,7 +1,7 @@ # # spec file for package keyutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -29,6 +29,7 @@ Patch1: request-key-cifs.patch Patch2: request-key-nfs4.patch Patch3: keyutils-nodate.patch +Patch4: keyutils-usr-move.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,12 +61,17 @@ %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc" %install -make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir} +make install NO_ARLIB=1 DESTDIR=%{buildroot} BINDIR=/%{_bindir} SBINDIR=/%{_sbindir} LIBDIR=/%{_libdir} USRLIBDIR=%{_libdir} +mkdir -p %{buildroot}/bin %{buildroot}/sbin +ln -s /%{_bindir}/keyctl %{buildroot}/bin +ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin +ln -s /%{_sbindir}/request-key %{buildroot}/sbin %post -n %lname -p /sbin/ldconfig @@ -76,6 +82,8 @@ %doc README LICENCE.GPL /sbin/* /bin/* +/%{_sbindir}/* +/%{_bindir}/* %{_datadir}/keyutils %{_mandir}/*/* %config(noreplace) %{_sysconfdir}/request-key.conf @@ -84,7 +92,7 @@ %files -n %lname %defattr(-,root,root,-) %doc LICENCE.LGPL -/%{_lib}/libkeyutils.so.* +/%{_libdir}/libkeyutils.so.* %files devel %defattr(-,root,root,-) ++++++ keyutils-usr-move.patch ++++++ Index: keyutils-1.5.9/request-key.conf =================================================================== --- keyutils-1.5.9.orig/request-key.conf +++ keyutils-1.5.9/request-key.conf @@ -31,14 +31,14 @@ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== -create dns_resolver * * /sbin/key.dns_resolver %k -create user debug:* negate /bin/keyctl negate %k 30 %S -create user debug:* rejected /bin/keyctl reject %k 30 %c %S -create user debug:* expired /bin/keyctl reject %k 30 %c %S -create user debug:* revoked /bin/keyctl reject %k 30 %c %S +create dns_resolver * * /usr/sbin/key.dns_resolver %k +create user debug:* negate /usr/bin/keyctl negate %k 30 %S +create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S +create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S +create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S create cifs.spnego * * /usr/sbin/cifs.upcall %k -negate * * * /bin/keyctl negate %k 30 %S +negate * * * /usr/bin/keyctl negate %k 30 %S create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600

1 0

commit gzip for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package gzip for openSUSE:Factory checked in at 2017-04-03 11:04:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gzip (Old) and /work/SRC/openSUSE:Factory/.gzip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gzip" Mon Apr 3 11:04:32 2017 rev:42 rq:482898 version:1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/gzip/gzip.changes 2016-05-12 09:32:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gzip.new/gzip.changes 2017-04-03 11:04:33.964276190 +0200 @@ -1,0 +2,6 @@ +Thu Mar 23 15:14:56 UTC 2017 - kstreitova(a)suse.com + +- cleanup with spec-cleaner +- use loop with a range instead of a number list + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.IU3O6S/_old 2017-04-03 11:04:35.252094244 +0200 +++ /var/tmp/diff_new_pack.IU3O6S/_new 2017-04-03 11:04:35.252094244 +0200 @@ -1,7 +1,7 @@ # # spec file for package gzip # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -79,7 +79,7 @@ %endif %check -for i in 1 2 3 4 5 6 7 8 9; do +for i in {1..9}; do for f in build-aux/texinfo.tex /bin/bash; do basef=${f##*/} time ./gzip -$i < $f > $basef.gz @@ -90,7 +90,7 @@ done %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install #UsrMerge mkdir -p %{buildroot}/bin ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin

1 0

commit tar for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package tar for openSUSE:Factory checked in at 2017-04-03 11:04:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tar (Old) and /work/SRC/openSUSE:Factory/.tar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tar" Mon Apr 3 11:04:26 2017 rev:62 rq:482896 version:1.29 Changes: -------- --- /work/SRC/openSUSE:Factory/tar/tar.changes 2016-12-22 15:45:35.219366982 +0100 +++ /work/SRC/openSUSE:Factory/.tar.new/tar.changes 2017-04-03 11:04:28.825002276 +0200 @@ -1,0 +2,8 @@ +Thu Mar 23 13:52:13 UTC 2017 - kstreitova(a)suse.com + +- move binaries from /bin to /usr/bin [bsc#1029977] + * refresh tar-backup-spec-fix-paths.patch to change path of the + tar binary from TAR=/bin/tar to TAR=/usr/bin/tar +- use spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.meTsxa/_old 2017-04-03 11:04:30.180810725 +0200 +++ /var/tmp/diff_new_pack.meTsxa/_new 2017-04-03 11:04:30.184810160 +0200 @@ -1,7 +1,7 @@ # # spec file for package tar # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -18,7 +18,6 @@ # minimum suse version where the full featured package builds %define min_suse_ver 1010 - Name: tar Version: 1.29 Release: 0 @@ -49,7 +48,10 @@ Patch21: add-return-values-to-backup-scripts.patch # PATCH-FIX-UPSTREAM bnc#1007188 CVE-2016-6321 kstreitova(a)suse.com -- fix POINTYFEATHER vulnerability Patch22: tar-1.29-extract_pathname_bypass.patch -%if 0%{?suse_version} >= %min_suse_ver +Requires(pre): info +Provides: base:/bin/tar +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= %{min_suse_ver} BuildRequires: automake BuildRequires: help2man BuildRequires: libacl-devel @@ -58,10 +60,6 @@ Recommends: tar-lang = %{version} Recommends: xz %endif -Requires(pre): info -Provides: base:/bin/tar -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define _bindir /bin %description This package normally also includes the program "rmt", which provides @@ -81,7 +79,7 @@ %package tests Summary: Tests for the package -Group: Development/Tests +Group: Development/Tools/Other Requires: %{name} = %{version} %description tests @@ -103,8 +101,8 @@ %build %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter -fPIE -export CFLAGS="%{optflags} %my_cflags" -export RSH="/usr/bin/rsh" +export CFLAGS="%{optflags} %{my_cflags}" +export RSH="%{_bindir}/rsh" export DEFAULT_ARCHIVE_FORMAT="POSIX" autoreconf -fi %configure \ @@ -113,7 +111,7 @@ --disable-silent-rules make %{?_smp_mflags} LDFLAGS="-pie" cd tests -make genfile +make %{?_smp_mflags} genfile mkdir bin mv genfile bin cd - @@ -122,12 +120,12 @@ %if !0%{?qemu_user_space_build:1} # Checks disabled in qemu because of races happening when we emulate # multi-threaded programs -make check +make %{?_smp_mflags} check %endif %install %{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} -%if 0%{?suse_version} >= %min_suse_ver +%if 0%{?suse_version} >= %{min_suse_ver} install -d -m 755 %{buildroot}/%{_mandir}/man1 help2man ./src/tar --name "The GNU version of the tar archiving utility" -p tar \ | gzip -c > %{buildroot}/%{_mandir}/man1/tar.1.gz @@ -138,12 +136,14 @@ rm -rvf %{buildroot}/%{_mandir}/man8/rmt.8.gz rm -rvf %{buildroot}/%{_mandir}/man8 rm -f %{buildroot}%{_infodir}/dir -install -d -m 755 %{buildroot}/var/lib/tests -cp -r tests %{buildroot}/var/lib/tests/tar -rm %{buildroot}/var/lib/tests/tar/*.{c,h,o} -rm %{buildroot}/var/lib/tests/tar/package.m4 -rm %{buildroot}/var/lib/tests/tar/{atconfig,atlocal,Makefile}* +install -d -m 755 %{buildroot}%{_localstatedir}/lib/tests +cp -r tests %{buildroot}%{_localstatedir}/lib/tests/tar +rm %{buildroot}%{_localstatedir}/lib/tests/tar/*.{c,h,o} +rm %{buildroot}%{_localstatedir}/lib/tests/tar/package.m4 +rm %{buildroot}%{_localstatedir}/lib/tests/tar/{atconfig,atlocal,Makefile}* %find_lang %{name} +mkdir -p %{buildroot}/bin +ln -s %{_bindir}/tar %{buildroot}/bin/tar %files backup-scripts %defattr(-,root, root) @@ -155,23 +155,24 @@ %config(noreplace) %{_sysconfdir}/backup/backup-specs %if 0%{?lang_package:1} - %files lang -f %{name}.lang +%defattr(-,root,root) %files tests %defattr(-,root, root) -/var/lib/tests +%{_localstatedir}/lib/tests %files %else - %files -f %{name}.lang %endif %defattr(-, root, root) +/bin/tar %{_bindir}/tar %doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog TODO %{_infodir}/tar.info* -%if 0%{?suse_version} >= %min_suse_ver + +%if 0%{?suse_version} >= %{min_suse_ver} %{_mandir}/man1/tar.1.gz %endif @@ -181,7 +182,4 @@ %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%clean -rm -rf %{buildroot} - %changelog ++++++ tar-backup-spec-fix-paths.patch ++++++ --- /var/tmp/diff_new_pack.meTsxa/_old 2017-04-03 11:04:30.236802814 +0200 +++ /var/tmp/diff_new_pack.meTsxa/_new 2017-04-03 11:04:30.236802814 +0200 @@ -1,8 +1,14 @@ -Index: tar-1.25/scripts/backup-specs +Index: tar-1.29/scripts/backup-specs =================================================================== ---- tar-1.25.orig/scripts/backup-specs -+++ tar-1.25/scripts/backup-specs -@@ -11,12 +11,12 @@ TAR=/bin/tar +--- tar-1.29.orig/scripts/backup-specs ++++ tar-1.29/scripts/backup-specs +@@ -6,17 +6,17 @@ + ADMINISTRATOR="root@localhost" + + # (Optional) Path to tar binary. +-TAR=/bin/tar ++TAR=/usr/bin/tar + # (Optional) Path to rsh binary or its equivalent. You may wish to # set it to ssh as shown in the example below, to improve security. # In this case you will have to use public key authentication.

1 0

commit dpkg for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2017-04-03 11:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dpkg" Mon Apr 3 11:04:22 2017 rev:19 rq:482883 version:1.18.23 Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2016-09-12 13:21:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new/dpkg.changes 2017-04-03 11:04:23.793713105 +0200 @@ -1,0 +2,7 @@ +Mon Mar 27 12:31:08 UTC 2017 - tchvatal(a)suse.com + +- Version update to 1.18.23: + * Various fixes all around + * Refreshed patch update-alternatives-suse.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2016-09-12 13:21:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new/update-alternatives.changes 2017-04-03 11:04:24.365632304 +0200 @@ -1,0 +2,8 @@ +Mon Mar 27 12:38:32 UTC 2017 - tchvatal(a)suse.com + +- Update to 1.18.23: + * Various small fixes and memleaks removed +- Make sure to generate manpage +- Refresh patch update-alternatives-suse.patch + +------------------------------------------------------------------- Old: ---- dpkg_1.18.10.tar.xz New: ---- dpkg_1.18.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.8gUzvf/_old 2017-04-03 11:04:25.273504038 +0200 +++ /var/tmp/diff_new_pack.8gUzvf/_new 2017-04-03 11:04:25.277503473 +0200 @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.18.10 +Version: 1.18.23 Release: 0 Summary: Debian package management system License: GPL-2.0+ ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.8gUzvf/_old 2017-04-03 11:04:25.305499517 +0200 +++ /var/tmp/diff_new_pack.8gUzvf/_new 2017-04-03 11:04:25.309498952 +0200 @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.18.10 +Version: 1.18.23 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -64,6 +64,7 @@ make -C lib/compat %{?_smp_mflags} make -C utils/ %{?_smp_mflags} +make -C man/ %{?_smp_mflags} %install install -d -m 0755 %{buildroot}/%{_sbindir}/ @@ -92,7 +93,7 @@ %dir %{_localstatedir}/lib/rpm/alternatives %{_sbindir}/alternatives %{_sbindir}/update-alternatives -%{_mandir}/man1/update-alternatives.1* +%{_mandir}/man1/update-alternatives.1%{ext_man} %ghost %{_localstatedir}/log/alternatives.log %changelog ++++++ dpkg_1.18.10.tar.xz -> dpkg_1.18.23.tar.xz ++++++ ++++ 510815 lines of diff (skipped) ++++++ update-alternatives-suse.patch ++++++ --- /var/tmp/diff_new_pack.8gUzvf/_old 2017-04-03 11:04:27.609174050 +0200 +++ /var/tmp/diff_new_pack.8gUzvf/_new 2017-04-03 11:04:27.613173485 +0200 @@ -1,8 +1,8 @@ -Index: dpkg-1.18.10/man/update-alternatives.1 +Index: dpkg-1.18.23/man/update-alternatives.man =================================================================== ---- dpkg-1.18.10.orig/man/update-alternatives.1 -+++ dpkg-1.18.10/man/update-alternatives.1 -@@ -33,7 +33,7 @@ update\-alternatives \- maintain symboli +--- dpkg-1.18.23.orig/man/update-alternatives.man ++++ dpkg-1.18.23/man/update-alternatives.man +@@ -34,7 +34,7 @@ update\-alternatives \- maintain symboli .SH DESCRIPTION .B update\-alternatives creates, removes, maintains and displays information about the symbolic @@ -11,7 +11,7 @@ .PP It is possible for several programs fulfilling the same or similar functions to be installed on a single system at the same time. -@@ -43,7 +43,7 @@ different editor, if desired, but makes +@@ -44,7 +44,7 @@ different editor, if desired, but makes to make a good choice for an editor to invoke if the user has not specified a particular preference. .PP @@ -20,7 +20,7 @@ A generic name in the filesystem is shared by all files providing interchangeable functionality. The alternatives system and the system administrator -@@ -82,10 +82,10 @@ installed, changed or removed, +@@ -83,10 +83,10 @@ installed, changed or removed, is called to update information about that file in the alternatives system. .B update\-alternatives is usually called from the @@ -33,19 +33,10 @@ .PP It is often useful for a number of alternatives to be synchronized, so that they are changed as a group; for example, when several versions -@@ -190,7 +190,7 @@ containing the symlinks. - .TP - administrative directory - A directory, by default --.IR /var/lib/dpkg/alternatives , -+.IR /var/lib/rpm/alternatives , - containing - .BR update\-alternatives ' - state information. -Index: dpkg-1.18.10/utils/update-alternatives.c +Index: dpkg-1.18.23/utils/update-alternatives.c =================================================================== ---- dpkg-1.18.10.orig/utils/update-alternatives.c -+++ dpkg-1.18.10/utils/update-alternatives.c +--- dpkg-1.18.23.orig/utils/update-alternatives.c ++++ dpkg-1.18.23/utils/update-alternatives.c @@ -70,7 +70,7 @@ static int opt_force = 0; static void version(void) @@ -55,10 +46,10 @@ printf("\n"); printf(_( -Index: dpkg-1.18.10/utils/Makefile.am +Index: dpkg-1.18.23/utils/Makefile.am =================================================================== ---- dpkg-1.18.10.orig/utils/Makefile.am -+++ dpkg-1.18.10/utils/Makefile.am +--- dpkg-1.18.23.orig/utils/Makefile.am ++++ dpkg-1.18.23/utils/Makefile.am @@ -25,8 +25,8 @@ update_alternatives_SOURCES = \ update-alternatives.c

1 0

commit bzip2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package bzip2 for openSUSE:Factory checked in at 2017-04-03 11:04:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bzip2 (Old) and /work/SRC/openSUSE:Factory/.bzip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bzip2" Mon Apr 3 11:04:17 2017 rev:57 rq:482332 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/bzip2/bzip2.changes 2016-04-03 23:04:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bzip2.new/bzip2.changes 2017-04-03 11:04:18.446468572 +0200 @@ -1,0 +2,5 @@ +Thu Mar 23 15:14:20 UTC 2017 - kstreitova(a)suse.com + +- cleanup with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzip2.spec ++++++ --- /var/tmp/diff_new_pack.0Uxkvo/_old 2017-04-03 11:04:19.806276457 +0200 +++ /var/tmp/diff_new_pack.0Uxkvo/_new 2017-04-03 11:04:19.810275892 +0200 @@ -1,7 +1,7 @@ # # spec file for package bzip2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -39,7 +39,7 @@ Patch5: bzip2-1.0.6-bzgrep_return_value.patch BuildRequires: autoconf >= 2.57 BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig # The following is a kludge to get updating bzip2 to after the split work PreReq: %{libname} Provides: bzip = %{version} @@ -52,7 +52,7 @@ %package doc Summary: The bzip2 program and Library Documentation Group: Productivity/Archiving/Compression -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildArch: noarch %endif @@ -104,7 +104,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %check @@ -112,7 +111,7 @@ %files %defattr(-,root,root) -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %{_bindir}/* %files doc

1 0

commit lynx for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package lynx for openSUSE:Factory checked in at 2017-04-03 11:04:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lynx (Old) and /work/SRC/openSUSE:Factory/.lynx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lynx" Mon Apr 3 11:04:05 2017 rev:31 rq:483997 version:2.8.8rel.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lynx/lynx.changes 2017-02-11 01:31:31.830741195 +0100 +++ /work/SRC/openSUSE:Factory/.lynx.new/lynx.changes 2017-04-03 11:04:06.160204393 +0200 @@ -1,0 +2,12 @@ +Fri Mar 31 07:27:06 UTC 2017 - pgajdos(a)suse.com + +- fix typo in url + +------------------------------------------------------------------- +Thu Mar 30 14:23:45 UTC 2017 - werner(a)suse.de + +- Update project Url as well as Url path of source tar ball +- Add patch lynx-2.8.8-ncurses-6.0-20170318.patch to work + around internal header definition of ncurses-6.0-20170318 + +------------------------------------------------------------------- New: ---- lynx-2.8.8-ncurses-6.0-20170318.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.McGA8r/_old 2017-04-03 11:04:06.956091949 +0200 +++ /var/tmp/diff_new_pack.McGA8r/_new 2017-04-03 11:04:06.956091949 +0200 @@ -27,11 +27,11 @@ Release: 0 %define tarbase 2-8-8 %define dlbase 2.8.8 -Url: http://lynx.isc.org +Url: http://lynx.invisible-island.net/ Summary: A Text-Based WWW Browser License: GPL-2.0 Group: Productivity/Networking/Web/Browsers -Source: http://lynx.isc.org/%{name}%{dlbase}/%{name}%{version}.tar.bz2 +Source: http://invisible-mirror.net/archives/%{name}/tarballs/%{name}%{version}.tar… # Source1: po.tar.bz2 Patch100: lynx-2.8.5.dif Patch101: lynx-2.8.5-charset.patch @@ -39,6 +39,8 @@ Patch103: lynx-no-build-date.patch Patch104: lynx-2.8.8-expired-cookie-crash.patch Patch105: lynx-CVE-2016-9179.patch +# Workaround for ncurses-6.0-20170318 +Patch106: lynx-2.8.8-ncurses-6.0-20170318.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: lynxssl = %version Obsoletes: lynxssl < %version @@ -58,6 +60,7 @@ %patch103 %patch104 %patch105 -p1 +%patch106 -p1 # containing a few test msg's only: # rm -f po/{es,fr,it,ko,no,pl,pt}.po ++++++ lynx-2.8.8-ncurses-6.0-20170318.patch ++++++ Workaround for ncurses 6.0 patchlevel 20170318 + change TERMINAL structure in term.h to make it opaque. Some applications misuse its members, e.g., directly modifying it rather than using def_prog_mode(). --- lynx2-8-8/src/LYCurses.h | 4 ++++ lynx2-8-8/src/LYStrings.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) --- lynx2-8-8/src/LYCurses.h +++ lynx2-8-8/src/LYCurses.h 2017-03-30 14:16:32.181566069 +0000 @@ -234,6 +234,7 @@ typedef char chtype; # define getbkgd(w) wgetbkgd(w) /* workaround pre-1.9.9g bug */ # endif +# define NCURSES_INTERNALS 1 # ifdef FANCY_CURSES # if defined(NCURSES) && defined(HAVE_NCURSESW_TERM_H) # include <ncursesw/term.h> @@ -251,6 +252,9 @@ typedef char chtype; # endif # endif +# define CUR_TP ((TERMTYPE *)(cur_term)) +# undef NCURSES_INTERNALS + # if defined(NCURSES_VERSION) && defined(HAVE_DEFINE_KEY) # define USE_KEYMAPS 1 # endif --- lynx2-8-8/src/LYStrings.c +++ lynx2-8-8/src/LYStrings.c 2017-03-30 13:54:46.564223023 +0000 @@ -1008,8 +1008,8 @@ static const char *expand_tiname(const c LYStrNCpy(name, first, len); if ((code = lookup_tiname(name, strnames)) >= 0 || (code = lookup_tiname(name, strfnames)) >= 0) { - if (cur_term->type.Strings[code] != 0) { - LYStrNCpy(*result, cur_term->type.Strings[code], (final - *result)); + if (CUR_TP->Strings[code] != 0) { + LYStrNCpy(*result, CUR_TP->Strings[code], (final - *result)); (*result) += strlen(*result); } }

1 0

commit ncurses for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2017-04-03 11:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Mon Apr 3 11:03:59 2017 rev:128 rq:483739 version:6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2017-03-05 17:50:26.750957832 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2017-04-03 11:04:03.368598794 +0200 @@ -1,0 +2,67 @@ +Sun Mar 26 13:54:12 UTC 2017 - werner(a)suse.de + +- Add ncurses patch 20170325 + + fix a memory leak in the window-list when creating multiple screens + (reports by Andres Martinelli, Debian #783486). + + reviewed calls from link_test.c, added a few more null-pointer + checks. + + add a null-pointer check in ungetmouse, in case mousemask was not + called (report by "Kau"). + + updated curs_sp_funcs.3x for new functions. + +------------------------------------------------------------------- +Mon Mar 20 08:36:28 UTC 2017 - werner(a)suse.de + +- Add ncurses patch 20170318 + + change TERMINAL structure in term.h to make it opaque. Some + applications misuse its members, e.g., directly modifying it + rather than using def_prog_mode(). + + modify utility headers such as tic.h to make it clearer which are + externals that are used by tack. + + improve curs_slk.3x in particular its discussion of portability. + + fix cut/paste in legacy_encoding.3x + + add prototype for find_pair() to new_pair.3x (report by Branden + Robinson). + + fix a couple of broken links in generated man-html documentation. + + regenerate man-html documentation. +- Add tack patch 1.07.20170318 + * init.c: + use def_prog_mode() to eliminate two internal details from ncurses + * edit.c, tack.h: accommodate opaque TERMINAL structure in ncurses + * tack.h: update copyright to match version + * config.sub: 2017-02-07 + * config.guess: 2017-03-05 + +------------------------------------------------------------------- +Mon Mar 13 11:21:44 UTC 2017 - werner(a)suse.de + +- Add ncurses patch 20170311 + + modify vt100 rs2 string to reset vt52 mode and scrolling regions + (report/analysis by Robert King) -TD + + add vt100+4bsd building block, use that for older terminals rather + than "vt100" which is now mostly used as a building block for + terminal emulators -TD + + correct a few spelling errors in terminfo.src comments -TD + + add fbterm -TD + + fix a typo in ncurses.c test_attr legend (patch by Petr Vanek). + + changed internal colorpair_t to a struct, eliminating an internal + 8-bit limit on colors + + add ncurses/new_pair.h + + add ncurses/base/new_pair.c with alloc_pair(), find_pair() and + free_pair() functions + + add test/demo_new_pair.c +- Add ncurses patch 20170304 + + improve terminfo manual description of terminfo syntax. + + clarify the use of wint_t vs wchar_t in curs_get_wstr.3x + + improve description of endwin() in manual. + + modify setcchar() and getcchar() to treat negative color-pair as an + error. + + fix a typo in include/hashed_db.h (Andre Sa). + +------------------------------------------------------------------- +Thu Mar 2 13:31:07 UTC 2017 - werner(a)suse.de + +- Add ncurses patch 20170225 + + fixes for CF_CC_ENV_FLAGS (report by Ross Burton). + +------------------------------------------------------------------- Old: ---- tack-1.07-20150606.tgz New: ---- tack-1.07-20170318.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.1xLLRy/_old 2017-04-03 11:04:04.276470529 +0200 +++ /var/tmp/diff_new_pack.1xLLRy/_new 2017-04-03 11:04:04.280469964 +0200 @@ -60,7 +60,7 @@ Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://invisible-island.net/pub/ncurses/current/ -Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20150606.tgz +Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20170318.tgz Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.0.dif ++++++ ncurses-5.9-ibm327x.dif ++++++ --- /var/tmp/diff_new_pack.1xLLRy/_old 2017-04-03 11:04:04.348460358 +0200 +++ /var/tmp/diff_new_pack.1xLLRy/_new 2017-04-03 11:04:04.348460358 +0200 @@ -3,8 +3,8 @@ 1 file changed, 2 insertions(+), 2 deletions(-) --- misc/terminfo.src -+++ misc/terminfo.src 2017-01-30 08:58:00.238320491 +0000 -@@ -15941,8 +15941,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-03-13 11:21:16.882814756 +0000 +@@ -15974,8 +15974,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, ++++++ ncurses-6.0-patches.tar.bz2 ++++++ ++++ 53381 lines of diff (skipped) ++++++ ncurses-6.0.dif ++++++ ++++ 603 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ncurses/ncurses-6.0.dif ++++ and /work/SRC/openSUSE:Factory/.ncurses.new/ncurses-6.0.dif ++++++ tack-1.07-20150606.tgz -> tack-1.07-20170318.tgz ++++++ ++++ 8245 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/CHANGES new/tack-1.07-20170318/CHANGES --- old/tack-1.07-20150606/CHANGES 2015-06-03 12:32:53.000000000 +0200 +++ new/tack-1.07-20170318/CHANGES 2017-03-18 21:07:16.000000000 +0100 @@ -1,4 +1,65 @@ -2015-06-03 Thomas E. Dickey <tom(a)invisible-island.net> +2017-03-18 Thomas E. Dickey <dickey(a)invisible-island.net> + + * init.c: + use def_prog_mode() to eliminate two internal details from ncurses + + * edit.c, tack.h: accommodate opaque TERMINAL structure in ncurses + + * tack.h: update copyright to match version + + * configure: regen + + * aclocal.m4: resync with my-autoconf: + + CF_ADD_CFLAGS + improve formatting of generated lists using CF_APPEND_TEXT + + CF_CC_ENV_FLAGS + several fixes... + + CF_GNU_SOURCE + recent glibc (Debian 2.23-4 for example) has misordered ifdef/checks for + new symbol _DEFAULT_SOURCE, producing warning messages when only _GNU_SOURCE + is defined. Add a followup check to define _DEFAULT_SOURCE. + + CF_LD_RPATH_OPT + change FreeBSD to use -Wl,-rpath rather than -rpath option. According to + FreeBSD #178732, either works since FreeBSD 4.x; however scons does not + accept anything except the -Wl,-rpath form. + + CF_LIB_PREFIX + build-fixes for OS/2 + + CF_LINK_DATAONLY + quiet strict gcc warning + + CF_MAKEFLAGS + use $SHELL consistently + + CF_NCURSES_CONFIG + PKG_CONFIG may simply be unset - fix + + CF_PROG_LINT + add cpplint to programs to use; drop ad hoc tdlint and alint. + + CF_WITH_MAN2HTML + use configured shell + + CF_WITH_NCURSES_ETC + add check for ncurses pthreads + + CF_XOPEN_SOURCE + add "uclinux" to list of Linux's + use _GNU_SOURCE for cygwin headers, tested with cygwin 2.3, 2.5 + build-fixes for OS/2 + + * config.sub: 2017-02-07 + + * config.guess: 2017-03-05 + + * package/debian/changelog, package/tack.spec, tack.h: bump + +2015-07-06 Thomas E. Dickey <dickey(a)invisible-island.net> + + * package/debian/changelog, package/tack.spec, tack.h: bump + + * configure: regen + + * configure.in, Makefile.in: add --with-man2html + + * Makefile.in: fix copyright date + + * aclocal.m4: add --with-man2html + +2015-06-03 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen @@ -13,7 +74,7 @@ * configure.in: fix order of evaluation for CF_PKG_CONFIG -2015-06-02 Thomas E. Dickey <tom(a)invisible-island.net> +2015-06-02 Thomas E. Dickey <dickey(a)invisible-island.net> * configure.in: use CF_WITH_NCURSES_ETC, but disable the pdcurses flavor @@ -30,13 +91,13 @@ * tack.h, package/debian/changelog, package/tack.spec: bump -2015-05-02 Thomas E. Dickey <tom(a)invisible-island.net> +2015-05-02 Thomas E. Dickey <dickey(a)invisible-island.net> * config.guess: update to 2015-03-04 * config.sub: update to 2015-03-08 -2013-07-13 Thomas E. Dickey <tom(a)invisible-island.net> +2013-07-13 Thomas E. Dickey <dickey(a)invisible-island.net> * init.c: copyright-date @@ -76,11 +137,11 @@ + CF_CC_ENV_FLAGS: new macro + remove unused macros -2013-02-10 Thomas E. Dickey <tom(a)invisible-island.net> +2013-02-10 Thomas E. Dickey <dickey(a)invisible-island.net> * config.sub, config.guess: update to 2013-02-04 -2012-09-16 Thomas E. Dickey <tom(a)invisible-island.net> +2012-09-16 Thomas E. Dickey <dickey(a)invisible-island.net> * configure, configure.in: add check for long filenames to define HAVE_LONG_FILE_NAMES, needed to choose @@ -112,7 +173,7 @@ actually required) - remove configure-checks for AWK and LN_S variables -2012-09-16 Thomas E. Dickey <tom(a)invisible-island.net> +2012-09-16 Thomas E. Dickey <dickey(a)invisible-island.net> * Makefile.in: datarootdir is now needed for mandir remove unused includedir and datadir @@ -121,7 +182,7 @@ * configure: regen (will support --datarootdir with this) -2012-04-29 Thomas E. Dickey <tom(a)invisible-island.net> +2012-04-29 Thomas E. Dickey <dickey(a)invisible-island.net> * package/debian/changelog, package/tack.spec, tack.h: bump @@ -145,7 +206,7 @@ knowledge of the terminal (terminfo does not provide this), it is not possible to restore the original colors. -2012-04-28 Thomas E. Dickey <tom(a)invisible-island.net> +2012-04-28 Thomas E. Dickey <dickey(a)invisible-island.net> * charset.c: add a test for "eslok" capability @@ -157,7 +218,7 @@ the last change could produce unbalanced quote with certain shells - check for that and repair it (report by Samuel Bronson). -2012-03-03 Thomas E. Dickey <tom(a)invisible-island.net> +2012-03-03 Thomas E. Dickey <dickey(a)invisible-island.net> * fun.c: gcc warning @@ -186,7 +247,7 @@ * tack.h: quiet unnecesary warning about ignoring return-value from system() -2012-03-02 Thomas E. Dickey <tom(a)invisible-island.net> +2012-03-02 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen @@ -210,7 +271,7 @@ Add CF_ERRNO, CF_LINK_DATAONLY checks with supporting macros to address gcc -Wundef warnings about DECL_ERRNO and BROKEN_LINKER symbols. -2012-03-01 Thomas E. Dickey <tom(a)invisible-island.net> +2012-03-01 Thomas E. Dickey <dickey(a)invisible-island.net> * Makefile.in: copyright date @@ -235,7 +296,7 @@ because the latter breaks builds with libtool -TD -2012-02-26 Thomas E. Dickey <tom(a)invisible-island.net> +2012-02-26 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen @@ -267,11 +328,11 @@ OpenBSD as well as configure check with CF_TRY_XOPEN_SOURCE. Also modify version pattern for newer AIX systems, -2012-02-25 Thomas E. Dickey <tom(a)invisible-island.net> +2012-02-25 Thomas E. Dickey <dickey(a)invisible-island.net> * config.guess, config.sub: update to 2012-02-10 -2011-06-26 Thomas E. Dickey <tom(a)invisible-island.net> +2011-06-26 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen @@ -290,7 +351,7 @@ * scan.wy150: New file. -2011-05-01 Thomas E. Dickey <tom(a)invisible-island.net> +2011-05-01 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen @@ -316,15 +377,15 @@ * package/debian/changelog, package/tack.spec, tack.h: bump -2011-04-01 Thomas E. Dickey <tom(a)invisible-island.net> +2011-04-01 Thomas E. Dickey <dickey(a)invisible-island.net> * config.sub: update to 2011-04-01 -2011-02-02 Thomas E. Dickey <tom(a)invisible-island.net> +2011-02-02 Thomas E. Dickey <dickey(a)invisible-island.net> * config.guess: update to 2011-01-01 -2010-09-04 Thomas E. Dickey <tom(a)invisible-island.net> +2010-09-04 Thomas E. Dickey <dickey(a)invisible-island.net> * package/tack.spec, package/debian/rules, package/debian/docs, package/debian/copyright, package/debian/control, package/debian/watch, package/debian/changelog, package/debian/source/format: RCS_BASE @@ -334,7 +395,7 @@ * tack.c, tack.h: add patch-date to version message -2010-09-03 Thomas E. Dickey <tom(a)invisible-island.net> +2010-09-03 Thomas E. Dickey <dickey(a)invisible-island.net> * AUTHORS: RCS_BASE @@ -360,11 +421,11 @@ * menu.c, init.c, fun.c, edit.c, crum.c, control.c, color.c, charset.c, ansi.c: indent -2010-04-20 Thomas E. Dickey <tom(a)invisible-island.net> +2010-04-20 Thomas E. Dickey <dickey(a)invisible-island.net> * package/debian/compat: RCS_BASE -2009-12-26 Thomas E. Dickey <tom(a)invisible-island.net> +2009-12-26 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen to get new macros, as well as to use autoconf-252 (patched) @@ -389,22 +450,22 @@ fix an incorrect malloc-size in show_report(), which could cause core-dump when displaying long list of function-keys, e.g., for xterm-new -2009-11-19 Thomas E. Dickey <tom(a)invisible-island.net> +2009-11-19 Thomas E. Dickey <dickey(a)invisible-island.net> * config.guess, config.sub: update to 2009-11-20 -2007-08-12 Thomas E. Dickey <tom(a)invisible-island.net> +2007-08-12 Thomas E. Dickey <dickey(a)invisible-island.net> * edit.c: as of 2007/8/12, ncurses no longer exports the data _nc_info_hash_table. Instead, use the function _nc_get_hash_table(), which is in ncurses 5.0 -2007-08-11 Thomas E. Dickey <tom(a)invisible-island.net> +2007-08-11 Thomas E. Dickey <dickey(a)invisible-island.net> * HISTORY: tweak to build with latest ncurses (does not rely on new api's) -2007-04-29 Thomas E. Dickey <tom(a)invisible-island.net> +2007-04-29 Thomas E. Dickey <dickey(a)invisible-island.net> * HISTORY, tack.h: mark 1.05 @@ -436,7 +497,7 @@ update $(LINK) to work with ncurses after importing CF_WITH_LIBTOOL change that moved $(CC) into $(LIBTOOL_LINK) symbol. -2007-04-08 Thomas E. Dickey <tom(a)invisible-island.net> +2007-04-08 Thomas E. Dickey <dickey(a)invisible-island.net> * configure: regen'd @@ -482,15 +543,15 @@ * HISTORY: 1.04 -2007-04-07 Thomas E. Dickey <tom(a)invisible-island.net> +2007-04-07 Thomas E. Dickey <dickey(a)invisible-island.net> * ansi.c, output.c: fixes from Coverity report -2007-03-25 Thomas E. Dickey <tom(a)invisible-island.net> +2007-03-25 Thomas E. Dickey <dickey(a)invisible-island.net> * mkdirs.sh: RCS_BASE -2007-01-28 Thomas E. Dickey <tom(a)invisible-island.net> +2007-01-28 Thomas E. Dickey <dickey(a)invisible-island.net> * HISTORY: tack's out of ncurses now. @@ -502,13 +563,13 @@ * Makefile.in: tweaks to work after chopping out of ncurses tree -2007-01-27 Thomas E. Dickey <tom(a)invisible-island.net> +2007-01-27 Thomas E. Dickey <dickey(a)invisible-island.net> * HISTORY: update to 1.03 * README: FROM_KEYS -2007-01-13 Thomas E. Dickey <tom(a)invisible-island.net> +2007-01-13 Thomas E. Dickey <dickey(a)invisible-island.net> * Makefile.in: FROM_KEYS @@ -516,19 +577,19 @@ * configure.in, aclocal.m4: FROM_KEYS -2006-12-23 Thomas E. Dickey <tom(a)invisible-island.net> +2006-12-23 Thomas E. Dickey <dickey(a)invisible-island.net> * modules: FROM_KEYS -2006-12-22 Thomas E. Dickey <tom(a)invisible-island.net> +2006-12-22 Thomas E. Dickey <dickey(a)invisible-island.net> * config.guess: RCS_BASE -2006-12-08 Thomas E. Dickey <tom(a)invisible-island.net> +2006-12-08 Thomas E. Dickey <dickey(a)invisible-island.net> * config.sub: RCS_BASE -2006-11-25 Thomas E. Dickey <tom(a)invisible-island.net> +2006-11-25 Thomas E. Dickey <dickey(a)invisible-island.net> * output.c: FROM_KEYS @@ -540,19 +601,19 @@ * color.c, charset.c, tack.h: FROM_KEYS -2006-06-24 Thomas E. Dickey <tom(a)invisible-island.net> +2006-06-24 Thomas E. Dickey <dickey(a)invisible-island.net> * control.c, edit.c: FROM_KEYS -2006-05-06 Thomas E. Dickey <tom(a)invisible-island.net> +2006-05-06 Thomas E. Dickey <dickey(a)invisible-island.net> * sync.c: FROM_KEYS -2006-04-22 Thomas E. Dickey <tom(a)invisible-island.net> +2006-04-22 Thomas E. Dickey <dickey(a)invisible-island.net> * tack.1: FROM_KEYS -2005-09-17 Thomas E. Dickey <tom(a)invisible-island.net> +2005-09-17 Thomas E. Dickey <dickey(a)invisible-island.net> * ansi.c, pad.c, sysdep.c: FROM_KEYS @@ -560,33 +621,33 @@ * COPYING: fix address -2003-11-29 Thomas E. Dickey <tom(a)invisible-island.net> +2003-11-29 Thomas E. Dickey <dickey(a)invisible-island.net> * install-sh: resync with my-autoconf -2002-06-29 Thomas E. Dickey <tom(a)invisible-island.net> +2002-06-29 Thomas E. Dickey <dickey(a)invisible-island.net> * mkinstalldirs: RCS_BASE -2001-06-22 Thomas E. Dickey <tom(a)invisible-island.net> +2001-06-22 Thomas E. Dickey <dickey(a)clark.net> * install-sh: RCS_BASE -1999-02-07 Thomas E. Dickey <tom(a)invisible-island.net> +1999-02-07 Thomas E. Dickey <dickey(a)clark.net> * HISTORY: nit * init.c: tweak to make this build after renaming as per Alexander -1998-09-26 Thomas E. Dickey <tom(a)invisible-island.net> +1998-09-26 Thomas E. Dickey <dickey(a)clark.net> * edit.c: add param to _nc_tic_expand() -1998-03-28 Thomas E. Dickey <tom(a)invisible-island.net> +1998-03-28 Thomas E. Dickey <dickey(a)clark.net> * Makefile.in: updates to sync with ncurses 4.2 -1998-02-11 Thomas E. Dickey <tom(a)invisible-island.net> +1998-02-11 Thomas E. Dickey <dickey(a)clark.net> * ncurses_tst.hin: FROM_KEYS @@ -595,7 +656,7 @@ * tack.c, Makefile.in, tack.h, control.c, color.c, charset.c, ansi.c, sysdep.c, sync.c, scan.c, pad.c, output.c, modes.c, menu.c, init.c, fun.c, edit.c, crum.c, HISTORY, COPYING: tack-1.00 -1998-01-03 Thomas E. Dickey <tom(a)invisible-island.net> +1998-01-03 Thomas E. Dickey <dickey(a)clark.net> * tack.h: moved ncurses' externs to tic.h @@ -605,7 +666,7 @@ * tack.h: SCO's compiler doesn't like array-of-const -1998-01-02 Thomas E. Dickey <tom(a)invisible-island.net> +1998-01-02 Thomas E. Dickey <dickey(a)clark.net> * control.c: work with no 'gettimeofday()' workaround for SCO 3.x compiler which gets confused by array of const. @@ -614,13 +675,13 @@ * ansi.c: SCO's compiler: parameter promotion warnings. -1997-12-28 Thomas E. Dickey <tom(a)invisible-island.net> +1997-12-28 Thomas E. Dickey <dickey(a)clark.net> * tack.h: first cut of fixes for AIX/SCO/CLIX * sysdep.c, control.c: first cut of fixes for AIX/CLIX/SCO -1997-12-27 Thomas E. Dickey <tom(a)invisible-island.net> +1997-12-27 Thomas E. Dickey <dickey(a)clark.net> * ansi.c, charset.c, control.c, crum.c, edit.c, fun.c, init.c, menu.c, modes.c, output.c, scan.c, sync.c, sysdep.c, tack.c: integration with ncurses: restructured includes, fix gcc warnings @@ -693,7 +754,7 @@ * tack.c, sysdep.c, scan.c, output.c, modes.c, menu.c, init.c, crum.c, color.c, charset.c, ansi.c, HISTORY: ncurses-4.1-971101 -1997-10-11 Thomas E. Dickey <dickey(a)invisible-island.net> +1997-10-11 dickey(a)clark.net * RCS: PERMIT FILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/configure.in new/tack-1.07-20170318/configure.in --- old/tack-1.07-20150606/configure.in 2015-06-03 12:30:39.000000000 +0200 +++ new/tack-1.07-20170318/configure.in 2015-07-06 10:42:39.000000000 +0200 @@ -28,7 +28,7 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.28 2015/06/03 10:30:39 tom Exp $ +dnl $Id: configure.in,v 1.29 2015/07/06 08:42:39 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). @@ -210,6 +210,8 @@ TICS_LIBS="$LIBS" LIBS= +CF_WITH_MAN2HTML + ### Now that we're done running tests, add the compiler-warnings, if any CF_ADD_CFLAGS($EXTRA_CFLAGS) @@ -234,8 +236,8 @@ $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) $N.c TEST_EOF done -CF_MAKE_DOCS(tack,1) ],[], [set |fgrep _CC= |sed -e s%=%=\'% -e s%\$%\'% -e s%\'\'%\'%g -e s%=\'\$%=\'\'% >>$CONFIG_STATUS cat]) # vi:ts=4 sw=4 +CF_MAKE_DOCS(tack,1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/edit.c new/tack-1.07-20170318/edit.c --- old/tack-1.07-20150606/edit.c 2012-09-17 00:23:46.000000000 +0200 +++ new/tack-1.07-20170318/edit.c 2017-03-18 20:58:53.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1997-2010,2012 Free Software Foundation, Inc. +** Copyright (C) 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,7 +23,7 @@ #include <time.h> #include <tic.h> -MODULE_ID("$Id: edit.c,v 1.19 2012/09/16 22:23:46 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.20 2017/03/18 19:58:53 tom Exp $") /* * Terminfo edit features @@ -786,7 +786,7 @@ alloc_arrays(); - _nc_copy_termtype(&original_term, &cur_term->type); + _nc_copy_termtype(&original_term, CUR_TP); for (i = 0; i < BOOLCOUNT; i++) { original_term.Booleans[i] = CUR Booleans[i]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/init.c new/tack-1.07-20170318/init.c --- old/tack-1.07-20150606/init.c 2013-07-13 20:59:47.000000000 +0200 +++ new/tack-1.07-20170318/init.c 2017-03-18 21:07:16.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2012,2013 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2013,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,11 +23,7 @@ #include <tack.h> #include <tic.h> -MODULE_ID("$Id: init.c,v 1.17 2013/07/13 18:59:47 tom Exp $") - -#if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219 -#define _nc_get_curterm(p) _nc_get_tty_mode(p) -#endif +MODULE_ID("$Id: init.c,v 1.18 2017/03/18 20:07:16 tom Exp $") FILE *debug_fp; char temp[1024]; @@ -237,7 +233,7 @@ * Get the current terminal definitions. This must be done before * getting the baudrate. */ - _nc_get_curterm(&cur_term->Nttyb); + def_prog_mode(); if (baudrate() > 0) tty_baud_rate = (unsigned) baudrate(); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/package/debian/changelog new/tack-1.07-20170318/package/debian/changelog --- old/tack-1.07-20150606/package/debian/changelog 2015-06-02 10:45:21.000000000 +0200 +++ new/tack-1.07-20170318/package/debian/changelog 2017-03-18 15:04:06.000000000 +0100 @@ -1,3 +1,15 @@ +tack (1.07+20170318) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Sat, 18 Mar 2017 10:04:06 -0400 + +tack (1.07+20150706) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Mon, 06 Jul 2015 04:45:30 -0400 + tack (1.07+20150606) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/package/tack.spec new/tack-1.07-20170318/package/tack.spec --- old/tack-1.07-20150606/package/tack.spec 2015-06-02 10:45:21.000000000 +0200 +++ new/tack-1.07-20170318/package/tack.spec 2017-03-18 15:04:06.000000000 +0100 @@ -1,8 +1,8 @@ Summary: tack - terminfo action checker %define AppProgram tack %define AppVersion 1.07 -%define AppRelease 20150606 -# $XTermId: tack.spec,v 1.9 2015/06/02 08:45:21 tom Exp $ +%define AppRelease 20170318 +# $XTermId: tack.spec,v 1.11 2017/03/18 14:04:06 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20150606/tack.h new/tack-1.07-20170318/tack.h --- old/tack-1.07-20150606/tack.h 2015-06-02 11:05:07.000000000 +0200 +++ new/tack-1.07-20170318/tack.h 2017-03-18 20:56:17.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2013,2015 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2015,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.37 2015/06/02 09:05:07 tom Exp $ */ +/* $Id: tack.h,v 1.41 2017/03/18 19:56:17 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -28,7 +28,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 7 -#define PATCH_VERSION 20150606 +#define PATCH_VERSION 20170318 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> @@ -100,7 +100,7 @@ #define FreeIfNeeded(p) if (p) { free(p); p = 0; } -#define CUR_TP (&(cur_term->type)) +#define CUR_TP ((TERMTYPE *)(cur_term)) #define MAX_STRINGS NUM_STRINGS(CUR_TP) #define STR_NAME(n) ExtStrname(CUR_TP,n,strnames)

1 0

commit rpm for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2017-04-03 11:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm" Mon Apr 3 11:03:53 2017 rev:244 rq:483307 version:4.13.0.1 Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-03-03 17:41:48.072309788 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-04-03 11:03:56.105624915 +0200 @@ -1,0 +2,13 @@ +Fri Mar 17 18:14:37 UTC 2017 - kukuk(a)suse.com + +- Convert rpmconfigcheck init script to systemd unit + +------------------------------------------------------------------- +Mon Mar 6 12:37:48 UTC 2017 - rguenther(a)suse.com + +- Tweak debugsubpkg.diff to no longer use obsoleted RPM interfaces + and add support for debuginfo compressed by DWZ. +- Add %_find_debuginfo_dwz_opts and DWZ limits to macrosin.diff. +- Add dwz requires to rpm-build. [fate#322957] + +------------------------------------------------------------------- @@ -11,0 +25,10 @@ + +------------------------------------------------------------------- +Wed Feb 22 12:54:05 UTC 2017 - bwiedemann(a)suse.com + +- Add upstream patches 0001-set-SOURCE_DATE_EPOCH-from-changelog.patch + 0002-Extend-changelog-to-support-full-timestamps-903.patch + 0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch + 0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch + in order to allow for building bit-identical rpms as described in + https://github.com/rpm-software-management/rpm/pull/144 New: ---- 0001-set-SOURCE_DATE_EPOCH-from-changelog.patch 0002-Extend-changelog-to-support-full-timestamps-903.patch 0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch 0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch rpmconfigcheck.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.2v5qrN/_old 2017-04-03 11:04:00.784963813 +0200 +++ /var/tmp/diff_new_pack.2v5qrN/_new 2017-04-03 11:04:00.784963813 +0200 @@ -59,6 +59,7 @@ Source10: beecrypt-4.1.2.tar.bz2 Source11: db-4.8.30.tar.bz2 Source12: baselibs.conf +Source13: rpmconfigcheck.service Patch1: beecrypt-4.1.2.diff Patch2: db.diff Patch3: rpm-4.12.0.1-fix-bashisms.patch @@ -125,6 +126,14 @@ Patch77: langnoc.diff Patch78: headerchk2.diff Patch79: helperenv.diff +# PATCH-FEATURE-UPSTREAM 4.14 0e87aed1785d0531c40b23889f8338744f6abb3a +Patch80: 0001-set-SOURCE_DATE_EPOCH-from-changelog.patch +# PATCH-FEATURE-UPSTREAM 4.14 57f94a582602f0353cdb17a02dc12c4461d4f32d +Patch81: 0002-Extend-changelog-to-support-full-timestamps-903.patch +# PATCH-FEATURE-UPSTREAM 4.14 8d84878ee05b2e63858af3a5a49d98e9e2933b1b +Patch82: 0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch +# PATCH-FEATURE-UPSTREAM 4.14 b8a54d6a1e9bb6140b6b47e23dc707e4b967537e +Patch83: 0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch Patch85: brp-compress-no-img.patch Patch92: find-lang-python.patch Patch93: weakdepscompat.diff @@ -176,6 +185,7 @@ Requires: bzip2 Requires: coreutils Requires: diffutils +Requires: dwz Requires: file Requires: findutils Requires: gawk @@ -227,7 +237,7 @@ %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 %patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 85 +%patch -P 80 -P 81 -P 82 -P 83 -P 85 %patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99 %patch -P 100 -P 101 -P 102 @@ -300,10 +310,10 @@ for f in %{buildroot}/%{_libdir}/*.la; do sed -i -e "s,/%_lib/libpopt.la,-lpopt,g" $f done -mkdir -p %{buildroot}/etc/init.d -install -m 755 %{SOURCE8} %{buildroot}/etc/init.d mkdir -p %{buildroot}/usr/sbin -ln -sf ../../etc/init.d/rpmconfigcheck %{buildroot}/usr/sbin/rcrpmconfigcheck +install -m 755 %{SOURCE8} %{buildroot}/usr/sbin +mkdir -p %{buildroot}/usr/lib/systemd/system +install -m 644 %{SOURCE13} %{buildroot}/usr/lib/systemd/system/ cp -a suse_macros %{buildroot}/usr/lib/rpm mkdir -p %{buildroot}/usr/lib/rpm/macros.d mkdir -p %{buildroot}/usr/lib/rpm/suse @@ -392,8 +402,8 @@ /bin/rpm /usr/bin/* %exclude /usr/bin/rpmbuild - /etc/init.d/rpmconfigcheck - /usr/sbin/rcrpmconfigcheck + /usr/sbin/rpmconfigcheck + /usr/lib/systemd/system/rpmconfigcheck.service /usr/lib/rpm %{_libdir}/rpm-plugins %{_libdir}/librpm.so.* ++++++ 0001-set-SOURCE_DATE_EPOCH-from-changelog.patch ++++++ >From 42906a9c5da4c89128ed8ffb619f8ef1fa2d9b93 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <bwiedemann(a)suse.de> Date: Fri, 27 Jan 2017 13:01:57 +0100 Subject: [PATCH 1/4] set SOURCE_DATE_EPOCH from changelog if requested by macro to allow for more reproducible builds of packages. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. (cherry picked from commit 0e87aed1785d0531c40b23889f8338744f6abb3a) --- build/build.c | 15 +++++++++++++++ macros.in | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/build/build.c b/build/build.c index 04b039c..89b04ce 100644 --- build/build.c +++ build/build.c @@ -209,6 +209,21 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what) int test = (what & RPMBUILD_NOBUILD); char *cookie = buildArgs->cookie ? xstrdup(buildArgs->cookie) : NULL; + if (rpmExpandNumeric("%{?source_date_epoch_from_changelog}") && + getenv("SOURCE_DATE_EPOCH") == NULL) { + /* Use date of first (== latest) changelog entry */ + Header h = spec->packages->header; + struct rpmtd_s td; + if (headerGet(h, RPMTAG_CHANGELOGTIME, &td, (HEADERGET_MINMEM|HEADERGET_RAW))) { + char sdestr[22]; + snprintf(sdestr, sizeof(sdestr), "%lli", + (long long) rpmtdGetNumber(&td)); + rpmlog(RPMLOG_NOTICE, _("setting %s=%s\n"), "SOURCE_DATE_EPOCH", sdestr); + setenv("SOURCE_DATE_EPOCH", sdestr, 0); + rpmtdFreeData(&td); + } + } + /* XXX TODO: rootDir is only relevant during build, eliminate from spec */ spec->rootDir = buildArgs->rootdir; if (!spec->recursing && spec->BACount) { diff --git a/macros.in b/macros.in index fd57f2e..85f172a 100644 --- macros.in +++ macros.in @@ -210,6 +210,10 @@ package or when debugging this package.\ # Any older entry is not packaged in binary packages. %_changelog_trimtime 0 +# If true, set the SOURCE_DATE_EPOCH environment variable +# to the timestamp of the topmost changelog entry +%source_date_epoch_from_changelog 0 + # The directory where newly built binary packages will be written. %_rpmdir %{_topdir}/RPMS -- 2.10.2 ++++++ 0002-Extend-changelog-to-support-full-timestamps-903.patch ++++++ >From b74958824c7e0d7c12550ba22d9b31da040d2cd4 Mon Sep 17 00:00:00 2001 From: Pavlina <pavlina(a)dhcp-27-209.brq.redhat.com> Date: Thu, 6 Oct 2016 08:59:47 +0200 Subject: [PATCH 2/4] Extend %changelog to support full timestamps (#903) The newly accepted date format is Mon Jan 6 09:02:22 CEST 2016 (like output of "date" command). Original format "Mon Jun 6 2016" is still supported. (cherry picked from commit 57f94a582602f0353cdb17a02dc12c4461d4f32d) --- build/parseChangelog.c | 106 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 89 insertions(+), 17 deletions(-) diff --git a/build/parseChangelog.c b/build/parseChangelog.c index ff301b9..82fd096 100644 --- build/parseChangelog.c +++ build/parseChangelog.c @@ -32,17 +32,20 @@ static int sameDate(const struct tm *ot, const struct tm *nt) /** * Parse date string to seconds. + * accepted date formats are "Mon Jun 6 2016" (original one) + * and "Thu Oct 6 06:48:39 CEST 2016" (extended one) * @param datestr date string (e.g. 'Wed Jan 1 1997') * @retval secs secs since the unix epoch * @return 0 on success, -1 on error */ -static int dateToTimet(const char * datestr, time_t * secs) +static int dateToTimet(const char * datestr, time_t * secs, int * date_words) { int rc = -1; /* assume failure */ struct tm time, ntime; const char * const * idx; char *p, *pe, *q, *date, *tz; - + char tz_name[10]; /* name of timezone (if extended format is used) */ + static const char * const days[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", NULL }; static const char * const months[] = @@ -80,26 +83,93 @@ static int dateToTimet(const char * datestr, time_t * secs) if (*p == '\0') goto exit; pe = p; SKIPNONSPACE(pe); if (*pe != '\0') *pe++ = '\0'; - /* make this noon so the day is always right (as we make this UTC) */ - time.tm_hour = 12; - time.tm_mday = strtol(p, &q, 10); if (!(q && *q == '\0')) goto exit; if (time.tm_mday < 0 || time.tm_mday > lengths[time.tm_mon]) goto exit; - /* year */ - p = pe; SKIPSPACE(p); - if (*p == '\0') goto exit; - pe = p; SKIPNONSPACE(pe); if (*pe != '\0') *pe = '\0'; + /* first part of year entry (original format) / time entry (extended format)*/ + p = pe; + SKIPSPACE(p); + if (*p == '\0') + goto exit; + + /* in the original format here is year record (e.g. 1999), + * in the extended one here is time stamp (e.g. 10:22:30). + * Choose the format + */ + if ((p[1]==':') || ((p[1]!='\0') && ((p[2]==':')))) { + /* it can be extended format */ + *date_words = 6; + + /* second part of time entry */ + /* hours */ + time.tm_hour = strtol(p, &q, 10); + if ( (time.tm_hour < 0) || (time.tm_hour > 23) ) + goto exit; + if (*q!=':') + goto exit; + p = ++q; + /* minutes */ + time.tm_min = strtol(p, &q, 10); + if ( (time.tm_min < 0) || (time.tm_min > 59) ) + goto exit; + if (*q != ':') + goto exit; + p = ++q; + /* time - seconds */ + time.tm_sec = strtol(p, &q, 10); + if ( (time.tm_sec < 0) || (time.tm_sec > 59) ) + goto exit; + p = q; + + /* time zone name */ + SKIPSPACE(p); + if (*p == '\0') + goto exit; + pe = p; + SKIPNONSPACE(pe); + if (*pe != '\0') + *pe++ = '\0'; + if (((int)(pe-p) + 1) > 9 ) + goto exit; + strncpy(tz_name, p, (int)(pe-p)); + tz_name[(int)(pe-p)] = '\0'; + + /* first part of year entry */ + p = pe; + SKIPSPACE(p); + if (*p == '\0') + goto exit; + } else { + *date_words = 4; + /* the original format */ + /* make this noon so the day is always right (as we make this UTC) */ + time.tm_hour = 12; + } + + /* year - second part */ + pe = p; + SKIPNONSPACE(pe); + if (*pe != '\0') + *pe = '\0'; time.tm_year = strtol(p, &q, 10); if (!(q && *q == '\0')) goto exit; if (time.tm_year < 1990 || time.tm_year >= 3000) goto exit; time.tm_year -= 1900; - /* chnagelog date is always in UTC */ + /* change time zone and compute calendar time representation */ tz = getenv("TZ"); - if (tz) tz = xstrdup(tz); - setenv("TZ", "UTC", 1); + if (tz) + tz = xstrdup(tz); + if (*date_words == 6) { + /* changelog date is in read time zone */ + tz = getenv("TZ"); + if (tz) tz = xstrdup(tz); + setenv("TZ", tz_name, 1); + } else { + /* changelog date is always in UTC */ + setenv("TZ", "UTC", 1); + } ntime = time; /* struct assignment */ *secs = mktime(&ntime); unsetenv("TZ"); @@ -107,6 +177,7 @@ static int dateToTimet(const char * datestr, time_t * secs) setenv("TZ", tz, 1); free(tz); } + if (*secs == -1) goto exit; /* XXX Turn this into a hard error in a release or two */ @@ -135,6 +206,7 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb) time_t lastTime = 0; time_t trimtime = rpmExpandNumeric("%{?_changelog_trimtime}"); char *date, *name, *text, *next; + int date_words; /* number of words in date string */ s = sp = argvJoin(sb, ""); @@ -160,12 +232,8 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb) /* 4 fields of date */ date++; s = date; - for (i = 0; i < 4; i++) { - SKIPSPACE(s); - SKIPNONSPACE(s); - } SKIPSPACE(date); - if (dateToTimet(date, &time)) { + if (dateToTimet(date, &time, &date_words)) { rpmlog(RPMLOG_ERR, _("bad date in %%changelog: %s\n"), date); goto exit; } @@ -174,6 +242,10 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb) _("%%changelog not in descending chronological order\n")); goto exit; } + for (i = 0; i < date_words; i++) { + SKIPSPACE(s); + SKIPNONSPACE(s); + } lastTime = time; /* skip space to the name */ -- 2.10.2 ++++++ 0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch ++++++ >From f2aa612c5a2a99e1186853a3d00d43607bdc6aa2 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <bwiedemann(a)suse.de> Date: Sun, 13 Mar 2016 10:20:47 +0100 Subject: [PATCH 3/4] Allow SOURCE_DATE_EPOCH to override file timestamps Limit the maximum date to SOURCE_DATE_EPOCH or use origtime if not defined similar to the tar --clamp-mtime option based on a patch by Nicolas Vigier <boklm at torproject.org> (cherry picked from commit 8d84878ee05b2e63858af3a5a49d98e9e2933b1b) --- build/files.c | 22 ++++++++++++++++++++++ macros.in | 5 +++++ 2 files changed, 27 insertions(+) diff --git build/files.c build/files.c index b76ce04..48b03e9 100644 --- build/files.c +++ build/files.c @@ -9,6 +9,7 @@ #define MYALLPERMS 07777 #include <errno.h> +#include <stdlib.h> #include <regex.h> #if WITH_CAP #include <sys/capability.h> @@ -939,6 +940,24 @@ static void genCpioListAndHeader(FileList fl, Package pkg, int isSrc) uint32_t defaultalgo = PGPHASHALGO_MD5, digestalgo; rpm_loff_t totalFileSize = 0; Header h = pkg->header; /* just a shortcut */ + int override_date = 0; + time_t source_date_epoch; + char *srcdate = getenv("SOURCE_DATE_EPOCH"); + + /* Limit the maximum date to SOURCE_DATE_EPOCH if defined + * similar to the tar --clamp-mtime option + * https://reproducible-builds.org/specs/source-date-epoch/ + */ + if (srcdate && rpmExpandNumeric("%{?clamp_mtime_to_source_date_epoch}")) { + char *endptr; + errno = 0; + source_date_epoch = strtol(srcdate, &endptr, 10); + if (srcdate == endptr || *endptr || errno != 0) { + rpmlog(RPMLOG_ERR, _("unable to parse %s=%s\n"), "SOURCE_DATE_EPOCH", srcdate); + exit(28); + } + override_date = 1; + } /* * See if non-md5 file digest algorithm is requested. If not @@ -1070,6 +1089,9 @@ static void genCpioListAndHeader(FileList fl, Package pkg, int isSrc) } } + if (override_date && flp->fl_mtime > source_date_epoch) { + flp->fl_mtime = source_date_epoch; + } /* * For items whose size varies between systems, always explicitly * cast to the header type before inserting. diff --git macros.in macros.in index 85f172a..e0d7b7f 100644 --- macros.in +++ macros.in @@ -214,6 +214,11 @@ package or when debugging this package.\ # to the timestamp of the topmost changelog entry %source_date_epoch_from_changelog 0 +# If true, make sure that timestamps in built rpms +# are not later than the value of SOURCE_DATE_EPOCH. +# Is ignored when SOURCE_DATE_EPOCH is not set. +%clamp_mtime_to_source_date_epoch 0 + # The directory where newly built binary packages will be written. %_rpmdir %{_topdir}/RPMS -- 2.10.2 ++++++ 0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch ++++++ >From 686ff4634d69999740c93eea761b09c3fb17c2f6 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 3 Dec 2015 12:57:22 +0100 Subject: [PATCH 4/4] Allow SOURCE_DATE_EPOCH to override RPMTAG_BUILDTIME SOURCE_DATE_EPOCH environment variable is a distribution-agnostic standard for build systems to exchange a timestamp. SOURCE_DATE_EPOCH specification is available at: https://reproducible-builds.org/specs/source-date-epoch Signed-off-by: Dhiru Kholia <dhiru(a)openwall.com> (cherry picked from commit b8a54d6a1e9bb6140b6b47e23dc707e4b967537e) --- build/pack.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git build/pack.c build/pack.c index 094419e..8305b42 100644 --- build/pack.c +++ build/pack.c @@ -154,9 +154,23 @@ exit: static rpm_time_t * getBuildTime(void) { static rpm_time_t buildTime[1]; + char *srcdate; + time_t epoch; + char *endptr; + + if (buildTime[0] == 0) { + srcdate = getenv("SOURCE_DATE_EPOCH"); + if (srcdate) { + errno = 0; + epoch = strtol(srcdate, &endptr, 10); + if (srcdate == endptr || *endptr || errno != 0) + rpmlog(RPMLOG_ERR, _("unable to parse SOURCE_DATE_EPOCH\n")); + else + buildTime[0] = (int32_t) epoch; + } else + buildTime[0] = (int32_t) time(NULL); + } - if (buildTime[0] == 0) - buildTime[0] = (int32_t) time(NULL); return buildTime; } -- 2.10.2 ++++++ debugsubpkg.diff ++++++ --- /var/tmp/diff_new_pack.2v5qrN/_old 2017-04-03 11:04:00.944941211 +0200 +++ /var/tmp/diff_new_pack.2v5qrN/_new 2017-04-03 11:04:00.948940646 +0200 @@ -1,7 +1,5 @@ -Create a debuginfo package for each subpackage. - ---- ./build/files.c.orig 2016-10-21 09:44:00.300962089 +0000 -+++ ./build/files.c 2017-01-19 13:01:34.731859805 +0000 +--- ./build/files.c.orig 2017-02-16 09:52:49.292092380 +0000 ++++ ./build/files.c 2017-03-22 13:32:42.911865500 +0000 @@ -21,6 +21,10 @@ #include <rpm/rpmlog.h> #include <rpm/rpmbase64.h> @@ -13,7 +11,7 @@ #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "misc/fts.h" #include "lib/rpmfi_internal.h" /* XXX fi->apath */ -@@ -2156,13 +2160,238 @@ exit: +@@ -2155,13 +2159,302 @@ exit: return rc; } @@ -22,7 +20,7 @@ + allocated *build_id array of size *build_id_size. Returns -1 on + error. */ + -+int ++static int +getELFBuildId (const char *name, + unsigned char **id, size_t *id_size) +{ @@ -70,32 +68,33 @@ + Elf_Data src = dst; + + gelf_getshdr (s, &shdr); -+ if (shdr.sh_type != SHT_NOTE -+ || !(shdr.sh_flags & SHF_ALLOC)) ++ /* LD creates .note.gnu.build-id with SHF_ALLOC but the DWZ ++ common debuginfo only file only has non-allocated sections. */ ++ if (shdr.sh_type != SHT_NOTE) + continue; + + /* Look for a build-ID note here. */ + data = elf_rawdata (s, NULL); + src.d_buf = data->d_buf; + assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr)); -+ while (data->d_buf + data->d_size - src.d_buf > (int) sizeof nh ++ while ((unsigned char *)data->d_buf + data->d_size - (unsigned char *)src.d_buf > (int) sizeof nh + && elf32_xlatetom (&dst, &src, ehdr.e_ident[EI_DATA])) + { + Elf32_Word len = sizeof nh + nh.n_namesz; + len = (len + 3) & ~3; + + if (nh.n_namesz == sizeof "GNU" && nh.n_type == 3 -+ && !memcmp (src.d_buf + sizeof nh, "GNU", sizeof "GNU")) ++ && !memcmp ((unsigned char *)src.d_buf + sizeof nh, "GNU", sizeof "GNU")) + { + build_id = data; -+ build_id_offset = src.d_buf + len - data->d_buf; ++ build_id_offset = (unsigned char *)src.d_buf + len - (unsigned char *)data->d_buf; + build_id_size = nh.n_descsz; + break; + } + + len += nh.n_descsz; + len = (len + 3) & ~3; -+ src.d_buf += len; ++ src.d_buf = (unsigned char *)src.d_buf + len; + } + + if (build_id != NULL) @@ -107,7 +106,7 @@ + + *id = malloc (build_id_size); + *id_size = build_id_size; -+ memcpy (*id, build_id->d_buf + build_id_offset, build_id_size); ++ memcpy (*id, (unsigned char *)build_id->d_buf + build_id_offset, build_id_size); + + elf_end (elf); + close (fd); @@ -139,7 +138,41 @@ + 0 +}; + -+static void addDebuginfoPackage(rpmSpec spec, Package pkg, char *buildroot) ++/* Add a new debuginfo package based on PKG with FILES. */ ++ ++static Package addDebuginfoPackage(rpmSpec spec, Package pkg, ARGV_t files) ++{ ++ const char *name; ++ char tmp[1024]; ++ Package dbg = newPackage(NULL, spec->pool, &spec->packages); ++ name = headerGetString(pkg->header, RPMTAG_NAME); ++ /* Set name, summary and group. */ ++ snprintf(tmp, 1024, "%s-debuginfo", name); ++ headerPutString(dbg->header, RPMTAG_NAME, tmp); ++ snprintf(tmp, 1024, "Debug information for package %s", name); ++ headerPutString(dbg->header, RPMTAG_SUMMARY, tmp); ++ snprintf(tmp, 1024, "This package provides debug information for package %s.\n" ++ "Debug information is useful when developing applications that use this\n" ++ "package or when debugging this package.", name); ++ headerPutString(dbg->header, RPMTAG_DESCRIPTION, tmp); ++ headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug"); ++ /* Inherit other tags from parent. */ ++ headerCopyTags(spec->packages->header, ++ dbg->header, copyTagsForDebug); ++ ++ /* Add self-provides */ ++ dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL); ++ addPackageProvides(dbg); ++ ++ /* Build up the files list. */ ++ dbg->fileList = files; ++ return dbg; ++} ++ ++/* Process the filelist of PKG and see to eventually create a debuginfo ++ packge for it. */ ++ ++static Package processDebuginfo(rpmSpec spec, Package pkg, char *buildroot) +{ + const char *a; + @@ -147,7 +180,6 @@ + a = headerGetString(pkg->header, RPMTAG_ARCH); + if (strcmp(a, "noarch") != 0) + { -+ Package dbg; + rpmfi fi = rpmfilesIter(pkg->cpioList, RPMFI_ITER_FWD); + char tmp[1024]; + const char *name; @@ -195,7 +227,10 @@ + /* If we see build-id links for the first time add the + directory. */ + if (!seen_build_id) -+ argvAdd(&files, "%dir /usr/lib/debug/.build-id"); ++ { ++ seen_build_id = 1; ++ argvAdd(&files, "%dir /usr/lib/debug/.build-id"); ++ } + + /* From the build-id construct the two links pointing back + to the debug information file and the binary. */ @@ -213,31 +248,54 @@ + /* If there are debuginfo files for this package add a + new debuginfo package. */ + if (files) -+ { -+ dbg = newPackage(NULL, spec->pool, &spec->packages); -+ headerNVR(pkg->header, &name, NULL, NULL); -+ /* Set name, summary and group. */ -+ snprintf(tmp, 1024, "%s-debuginfo", name); -+ headerPutString(dbg->header, RPMTAG_NAME, tmp); -+ snprintf(tmp, 1024, "Debug information for package %s", name); -+ headerPutString(dbg->header, RPMTAG_SUMMARY, tmp); -+ snprintf(tmp, 1024, "This package provides debug information for package %s.\n" -+ "Debug information is useful when developing applications that use this\n" -+ "package or when debugging this package.", name); -+ headerPutString(dbg->header, RPMTAG_DESCRIPTION, tmp); -+ headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug"); -+ /* Inherit other tags from parent. */ -+ headerCopyTags(pkg->header, dbg->header, copyTagsForDebug); -+ -+ /* Add self-provides */ -+ dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL); -+ addPackageProvides(dbg); -+ -+ /* Build up the files list. */ -+ dbg->fileList = files; -+ } ++ return addDebuginfoPackage (spec, pkg, files); + } ++ return NULL; ++} ++ ++ ++static char *addDebugDWZ(ARGV_t *filesp, char *buildroot) ++{ ++ char tmp[1024]; ++ struct stat sbuf; ++ char *dwz_dbg_buildid = NULL; ++ DIR *d; ++ struct dirent *de; ++ int i; ++ ++ snprintf(tmp, 1024, "%s%s", buildroot, "/usr/lib/debug/.dwz"); ++ if (lstat(tmp, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) ++ return NULL; ++ d = opendir(tmp); ++ if (!d) ++ return NULL; ++ ++ argvAdd(filesp, "/usr/lib/debug/.dwz"); ++ while ((de = readdir (d))) { ++ unsigned char *build_id = NULL; ++ size_t build_id_size = 0; ++ ++ snprintf(tmp, 1024, "%s/usr/lib/debug/.dwz/%s", buildroot, de->d_name); ++ if (lstat(tmp, &sbuf) == -1 || !S_ISREG(sbuf.st_mode)) ++ continue; ++ if (getELFBuildId(tmp, &build_id, &build_id_size) == -1) ++ continue; ++ snprintf(tmp, 1024, "/usr/lib/debug/.build-id/%02x/", build_id[0]); ++ for (i = 1; i < build_id_size; ++i) ++ sprintf(tmp + strlen(tmp), "%02x", build_id[i]); ++ sprintf(tmp + strlen(tmp), ".debug"); ++ argvAdd(filesp, tmp); ++ if (!dwz_dbg_buildid) { ++ for (i = 0; i < build_id_size; ++i) ++ sprintf(tmp + 2 * i, "%02x", build_id[i]); ++ dwz_dbg_buildid = xstrdup(tmp); ++ } ++ free(build_id); ++ } ++ closedir(d); ++ return dwz_dbg_buildid; +} ++ +#endif + rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, @@ -246,29 +304,69 @@ Package pkg; rpmRC rc = RPMRC_OK; + char *buildroot; ++ Package first_dbg = NULL, dwz_dbg = NULL; ++ int processing_dbg = 0; ++ int main_pkg_got_dbg = 0; ++ char *dwz_dbg_buildid = NULL; check_fileList = newStringBuf(); + buildroot = rpmGenPath(spec->rootDir, spec->buildRoot, NULL); genSourceRpmName(spec); for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { -@@ -2180,8 +2409,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r +@@ -2179,8 +2472,40 @@ rpmRC processBinaryFiles(rpmSpec spec, r rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr); free(nvr); - if ((rc = processPackageFiles(spec, pkgFlags, pkg, installSpecialDoc, test)) != RPMRC_OK || - (rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) ++#if HAVE_GELF_H && HAVE_LIBELF ++ if (pkg == first_dbg) { ++ /* If we have multiple debug packages then we put ++ DWZ generated files into %name-debuginfo which ++ may already exist. Otherwise put the DWZ data ++ into the only debug package. */ ++ processing_dbg = 1; ++ if (!first_dbg->next || main_pkg_got_dbg) { ++ dwz_dbg_buildid = addDebugDWZ(&first_dbg->fileList, buildroot); ++ dwz_dbg = pkg; ++ } else { ++ ARGV_t files = NULL; ++ dwz_dbg_buildid = addDebugDWZ(&files, buildroot); ++ dwz_dbg = addDebuginfoPackage(spec, spec->packages, files); ++ } ++ } ++#endif + if ((rc = processPackageFiles(spec, pkgFlags, pkg, installSpecialDoc, test)) != RPMRC_OK) + goto exit; +#if HAVE_GELF_H && HAVE_LIBELF -+ addDebuginfoPackage(spec, pkg, buildroot); ++ if (!processing_dbg) { ++ Package dbg = processDebuginfo(spec, pkg, buildroot); ++ if (dbg && !first_dbg) { ++ first_dbg = dbg; ++ if (pkg == spec->packages) ++ main_pkg_got_dbg = 1; ++ } ++ } ++ /* If we have DWZ info and it is not in PKG then add a requires. */ ++ if (dwz_dbg_buildid && pkg != dwz_dbg) ++ addReqProv(pkg, RPMTAG_REQUIRENAME, ++ "debuginfo(build-id)", dwz_dbg_buildid, RPMSENSE_EQUAL, 0); +#endif + if ((rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) goto exit; a = headerGetString(pkg->header, RPMTAG_ARCH); ---- ./build/parseSpec.c.orig 2017-01-19 13:01:28.985876261 +0000 -+++ ./build/parseSpec.c 2017-01-19 13:01:34.732859802 +0000 +@@ -2215,6 +2540,7 @@ rpmRC processBinaryFiles(rpmSpec spec, r + } + exit: + check_fileList = freeStringBuf(check_fileList); ++ _free(dwz_dbg_buildid); + + return rc; + } +--- ./build/parseSpec.c.orig 2017-03-22 12:10:11.304029953 +0000 ++++ ./build/parseSpec.c 2017-03-22 12:10:20.142010341 +0000 @@ -564,7 +564,7 @@ static void initSourceHeader(rpmSpec spe } @@ -278,8 +376,8 @@ { const char *arch, *name; char *evr, *isaprov; ---- ./build/rpmbuild_internal.h.orig 2016-10-13 07:12:21.364778540 +0000 -+++ ./build/rpmbuild_internal.h 2017-01-19 13:01:34.732859802 +0000 +--- ./build/rpmbuild_internal.h.orig 2017-02-16 09:40:09.788649545 +0000 ++++ ./build/rpmbuild_internal.h 2017-03-22 12:10:20.143010339 +0000 @@ -442,6 +442,13 @@ int addReqProv(Package pkg, rpmTagVal ta @@ -294,8 +392,8 @@ * Add rpmlib feature dependency. * @param pkg package * @param feature rpm feature name (i.e. "rpmlib(Foo)" for feature Foo) ---- ./macros.in.orig 2017-01-19 13:01:28.988876252 +0000 -+++ ./macros.in 2017-01-19 13:01:34.733859800 +0000 +--- ./macros.in.orig 2017-03-22 12:10:11.307029946 +0000 ++++ ./macros.in 2017-03-22 12:10:20.143010339 +0000 @@ -186,24 +186,10 @@ # Template for debug information sub-package. %debug_package \ @@ -321,8 +419,8 @@ %description debugsource\ This package provides debug sources for package %{name}.\ Debug sources are useful when developing applications that use this\ ---- ./scripts/find-debuginfo.sh.orig 2017-01-19 13:01:28.983876267 +0000 -+++ ./scripts/find-debuginfo.sh 2017-01-19 13:01:34.733859800 +0000 +--- ./scripts/find-debuginfo.sh.orig 2017-03-22 12:10:11.303029955 +0000 ++++ ./scripts/find-debuginfo.sh 2017-03-22 12:10:20.144010337 +0000 @@ -220,6 +220,11 @@ debug_link() # Provide .2, .3, ... symlinks to all filename instances of this build-id. make_id_dup_link() ++++++ macrosin.diff ++++++ --- /var/tmp/diff_new_pack.2v5qrN/_old 2017-04-03 11:04:01.012931606 +0200 +++ /var/tmp/diff_new_pack.2v5qrN/_new 2017-04-03 11:04:01.016931041 +0200 @@ -1,5 +1,7 @@ ---- ./macros.in.orig 2016-10-21 09:47:06.238886221 +0000 -+++ ./macros.in 2017-01-19 12:48:15.414136831 +0000 +Index: macros.in +=================================================================== +--- macros.in.orig 2017-02-16 10:40:09.908649457 +0100 ++++ macros.in 2017-03-06 13:35:44.504200409 +0100 @@ -185,22 +185,22 @@ # Template for debug information sub-package. @@ -45,7 +47,27 @@ # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -459,16 +460,22 @@ package or when debugging this package.\ +@@ -448,6 +449,19 @@ package or when debugging this package.\ + # + #%_include_minidebuginfo 1 + ++# Number of debugging information entries (DIEs) above which ++# dwz will stop considering file for multifile optimizations ++# and enter a low memory mode, in which it will optimize ++# in about half the memory needed otherwise. ++%_dwz_low_mem_die_limit 10000000 ++# Number of DIEs above which dwz will stop processing ++# a file altogether. ++%_dwz_max_die_limit 50000000 ++ ++%_find_debuginfo_dwz_opts --run-dwz\\\ ++ --dwz-low-mem-die-limit %{_dwz_low_mem_die_limit}\\\ ++ --dwz-max-die-limit %{_dwz_max_die_limit} ++ + # + # Use internal dependency generator rather than external helpers? + %_use_internal_dependency_generator 1 +@@ -459,16 +473,22 @@ package or when debugging this package.\ # Directories whose contents should be considered as documentation. %__docdir_path %{_datadir}/doc:%{_datadir}/man:%{_datadir}/info:%{_datadir}/gtk-doc/html:%{?_docdir}:%{?_mandir}:%{?_infodir}:%{?_javadocdir}:/usr/doc:/usr/man:/usr/info:/usr/X11R6/man @@ -70,7 +92,7 @@ # # Path to file attribute classifications for automatic dependency -@@ -538,10 +545,10 @@ package or when debugging this package.\ +@@ -538,10 +558,10 @@ package or when debugging this package.\ # Misc BDB tuning options %__dbi_other mp_mmapsize=128Mb mp_size=1Mb @@ -83,7 +105,7 @@ #============================================================================== # ---- GPG/PGP/PGP5 signature macros. -@@ -840,7 +847,7 @@ package or when debugging this package.\ +@@ -840,7 +860,7 @@ package or when debugging this package.\ %_build_vendor %{_host_vendor} %_build_os %{_host_os} %_host @host@ @@ -92,7 +114,7 @@ %_host_cpu @host_cpu@ %_host_vendor @host_vendor@ %_host_os @host_os@ -@@ -1009,6 +1016,183 @@ done \ +@@ -1009,6 +1029,183 @@ done \ %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])") @@ -276,7 +298,7 @@ #------------------------------------------------------------------------------ # arch macro for all Intel i?86 compatibile processors # (Note: This macro (and it's analogues) will probably be obsoleted when -@@ -1019,7 +1203,9 @@ done \ +@@ -1019,7 +1216,9 @@ done \ #------------------------------------------------------------------------------ # arch macro for all supported ARM processors @@ -287,7 +309,7 @@ #------------------------------------------------------------------------------ # arch macro for 32-bit MIPS processors -@@ -1174,3 +1360,24 @@ end} +@@ -1174,3 +1373,24 @@ end} # \endverbatim #*/ ++++++ rpmconfigcheck ++++++ --- /var/tmp/diff_new_pack.2v5qrN/_old 2017-04-03 11:04:01.124915784 +0200 +++ /var/tmp/diff_new_pack.2v5qrN/_new 2017-04-03 11:04:01.128915219 +0200 @@ -3,78 +3,43 @@ # # Author: Michael Schroeder <feedback(a)suse.de> # -# /etc/init.d/rpmconfigcheck -# /usr/sbin/rcrpmconfigcheck -# # Script to scan for unresolved .rpmnew, .rpmorig, and .rpmsave files # -### BEGIN INIT INFO -# Provides: rpmconfigcheck -# Required-Start: $remote_fs -# Required-Stop: $null -# Default-Start: 2 3 5 -# Default-Stop: -# Description: rpm config file scan -### END INIT INFO - -. /etc/rc.status - -# First reset status of this service -rc_reset configcheckfile=/var/adm/rpmconfigcheck packages=/var/lib/rpm/Packages -test -z "$1" && set start - -case "$1" in - start|restart|try-restart|reload|force-reload) - if test -s $packages -a $ ! -e $configcheckfile -o -s $configcheckfile -o ! $packages -ot $configcheckfile $ ; then - echo -n "Searching for unresolved configuration files" - if test ! -e $configcheckfile -o ! $packages -ot $configcheckfile ; then - test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old - rpm -qalc | sort | perl -lne '-e "$_.rpmnew" and print "$_.rpmnew"; -e "$_.rpmorig" and print "$_.rpmorig"; -e "$_.rpmsave" and print "$_.rpmsave"' > $configcheckfile - else - mv -f $configcheckfile $configcheckfile.old - while read l; do - test -e $l && echo $l - done < $configcheckfile.old > $configcheckfile - true - fi - rc_status -v - if test -s $configcheckfile; then - echo "Please check the following files (see /var/adm/rpmconfigcheck):" - sed -e 's/^/ /' < $configcheckfile - touch $configcheckfile.old - cat $configcheckfile $configcheckfile.old | sort | uniq -d > $configcheckfile.dup - cat $configcheckfile $configcheckfile.dup | sort | uniq -u > $configcheckfile.new - if test -s $configcheckfile.new ; then - ( - echo "----------------------------------------------------------------------" - echo "----------------------------------------------------------------------" - echo "rpmconfigcheck" - date - echo "----------------------------------------" - echo "This is a warning message." - echo "rpmconfigcheck has found the following new unresolved config files" - echo "(all files are listed in /var/adm/rpmconfigcheck):" - cat $configcheckfile.new - echo "----------------------------------------" - ) >> /var/log/update-messages - fi - fi - rm -f $configcheckfile.old $configcheckfile.dup $configcheckfile.new +if test -s $packages -a $ ! -e $configcheckfile -o -s $configcheckfile -o ! $packages -ot $configcheckfile $ ; then + echo "Searching for unresolved configuration files" + if test ! -e $configcheckfile -o ! $packages -ot $configcheckfile ; then + test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old + rpm -qalc | sort | perl -lne '-e "$_.rpmnew" and print "$_.rpmnew"; -e "$_.rpmorig" and print "$_.rpmorig"; -e "$_.rpmsave" and print "$_.rpmsave"' > $configcheckfile + else + mv -f $configcheckfile $configcheckfile.old + while read l; do + test -e $l && echo $l + done < $configcheckfile.old > $configcheckfile + fi + if test -s $configcheckfile; then + echo "Please check the following files (see /var/adm/rpmconfigcheck):" + sed -e 's/^/ /' < $configcheckfile + touch $configcheckfile.old + cat $configcheckfile $configcheckfile.old | sort | uniq -d > $configcheckfile.dup + cat $configcheckfile $configcheckfile.dup | sort | uniq -u > $configcheckfile.new + if test -s $configcheckfile.new ; then + ( + echo "----------------------------------------------------------------------" + echo "----------------------------------------------------------------------" + echo "rpmconfigcheck" + date + echo "----------------------------------------" + echo "This is a warning message." + echo "rpmconfigcheck has found the following new unresolved config files" + echo "(all files are listed in /var/adm/rpmconfigcheck):" + cat $configcheckfile.new + echo "----------------------------------------" + ) >> /var/log/update-messages fi - ;; - stop) - ;; - status) - rc_failed 4 - rc_status -v - ;; - *) - echo "Usage: $0 {start}" - exit 1 - ;; -esac -rc_exit + fi + rm -f $configcheckfile.old $configcheckfile.dup $configcheckfile.new +fi ++++++ rpmconfigcheck.service ++++++ [Unit] Description=Scan for unresolved .rpmnew, .rpmorig, and .rpmsave files After=local-fs.target [Service] Type=oneshot ExecStart=/usr/sbin/rpmconfigcheck [Install] WantedBy=default.target

1 0

commit timezone for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2017-04-03 11:03:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "timezone" Mon Apr 3 11:03:49 2017 rev:114 rq:481944 version:2017b Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2017-03-21 22:41:42.161327152 +0100 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2017-04-03 11:03:50.522413717 +0200 @@ -1,0 +2,9 @@ +Wed Mar 22 08:17:32 UTC 2017 - astieger(a)suse.com + +- timezone update 2017b: + * Haiti resumed observance of DST in 2017 (bsc#1030417) + * Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + * Use "MMT" to abbreviate Liberia's time zone before 1972, as + "-004430" is one byte over the POSIX limit + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2017a.tar.gz tzcode2017a.tar.gz.asc tzdata2017a.tar.gz tzdata2017a.tar.gz.asc New: ---- tzcode2017b.tar.gz tzcode2017b.tar.gz.asc tzdata2017b.tar.gz tzdata2017b.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.7dXl0W/_old 2017-04-03 11:03:52.070195044 +0200 +++ /var/tmp/diff_new_pack.7dXl0W/_new 2017-04-03 11:03:52.074194479 +0200 @@ -25,7 +25,7 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2017a +Version: 2017b Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.7dXl0W/_old 2017-04-03 11:03:52.102190524 +0200 +++ /var/tmp/diff_new_pack.7dXl0W/_new 2017-04-03 11:03:52.102190524 +0200 @@ -23,7 +23,7 @@ Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2017a +Version: 2017b Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz ++++++ tzcode2017a.tar.gz -> tzcode2017b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NEWS new/NEWS --- old/NEWS 2017-02-28 09:07:13.000000000 +0100 +++ new/NEWS 2017-03-17 15:31:51.000000000 +0100 @@ -1,5 +1,21 @@ News for the tz database +Release 2017b - 2017-03-17 07:30:38 -0700 + + Briefly: Haiti has resumed DST. + + Changes to past and future time stamps + + Haiti resumed observance of DST in 2017. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + + Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" + is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-link.htm new/tz-link.htm --- old/tz-link.htm 2017-02-23 10:03:30.000000000 +0100 +++ new/tz-link.htm 2017-02-28 17:08:12.000000000 +0100 @@ -10,7 +10,7 @@ content="Sources for time zone and daylight saving time data"> <meta name="DC.Creator" content="Eggert, Paul"> <meta name="DC.Contributor" content="Olson, Arthur David"> -<meta name="DC.Date" content="2017-02-23"> +<meta name="DC.Date" content="2017-02-28"> <meta name="DC.Description" content="Sources of information about time zones and daylight saving time"> <meta name="DC.Identifier" @@ -846,7 +846,7 @@ the international standard date and time notation</a> is a good summary of <a -href="http://www.iso.org/iso/catalogue_detail?csnumber=40874"><abbr +href="https://www.iso.org/standard/40874.html"><abbr title="International Organization for Standardization">ISO</abbr> 8601:2004 – Data elements and interchange formats – Information interchange – Representation of dates and times</a>.</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/version new/version --- old/version 2017-02-28 09:07:13.000000000 +0100 +++ new/version 2017-03-17 15:31:51.000000000 +0100 @@ -1 +1 @@ -2017a +2017b ++++++ tzdata2017a.tar.gz -> tzdata2017b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NEWS new/NEWS --- old/NEWS 2017-02-28 09:07:13.000000000 +0100 +++ new/NEWS 2017-03-17 15:31:51.000000000 +0100 @@ -1,5 +1,21 @@ News for the tz database +Release 2017b - 2017-03-17 07:30:38 -0700 + + Briefly: Haiti has resumed DST. + + Changes to past and future time stamps + + Haiti resumed observance of DST in 2017. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + + Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + + Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" + is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/africa new/africa --- old/africa 2017-02-23 08:37:19.000000000 +0100 +++ new/africa 2017-03-02 10:30:19.000000000 +0100 @@ -420,18 +420,25 @@ # See Africa/Johannesburg. # Liberia -# From Paul Eggert (2006-03-22): -# In 1972 Liberia was the last country to switch -# from a UTC offset that was not a multiple of 15 or 20 minutes. -# Howse reports that it was in honor of their president's birthday. -# Shank & Pottenger report the date as May 1, whereas Howse reports Jan; -# go with Shanks & Pottenger. -# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and -# Whitman each report -0:44:30; go with the more precise figure. +# +# From Paul Eggert (2017-03-02): +# +# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30. +# +# In 1972 Liberia was the last country to switch from a UTC offset +# that was not a multiple of 15 or 20 minutes. The 1972 change was on +# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of: +# Presidential Papers: First year of the administration of +# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. +# Monrovia: Executive Mansion. +# +# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# abbreviation "-004430" would be one byte over the POSIX limit. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Monrovia -0:43:08 - LMT 1882 -0:43:08 - MMT 1919 Mar # Monrovia Mean Time - -0:44:30 - -004430 1972 May + -0:44:30 - MMT 1972 Jan 7 # approximately MMT 0:00 - GMT ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iso3166.tab new/iso3166.tab --- old/iso3166.tab 2016-11-16 21:25:57.000000000 +0100 +++ new/iso3166.tab 2017-02-28 17:08:12.000000000 +0100 @@ -9,8 +9,8 @@ # All text uses UTF-8 encoding. The columns of the table are as follows: # # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166 -# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm +# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1 +# http://isotc.iso.org/livelink/livelink/Open/16944257 # 2. The usual English name for the coded region, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/northamerica new/northamerica --- old/northamerica 2017-02-23 08:37:20.000000000 +0100 +++ new/northamerica 2017-03-12 20:14:27.000000000 +0100 @@ -3139,6 +3139,12 @@ # http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/ # http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-… +# From Steffen Thorsen (2017-03-12): +# We have received 4 mails from different people telling that Haiti +# has started DST again today, and this source seems to confirm that, +# I have not been able to find a more authoritative source: +# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti… + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Haiti 1983 only - May 8 0:00 1:00 D Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D @@ -3151,6 +3157,8 @@ Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S +Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D +Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Port-au-Prince -4:49:20 - LMT 1890 -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/version new/version --- old/version 2017-02-28 09:07:13.000000000 +0100 +++ new/version 2017-03-17 15:31:51.000000000 +0100 @@ -1 +1 @@ -2017a +2017b

1 0

commit build for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2017-04-03 11:03:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "build" Mon Apr 3 11:03:41 2017 rev:104 rq:481818 version:20170320 Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2017-03-03 17:37:14.590955207 +0100 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2017-04-03 11:03:43.811361859 +0200 @@ -1,0 +2,11 @@ +Fri Mar 17 12:57:03 UTC 2017 - adrian(a)suse.de + +- fix usage of the right service generated files. +- debootstrap: Also mount sysfs +- Fileprovides should only match package names, not provides +- avoid export of build results of sym links pointing to external files +- support build of different flavors via multibuild +- experimental AppImage build support +- reworked openstack support (still experimental) + +------------------------------------------------------------------- Old: ---- obs-build-20170209.tar.gz New: ---- obs-build-20170320.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.G7vjGL/_old 2017-04-03 11:03:46.307009272 +0200 +++ /var/tmp/diff_new_pack.G7vjGL/_new 2017-04-03 11:03:46.311008707 +0200 @@ -18,13 +18,13 @@ # needsbinariesforbuild -%define version_unconverted 20170209 +%define version_unconverted 20170320 Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170209 +Version: 20170320 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.G7vjGL/_old 2017-04-03 11:03:46.347003622 +0200 +++ /var/tmp/diff_new_pack.G7vjGL/_new 2017-04-03 11:03:46.347003622 +0200 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170209 +pkgver=20170320 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.G7vjGL/_old 2017-04-03 11:03:46.386997971 +0200 +++ /var/tmp/diff_new_pack.G7vjGL/_new 2017-04-03 11:03:46.386997971 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170209 +Version: 20170320 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.G7vjGL/_old 2017-04-03 11:03:46.410994581 +0200 +++ /var/tmp/diff_new_pack.G7vjGL/_new 2017-04-03 11:03:46.410994581 +0200 @@ -1,4 +1,4 @@ -build (20170209) unstable; urgency=low +build (20170320) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20170209.tar.gz -> obs-build-20170320.tar.gz ++++++ ++++ 2224 lines of diff (skipped)

1 0