From cb3311ced9f737555e3f9c78869a4629ace5a62d56582e751bde0ce84588b158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 4 Jun 2015 11:16:27 +0000 Subject: [PATCH 1/4] - Verion bump to 1.18.1: * Bump to latest upstream release * Plenty of fixes with too long changelog, see changelog file in documentation * Also fixes bnc#926749 CVE-2015-0840 - Verion bump to 1.18.1: * Bump to latest upstream release * Plenty of fixes with too long changelog, see changelog file in documentation * Also fixes bnc#926749 CVE-2015-0840 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=23 --- dpkg.changes | 9 +++++++++ dpkg.spec | 2 +- dpkg_1.17.24.tar.xz | 3 --- dpkg_1.18.1.tar.xz | 3 +++ update-alternatives-suse.patch | 6 +++--- update-alternatives.changes | 9 +++++++++ update-alternatives.spec | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) delete mode 100644 dpkg_1.17.24.tar.xz create mode 100644 dpkg_1.18.1.tar.xz diff --git a/dpkg.changes b/dpkg.changes index 414c0dd..d9c3da3 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 4 11:14:05 UTC 2015 - tchvatal@suse.com + +- Verion bump to 1.18.1: + * Bump to latest upstream release + * Plenty of fixes with too long changelog, see changelog file in + documentation + * Also fixes bnc#926749 CVE-2015-0840 + ------------------------------------------------------------------- Wed Apr 1 12:59:58 UTC 2015 - tchvatal@suse.com diff --git a/dpkg.spec b/dpkg.spec index e331c9c..799a217 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.17.24 +Version: 1.18.1 Release: 0 Summary: Debian package management system License: GPL-2.0+ diff --git a/dpkg_1.17.24.tar.xz b/dpkg_1.17.24.tar.xz deleted file mode 100644 index b1bf0ac..0000000 --- a/dpkg_1.17.24.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afd60233ef090aa5a4d9e181b8986d1f5deb23a3428a2309b6b4ec448d539eac -size 4388276 diff --git a/dpkg_1.18.1.tar.xz b/dpkg_1.18.1.tar.xz new file mode 100644 index 0000000..9d6fe8f --- /dev/null +++ b/dpkg_1.18.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb26a97ca21c970cbe63a762125fe21f7437663badf6ce686589fe62650399da +size 4340240 diff --git a/update-alternatives-suse.patch b/update-alternatives-suse.patch index 75c60af..d40a8e4 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -1,6 +1,6 @@ -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 +diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alternatives.1 +--- dpkg-1.16.7.orig/man/update-alternatives.1 2012-06-30 09:21:47.000000000 +0200 ++++ dpkg-1.16.7/man/update-alternatives.1 2012-07-07 00:38:09.628280915 +0200 @@ -33,7 +33,7 @@ .SH DESCRIPTION .B update\-alternatives diff --git a/update-alternatives.changes b/update-alternatives.changes index ce287dd..3e55bf7 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 4 11:15:32 UTC 2015 - tchvatal@suse.com + +- Verion bump to 1.18.1: + * Bump to latest upstream release + * Plenty of fixes with too long changelog, see changelog file in + documentation + * Also fixes bnc#926749 CVE-2015-0840 + ------------------------------------------------------------------- Wed Apr 1 12:57:51 UTC 2015 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index 7ed7f3c..bb008c0 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.17.24 +Version: 1.18.1 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ From 82111c0d762593789fbeddd75792152999d67b0175991812ceb1a6977b6673cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 4 Jun 2015 11:17:05 +0000 Subject: [PATCH 2/4] * Refresh patch: + update-alternatives-suse.patch * Refresh patch: + update-alternatives-suse.patch OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=24 --- dpkg.changes | 2 ++ update-alternatives.changes | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dpkg.changes b/dpkg.changes index d9c3da3..0aaf452 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -6,6 +6,8 @@ Thu Jun 4 11:14:05 UTC 2015 - tchvatal@suse.com * Plenty of fixes with too long changelog, see changelog file in documentation * Also fixes bnc#926749 CVE-2015-0840 + * Refresh patch: + + update-alternatives-suse.patch ------------------------------------------------------------------- Wed Apr 1 12:59:58 UTC 2015 - tchvatal@suse.com diff --git a/update-alternatives.changes b/update-alternatives.changes index 3e55bf7..d0afad0 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -6,6 +6,8 @@ Thu Jun 4 11:15:32 UTC 2015 - tchvatal@suse.com * Plenty of fixes with too long changelog, see changelog file in documentation * Also fixes bnc#926749 CVE-2015-0840 + * Refresh patch: + + update-alternatives-suse.patch ------------------------------------------------------------------- Wed Apr 1 12:57:51 UTC 2015 - tchvatal@suse.com From 03ead472117e2e5957b3ec0636b08e8a6cf975c27ce45a2a33b529375497aed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 5 Jun 2015 07:44:43 +0000 Subject: [PATCH 3/4] - Adjust to the new manpage location OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=25 --- update-alternatives.changes | 5 +++++ update-alternatives.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/update-alternatives.changes b/update-alternatives.changes index d0afad0..027d89e 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 07:44:29 UTC 2015 - tchvatal@suse.com + +- Adjust to the new manpage location + ------------------------------------------------------------------- Thu Jun 4 11:15:32 UTC 2015 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index bb008c0..c394924 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -58,13 +58,13 @@ make -C utils/ %{?_smp_mflags} %install install -d -m 0755 %{buildroot}/%{_sbindir}/ -install -d -m 0755 %{buildroot}/%{_mandir}/man8/ +install -d -m 0755 %{buildroot}/%{_mandir}/man1/ install -d -m 0755 %{buildroot}/%{_sysconfdir}/alternatives install -d -m 0755 %{buildroot}/%{admindir}/alternatives install -d -m 0755 %{buildroot}/%{_localstatedir}/log install -m 0755 utils/%{name} %{buildroot}/%{_sbindir} -install -m 0644 man/%{name}.8 %{buildroot}/%{_mandir}/man8/ +install -m 0644 man/%{name}.1 %{buildroot}/%{_mandir}/man1/ touch %{buildroot}/%{_localstatedir}/log/%{name}.log @@ -74,7 +74,7 @@ touch %{buildroot}/%{_localstatedir}/log/%{name}.log %dir %{_sysconfdir}/alternatives %dir %{_localstatedir}/lib/rpm/alternatives %{_sbindir}/update-alternatives -%{_mandir}/man8/update-alternatives.8* +%{_mandir}/man1/update-alternatives.1* %ghost %{_localstatedir}/log/update-alternatives.log %changelog From 40867eca5e7a4f108a2fa59e1b3442d3b01d4a3b5c596f2ca09739106b0f3a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 5 Jun 2015 13:45:03 +0000 Subject: [PATCH 4/4] - Exclude the update-alternatives manpage to avoid conflict OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=26 --- dpkg.changes | 5 +++++ dpkg.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/dpkg.changes b/dpkg.changes index 0aaf452..3e1320d 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 13:44:48 UTC 2015 - tchvatal@suse.com + +- Exclude the update-alternatives manpage to avoid conflict + ------------------------------------------------------------------- Thu Jun 4 11:14:05 UTC 2015 - tchvatal@suse.com diff --git a/dpkg.spec b/dpkg.spec index 799a217..71d3848 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -146,6 +146,7 @@ exit 0 %defattr(-,root,root) %doc ABOUT-NLS AUTHORS COPYING doc/triggers.txt NEWS README* THANKS TODO debian/changelog %doc %{_mandir}/man*/* +%exclude %{_mandir}/man*/update-alternatives* %dir %{_sysconfdir}/dpkg %config(noreplace) %{_sysconfdir}/dpkg/* %{_bindir}/*