Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2015-03-03 11:12:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg" Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2014-08-28 21:05:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new/dpkg.changes 2015-03-03 11:12:49.000000000 +0100 @@ -1,0 +2,27 @@ +Mon Jan 5 15:30:22 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.17.23 + + Use a matching group instead of ${^MATCH} in s/// in dselect build script. + + Skip tar extractor tests if tar is not GNU tar >= 1.27. + + Reset the trigger cycle tracking on unsatisfied dependencies during + trigger processing. Closes: bdo#771730 + + Fix out-of-bounds buffer read accesses when parsing field and trigger + names or checking package ownership of conffiles and directories. + + Add versioned Breaks on packages creating trigger cycles. Namely auctex, + apt-cudf, ccache, cups, distcc, fusionforge-plugin-mediawiki, gap-core, + gxine, hoogle, icecc, libjs-protoaculous, mcollective, pypy, wordpress + and xfonts-traditional. + + Update translations +- Remove unapplied patches; SLE11 support is disabled in project home + + dpkg-pod2man-no-utf8.patch + + dpkg-old-File-Path.patch + + dpkg-old-Test-More.patch +- Remove obsolete patches + * dpkg-ppc64le.diff + * dpkg-archive_tar_format_gnu.patch + * dpkg-archtable-suse.patch +- Rename updated patch + update-alternatives-1.16.8-suse.patch > update-alternatives-suse.patch +- Clean up a bit specfile + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2014-05-13 20:46:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new/update-alternatives.changes 2015-03-03 11:12:49.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Feb 17 13:38:47 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.17.23 + + Use a matching group instead of ${^MATCH} in s/// in dselect build script. + + Skip tar extractor tests if tar is not GNU tar >= 1.27. + + Reset the trigger cycle tracking on unsatisfied dependencies during + trigger processing. Closes: bdo#771730 + + Fix out-of-bounds buffer read accesses when parsing field and trigger + names or checking package ownership of conffiles and directories. + + Add versioned Breaks on packages creating trigger cycles. Namely auctex, + apt-cudf, ccache, cups, distcc, fusionforge-plugin-mediawiki, gap-core, + gxine, hoogle, icecc, libjs-protoaculous, mcollective, pypy, wordpress + and xfonts-traditional. + + Update translations +- Remove unapplied patches; SLE11 support is disabled in project home + + dpkg-pod2man-no-utf8.patch + + dpkg-old-File-Path.patch + + dpkg-old-Test-More.patch +- Remove obsolete patches + * dpkg-ppc64le.diff + * dpkg-archive_tar_format_gnu.patch + * dpkg-archtable-suse.patch +- Rename updated patch + pdate-alternatives-1.16.8-suse.patch > pdate-alternatives-suse.patch +- Clean up a bit specfile + +------------------------------------------------------------------- Old: ---- dpkg-archive_tar_format_gnu.patch dpkg-archtable-suse.patch dpkg-old-File-Path.patch dpkg-old-Test-More.patch dpkg-pod2man-no-utf8.patch dpkg-ppc64le.diff dpkg_1.16.10.tar.xz update-alternatives-1.16.8-suse.patch New: ---- dpkg_1.17.23.tar.xz update-alternatives-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.udwb97/_old 2015-03-03 11:12:50.000000000 +0100 +++ /var/tmp/diff_new_pack.udwb97/_new 2015-03-03 11:12:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.16.10 +Version: 1.17.23 Release: 0 Summary: Debian package management system License: GPL-2.0+ @@ -28,18 +28,9 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor # PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. -Patch1: update-alternatives-1.16.8-suse.patch -# PATCH-FIX-OPENSUSE add openSUSE supported architectures -Patch2: dpkg-archtable-suse.patch +Patch1: update-alternatives-suse.patch # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. -Patch3: dpkg-pod2man-no-utf8.patch -# PATCH-FIX-SUSE support for old File::Path (SLES11) -Patch4: dpkg-old-File-Path.patch -# PATCH-FIX-SUSE support for old Test::More (SLES11) -Patch5: dpkg-old-Test-More.patch Patch6: dpkg-sparc.diff -Patch7: dpkg-ppc64le.diff -Patch8: dpkg-archive_tar_format_gnu.patch BuildRequires: gcc-c++ BuildRequires: libselinux-devel %define use_selinux 1 @@ -66,9 +57,6 @@ Requires: update-alternatives Requires: perl(Date::Parse) Recommends: perl(File::FcntlLock) -%if 0%{?suse_version} < 1120 -%define _libexecdir /usr/lib -%endif %endif %description @@ -98,12 +86,8 @@ Obsoletes: deb-lang < %{version} %if %{defined suse_version} Supplements: packageand(bundle-lang-other:%{name}) -%if 0%{?suse_version} < 1120 -# BuildArch: noarch not supported on SLE 11 -%else BuildArch: noarch %endif -%endif %description lang Provides translations to the package %{name} @@ -112,17 +96,7 @@ %setup -q %patch1 -p1 -%patch2 -p1 -%if 0%{?suse_version} && 0%{?suse_version} < 1130 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%endif %patch6 -p1 -%patch7 -p1 -%if 0%{?suse_version} >= 1220 -%patch8 -p1 -%endif %build export CFLAGS="%{optflags}" @@ -133,7 +107,7 @@ %if 0%{?use_selinux} --with-selinux \ %endif - --localstatedir=%{_localstatedir}/lib\ + --localstatedir=%{_localstatedir}/lib \ --with-admindir=%{_localstatedir}/lib/dpkg # configure somehow does not detect architecture correctly in OBS (bnc#469337), so @@ -200,13 +174,15 @@ %{_libdir}/dpkg %{_datadir}/dpkg %{_localstatedir}/lib/dpkg -%{perl_vendorlib}/Debian %{perl_vendorlib}/Dpkg %{perl_vendorlib}/Dpkg.pm +%{perl_vendorlib}/Dselect +%{perl_vendorlib}/Dselect/Ftp.pm %files devel %defattr(-,root,root) %{_libdir}/libdpkg.a +%{_libdir}/libdpkg.la %{_libdir}/pkgconfig/libdpkg.pc %{_includedir}/dpkg ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.udwb97/_old 2015-03-03 11:12:51.000000000 +0100 +++ /var/tmp/diff_new_pack.udwb97/_new 2015-03-03 11:12:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.16.10 +Version: 1.17.23 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -27,10 +27,8 @@ Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor -Patch0: update-alternatives-1.16.8-suse.patch -Patch1: dpkg-archtable-suse.patch +Patch0: update-alternatives-suse.patch Patch6: dpkg-sparc.diff -Patch7: dpkg-ppc64le.diff BuildRequires: ncurses-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,9 +48,7 @@ %setup -q -n dpkg-%{version} %patch0 -p1 -%patch1 -p1 %patch6 -p1 -%patch7 -p1 %build %{configure} \ ++++++ dpkg_1.16.10.tar.xz -> dpkg_1.17.23.tar.xz ++++++ ++++ 821057 lines of diff (skipped) ++++++ update-alternatives-suse.patch ++++++ diff -ur dpkg-1.16.7.orig/man/update-alternatives.8 dpkg-1.16.7/man/update-alternatives.8 --- dpkg-1.16.7.orig/man/update-alternatives.8 2012-06-30 09:21:47.000000000 +0200 +++ dpkg-1.16.7/man/update-alternatives.8 2012-07-07 00:38:09.628280915 +0200 @@ -33,7 +33,7 @@ .SH DESCRIPTION .B update\-alternatives creates, removes, maintains and displays information about the symbolic -links comprising the Debian alternatives system. +links comprising the SUSE alternatives system. .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 @@ to make a good choice for an editor to invoke if the user has not specified a particular preference. .PP -Debian's alternatives system aims to solve this problem. +SUSE's alternatives system aims to solve this problem. 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 @@ is called to update information about that file in the alternatives system. .B update\-alternatives is usually called from the -.B postinst +.B post (configure) or .B prerm -(remove and deconfigure) scripts in Debian packages. +(remove and deconfigure) scripts in SUSE packages. .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 @@ -189,7 +189,7 @@ .TP administrative directory A directory, by default -.IR /var/lib/dpkg/alternatives , +.IR /var/lib/rpm/alternatives , containing .BR update\-alternatives ' state information. diff -ur dpkg-1.16.7.orig/utils/update-alternatives.c dpkg-1.16.7/utils/update-alternatives.c --- dpkg-1.16.7.orig/utils/update-alternatives.c 2012-06-30 09:21:47.000000000 +0200 +++ dpkg-1.16.7/utils/update-alternatives.c 2012-07-07 00:38:09.631281296 +0200 @@ -68,7 +68,7 @@ static char *pass_opts[MAX_OPTS]; static int nb_opts = 0; -#define ALT_TMP_EXT ".dpkg-tmp" +#define ALT_TMP_EXT ".rpm-tmp" /* * Functions. @@ -77,7 +77,7 @@ static void version(void) { - printf(_("Debian %s version %s.\n"), PROGNAME, VERSION); + printf(_("SUSE %s version %s.\n"), PROGNAME, VERSION); printf("\n"); printf(_( @@ -359,7 +359,7 @@ const char *basedir, *dpkg_basedir; char *admindir; - dpkg_basedir = getenv("DPKG_ADMINDIR"); + dpkg_basedir = getenv("RPM_ADMINDIR"); if (dpkg_basedir) basedir = dpkg_basedir; else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org