From 719a30a5371c02e233d9fe2118f253052ed6442cae9b28a168abe59e44cdad9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 1 Mar 2015 11:01:24 +0000 Subject: [PATCH] Accepting request 287774 from home:posophe:branches:system:packagemanager fixed. Stupid mistake :) OBS-URL: https://build.opensuse.org/request/show/287774 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=17 --- dpkg-archive_tar_format_gnu.patch | 24 -- dpkg-archtable-suse.patch | 21 -- dpkg-old-File-Path.patch | 22 -- dpkg-old-Test-More.patch | 238 ------------------ dpkg-pod2man-no-utf8.patch | 24 -- dpkg-ppc64le.diff | 12 - dpkg.changes | 27 ++ dpkg.spec | 40 +-- dpkg_1.16.10.tar.xz | 3 - dpkg_1.17.23.tar.xz | 3 + ...se.patch => update-alternatives-suse.patch | 20 +- update-alternatives.changes | 27 ++ update-alternatives.spec | 10 +- 13 files changed, 73 insertions(+), 398 deletions(-) delete mode 100644 dpkg-archive_tar_format_gnu.patch delete mode 100644 dpkg-archtable-suse.patch delete mode 100644 dpkg-old-File-Path.patch delete mode 100644 dpkg-old-Test-More.patch delete mode 100644 dpkg-pod2man-no-utf8.patch delete mode 100644 dpkg-ppc64le.diff delete mode 100644 dpkg_1.16.10.tar.xz create mode 100644 dpkg_1.17.23.tar.xz rename update-alternatives-1.16.8-suse.patch => update-alternatives-suse.patch (84%) diff --git a/dpkg-archive_tar_format_gnu.patch b/dpkg-archive_tar_format_gnu.patch deleted file mode 100644 index bb7c472..0000000 --- a/dpkg-archive_tar_format_gnu.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jan Blunck -Subject: Make Dpkg::Source::Archive use tar --format=gnu - -Some versions of tar (specifically on openSUSE 12.2) have different default -tar format. So lets explicitly instruct Dpkg::Source::Archive to create the -gnu tar format. - -http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;h=3f0c739bff65e6167cc91626fa77145247560fda - -Signed-off-by: Jan Blunck - -Index: dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm -=================================================================== ---- dpkg-1.16.10.orig/scripts/Dpkg/Source/Archive.pm -+++ dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm -@@ -48,7 +48,7 @@ sub create { - # Call tar creation process - $spawn_opts{"delete_env"} = [ "TAR_OPTIONS" ]; - $spawn_opts{'exec'} = [ 'tar', '--null', '-T', '-', '--numeric-owner', -- '--owner', '0', '--group', '0', -+ '--owner', '0', '--group', '0', '--format=gnu', - @{$opts{"options"}}, '-cf', '-' ]; - *$self->{"pid"} = spawn(%spawn_opts); - *$self->{"cwd"} = getcwd(); diff --git a/dpkg-archtable-suse.patch b/dpkg-archtable-suse.patch deleted file mode 100644 index 3d14440..0000000 --- a/dpkg-archtable-suse.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: dpkg-1.16.3/debian/archtable -=================================================================== ---- dpkg-1.16.3.orig/debian/archtable 2012-04-27 04:49:02.000000000 +0200 -+++ dpkg-1.16.3/debian/archtable 2012-06-06 10:22:46.728432824 +0200 -@@ -27,3 +27,15 @@ sparc-linux-gnu sparc - i486-gnu hurd-i386 - i486-kfreebsd-gnu kfreebsd-i386 - x86_64-kfreebsd-gnu kfreebsd-amd64 -++i486-suse-linux i386 -++ia64-suse-linux ia64 -++alpha-suse-linux alpha -++x86_64-suse-linux amd64 -++arm-suse-linux arm -++arm-suse-linuxeabi armel -++hppa-suse-linux hppa -++mips-suse-linux mips -++mipsel-suse-linux mipsel -++powerpc-suse-linux powerpc -++s390-suse-linux s390 -++sparc-suse-linux sparc -\ No newline at end of file diff --git a/dpkg-old-File-Path.patch b/dpkg-old-File-Path.patch deleted file mode 100644 index 2980d1f..0000000 --- a/dpkg-old-File-Path.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm -=================================================================== ---- dpkg-1.16.10.orig/scripts/Dpkg/Source/Quilt.pm -+++ dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm -@@ -29,7 +29,7 @@ use Dpkg::Vendor qw(get_current_vendor); - use File::Spec; - use File::Copy; - use File::Find; --use File::Path qw(make_path); -+use File::Path qw(mkpath); - use File::Basename; - - sub new { -@@ -289,7 +289,7 @@ sub restore_quilt_backup_files { - my $target = File::Spec->catfile($self->{'dir'}, $relpath_in_srcpkg); - if (-s $_) { - unlink($target); -- make_path(dirname($target)); -+ mkpath(dirname($target)); - unless (link($_, $target)) { - copy($_, $target) || - syserr(_g("failed to copy %s to %s"), $_, $target); diff --git a/dpkg-old-Test-More.patch b/dpkg-old-Test-More.patch deleted file mode 100644 index 38f7c52..0000000 --- a/dpkg-old-Test-More.patch +++ /dev/null @@ -1,238 +0,0 @@ -Index: dpkg-1.16.10/src/t/100_dpkg_divert.t -=================================================================== ---- dpkg-1.16.10.orig/src/t/100_dpkg_divert.t -+++ dpkg-1.16.10/src/t/100_dpkg_divert.t -@@ -148,7 +148,7 @@ sub diversions_eq { - - cleanup(); - --note("Command line parsing testing"); -+#note("Command line parsing testing"); - - my $usagere = qr/.*Usage.*dpkg-divert.*Commands.*Options.*/s; - -@@ -191,7 +191,7 @@ call([@dd, '--admindir'], [], - - cleanup(); - --note("Querying information from diverts db (empty one)"); -+#note("Querying information from diverts db (empty one)"); - - install_diversions(''); - -@@ -201,7 +201,7 @@ call_divert_sort(['--list', 'baz'], expe - - cleanup(); - --note("Querying information from diverts db (1)"); -+#note("Querying information from diverts db (1)"); - - install_diversions(< == 0); -@@ -569,7 +569,7 @@ cleanup(); - SKIP: { - skip "running as root or similar", 10, if (defined($ENV{FAKEROOTKEY}) or $> == 0); - -- note("R/O directory"); -+ #note("R/O directory"); - - install_diversions(''); - system("mkdir $testdir/rodir && touch $testdir/rodir/foo $testdir/bar && chmod 500 $testdir/rodir"); -@@ -582,7 +582,7 @@ SKIP: { - system("chmod 755 $testdir/rodir"); - cleanup(); - -- note("Unavailable file"); -+ #note("Unavailable file"); - - install_diversions(''); - system("mkdir $testdir/nadir && chmod 000 $testdir/nadir"); -@@ -596,7 +596,7 @@ SKIP: { - cleanup(); - } - --note("Errors during saving diversions db"); -+#note("Errors during saving diversions db"); - - install_diversions(''); - diff --git a/dpkg-pod2man-no-utf8.patch b/dpkg-pod2man-no-utf8.patch deleted file mode 100644 index 2a746a1..0000000 --- a/dpkg-pod2man-no-utf8.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur dpkg-1.16.7.orig/scripts/Makefile.am dpkg-1.16.7/scripts/Makefile.am ---- dpkg-1.16.7.orig/scripts/Makefile.am 2012-06-30 09:21:47.000000000 +0200 -+++ dpkg-1.16.7/scripts/Makefile.am 2012-07-07 01:02:35.077531983 +0200 -@@ -141,7 +141,7 @@ - $(MKDIR_P) $(DESTDIR)$(man3dir) - for module in $(nobase_dist_perllib_DATA); do \ - name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \ -- $(POD2MAN) --utf8 --center=libdpkg-perl --release=$(VERSION) \ -+ $(POD2MAN) --center=libdpkg-perl --release=$(VERSION) \ - --name="$$name" --section=3 $(srcdir)/$$module \ - >$(DESTDIR)$(man3dir)/$$name.3; \ - test -s $(DESTDIR)$(man3dir)/$$name.3 || \ -diff -ur dpkg-1.16.7.orig/scripts/Makefile.in dpkg-1.16.7/scripts/Makefile.in ---- dpkg-1.16.7.orig/scripts/Makefile.in 2012-07-02 21:24:30.000000000 +0200 -+++ dpkg-1.16.7/scripts/Makefile.in 2012-07-07 01:02:35.098534651 +0200 -@@ -1042,7 +1042,7 @@ - @BUILD_POD_DOC_TRUE@ $(MKDIR_P) $(DESTDIR)$(man3dir) - @BUILD_POD_DOC_TRUE@ for module in $(nobase_dist_perllib_DATA); do \ - @BUILD_POD_DOC_TRUE@ name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \ --@BUILD_POD_DOC_TRUE@ $(POD2MAN) --utf8 --center=libdpkg-perl --release=$(VERSION) \ -+@BUILD_POD_DOC_TRUE@ $(POD2MAN) --center=libdpkg-perl --release=$(VERSION) \ - @BUILD_POD_DOC_TRUE@ --name="$$name" --section=3 $(srcdir)/$$module \ - @BUILD_POD_DOC_TRUE@ >$(DESTDIR)$(man3dir)/$$name.3; \ - @BUILD_POD_DOC_TRUE@ test -s $(DESTDIR)$(man3dir)/$$name.3 || \ diff --git a/dpkg-ppc64le.diff b/dpkg-ppc64le.diff deleted file mode 100644 index ad56b1a..0000000 --- a/dpkg-ppc64le.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: dpkg-1.16.10/cputable -=================================================================== ---- dpkg-1.16.10.orig/cputable -+++ dpkg-1.16.10/cputable -@@ -31,6 +31,7 @@ mips mips mips(eb)? 32 big - mipsel mipsel mipsel 32 little - powerpc powerpc (powerpc|ppc) 32 big - ppc64 powerpc64 (powerpc|ppc)64 64 big -+ppc64el powerpc64le (powerpc|ppc)64le 64 little - s390 s390 s390 32 big - s390x s390x s390x 64 big - sh3 sh3 sh3 32 little diff --git a/dpkg.changes b/dpkg.changes index dea0f39..656c2f9 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Jan 5 15:30:22 UTC 2015 - p.drouand@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 + ------------------------------------------------------------------- Mon Aug 25 13:35:42 UTC 2014 - jblunck@infradead.org diff --git a/dpkg.spec b/dpkg.spec index c548c60..e8c39fd 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -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 @@ Url: http://www.debian.org 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: perl = %{perl_version} 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 @@ Provides: deb-lang = %{version} 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 @@ Provides translations to the package %{name} %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,8 +107,8 @@ export SELINUX_LIBS="-lselinux" %if 0%{?use_selinux} --with-selinux \ %endif - --localstatedir=%{_localstatedir}/lib\ - --with-admindir=%{_localstatedir}/lib/dpkg + --localstatedir=%{_localstatedir}/lib \ + --with-admindir=%{_localstatedir}/lib/dpkg # configure somehow does not detect architecture correctly in OBS (bnc#469337), so # let's do an awful hack and fix it in config.h @@ -200,13 +174,15 @@ exit 0 %{_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 diff --git a/dpkg_1.16.10.tar.xz b/dpkg_1.16.10.tar.xz deleted file mode 100644 index ebfea01..0000000 --- a/dpkg_1.16.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2 -size 3703340 diff --git a/dpkg_1.17.23.tar.xz b/dpkg_1.17.23.tar.xz new file mode 100644 index 0000000..7f9c2fa --- /dev/null +++ b/dpkg_1.17.23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90c4af92fc248a7542cf6db1141d69b042130abd82781943b3c2608e78f860b5 +size 4386124 diff --git a/update-alternatives-1.16.8-suse.patch b/update-alternatives-suse.patch similarity index 84% rename from update-alternatives-1.16.8-suse.patch rename to update-alternatives-suse.patch index ee4f1cd..75c60af 100644 --- a/update-alternatives-1.16.8-suse.patch +++ b/update-alternatives-suse.patch @@ -26,10 +26,9 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.8 dpkg-1.16.7/man/update-alter -.B postinst +.B post (configure) or --.B prerm --(install) scripts in Debian packages. -+.B preun -+(install) scripts in SUSE packages. + .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 @@ -42,15 +41,6 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.8 dpkg-1.16.7/man/update-alter containing .BR update\-alternatives ' state information. -@@ -501,7 +501,7 @@ - .RE - . - .SH BUGS --If you find a bug, please report it using the Debian bug-tracking system. -+If you find a bug, please report it using the SUSE bug-tracking system. - .PP - If you find any discrepancy between the operation of - .B update\-alternatives 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 @@ -58,8 +48,8 @@ diff -ur dpkg-1.16.7.orig/utils/update-alternatives.c dpkg-1.16.7/utils/update-a static char *pass_opts[MAX_OPTS]; static int nb_opts = 0; --#define DPKG_TMP_EXT ".dpkg-tmp" -+#define DPKG_TMP_EXT ".rpm-tmp" +-#define ALT_TMP_EXT ".dpkg-tmp" ++#define ALT_TMP_EXT ".rpm-tmp" /* * Functions. diff --git a/update-alternatives.changes b/update-alternatives.changes index 1854102..150375a 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Feb 17 13:38:47 UTC 2015 - p.drouand@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 + ------------------------------------------------------------------- Mon May 12 13:57:59 UTC 2014 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index 97ea523..7df4089 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -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 @@ Group: System/Management 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 @@ particular preference. %setup -q -n dpkg-%{version} %patch0 -p1 -%patch1 -p1 %patch6 -p1 -%patch7 -p1 %build %{configure} \