# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346173220 -7200 # Node ID 03d66ab4c7cabf9a7a627e1cd890f9e5d5437ccb # Parent 6a62f7ecb64c9a900a17b5ae08a33c6a781abeae Update version, modernize packaging, include fallback pid_is_* on Solaris, remove defective KVM integration logic, and replace Burrows–Wheeler source compression with LZMA. diff -r 6a62f7ecb64c -r 03d66ab4c7ca dpkg/dpkg.patch --- a/dpkg/dpkg.patch Tue Aug 28 22:15:58 2012 +0200 +++ b/dpkg/dpkg.patch Tue Aug 28 19:00:20 2012 +0200 @@ -1,108 +1,37 @@ -Index: dpkg-deb/Makefile.in ---- dpkg-deb/Makefile.in.orig 2008-03-30 11:58:18 +0200 -+++ dpkg-deb/Makefile.in 2008-04-01 21:56:55 +0200 -@@ -213,8 +213,7 @@ - main.c +Index: configure +--- configure.orig 2012-03-19 08:58:04.000000000 +0100 ++++ configure 2012-03-20 08:27:36.000000000 +0100 +@@ -10918,7 +10918,7 @@ + WFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers \ + -Wmissing-declarations -Wmissing-format-attribute \ + -Wformat-security -Wpointer-arith \ +- -Wvla -Winit-self -Wwrite-strings -Wcast-align -Wshadow" ++ -Winit-self -Wwrite-strings -Wcast-align -Wshadow" + WCFLAGS="-Wdeclaration-after-statement -Wnested-externs -Wbad-function-cast \ + -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition" + # Temporarily here until #542031 gets fixed in ncurses +Index: lib/dpkg/dpkg-db.h +--- lib/dpkg/dpkg-db.h.orig 2012-03-19 08:56:40.000000000 +0100 ++++ lib/dpkg/dpkg-db.h 2012-03-20 08:27:36.000000000 +0100 +@@ -27,6 +27,7 @@ - dpkg_deb_LDADD = \ -- ../libcompat/libcompat.a \ -- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) -+ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a + #include + #include ++#include - all: all-am + #include + #include +Index: man/Makefile.in +--- man/Makefile.in.orig 2012-03-19 08:58:07.000000000 +0100 ++++ man/Makefile.in 2012-03-20 08:27:36.000000000 +0100 +@@ -636,12 +636,12 @@ -Index: dpkg-split/Makefile.in ---- dpkg-split/Makefile.in.orig 2008-03-30 11:58:18 +0200 -+++ dpkg-split/Makefile.in 2008-04-01 21:57:43 +0200 -@@ -217,9 +217,8 @@ - split.c - dpkg_split_LDADD = \ -- ../libcompat/libcompat.a \ - $(LIBINTL) \ -- ../lib/libdpkg.a -+ ../lib/libdpkg.a ../libcompat/libcompat.a + # If the user has not defined it let's use the default. +-LINGUAS ?= $(LINGUAS_DIST) ++LINGUAS = - pkglib_SCRIPTS = mksplit - EXTRA_DIST = mksplit.pl -Index: dselect/Makefile.in ---- dselect/Makefile.in.orig 2008-03-30 11:58:18 +0200 -+++ dselect/Makefile.in 2008-04-01 21:56:55 +0200 -@@ -249,10 +249,9 @@ - pkgtop.cc - - dselect_LDADD = \ -- ../libcompat/libcompat.a \ - $(LIBINTL) \ - $(CURSES_LIBS) \ -- ../lib/libdpkg.a -+ ../lib/libdpkg.a ../libcompat/libcompat.a - - EXTRA_DIST = keyoverride mkcurkeys.pl - CLEANFILES = curkeys.h -@@ -640,8 +639,8 @@ - - curkeys.$(OBJEXT): curkeys.h - curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl -- cursesfile=`echo '#include ' | \ -- $(CC) -E - | grep 'curses.h' | head -n 1 | \ -+ cursesfile=`echo '#include ' | \ -+ $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \ - sed -e 's/^[^"]*"//; s/".*$$//'`; \ - if [ "$$cursesfile" = "" ]; then \ - echo "can't find curses file"; exit 1; \ -Index: dselect/dselect.h ---- dselect/dselect.h.orig 2008-03-30 11:57:41 +0200 -+++ dselect/dselect.h 2008-04-01 21:56:55 +0200 -@@ -28,7 +28,7 @@ - - #include - #undef ERR --#include -+#include - - struct helpmenuentry { - char key; -Index: dselect/main.cc ---- dselect/main.cc.orig 2008-03-30 11:57:41 +0200 -+++ dselect/main.cc 2008-04-01 21:56:55 +0200 -@@ -37,7 +37,7 @@ - #include - #include - --#include -+#include - - extern "C" { - #include -Index: lib/tarfn.c ---- lib/tarfn.c.orig 2008-03-30 10:58:51 +0200 -+++ lib/tarfn.c 2008-04-01 21:56:55 +0200 -@@ -62,7 +62,9 @@ - int len; - char * str; - -- len = strnlen(s, size); -+ len = strlen(s); -+ if (len > size) -+ len = size; - str = m_malloc(len + 1); - memcpy(str, s, len); - str[len] = 0; -Index: man/Makefile.in ---- man/Makefile.in.orig 2008-03-30 11:58:18 +0200 -+++ man/Makefile.in 2008-04-01 21:56:55 +0200 -@@ -189,7 +189,7 @@ - top_srcdir = @top_srcdir@ - - # Extract the list of languages from the po4a config file. --LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg) -+LINGUAS = - dist_man_MANS = \ - 822-date.1 \ - cleanup-info.8 \ -@@ -540,7 +540,7 @@ - all-local: all-local-@USE_NLS@ + all-local: all-local-@USE_PO4A@ all-local-no: -all-local-yes: man.stamp @@ -110,53 +39,3 @@ # FIXME: Use a stamp file until po4a supports them internally. man.stamp: -Index: scripts/Makefile.in ---- scripts/Makefile.in.orig 2008-03-30 11:58:19 +0200 -+++ scripts/Makefile.in 2008-04-01 21:56:55 +0200 -@@ -757,8 +757,8 @@ - $(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir) - - install-data-local: -- $(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives -- $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README -+ $(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives -+ $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README - - # Ideally we'd use 'sed -i', but unfortunately that's not portable. - install-data-hook: -Index: src/Makefile.in ---- src/Makefile.in.orig 2008-03-30 11:58:19 +0200 -+++ src/Makefile.in 2008-04-01 21:56:55 +0200 -@@ -239,8 +239,8 @@ - update.c - - dpkg_LDADD = \ -- ../libcompat/libcompat.a \ -- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) -+ \ -+ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a - - dpkg_query_SOURCES = \ - errors.c \ -@@ -248,17 +248,17 @@ - query.c - - dpkg_query_LDADD = \ -- ../libcompat/libcompat.a \ -+ \ - $(LIBINTL) \ -- ../lib/libdpkg.a -+ ../lib/libdpkg.a ../libcompat/libcompat.a - - dpkg_trigger_SOURCES = \ - trigcmd.c - - dpkg_trigger_LDADD = \ -- ../libcompat/libcompat.a \ -+ \ - $(LIBINTL) \ -- ../lib/libdpkg.a -+ ../lib/libdpkg.a ../libcompat/libcompat.a - - all: all-am - diff -r 6a62f7ecb64c -r 03d66ab4c7ca dpkg/dpkg.spec --- a/dpkg/dpkg.spec Tue Aug 28 22:15:58 2012 +0200 +++ b/dpkg/dpkg.spec Tue Aug 28 19:00:20 2012 +0200 @@ -1,6 +1,6 @@ ## ## dpkg.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -22,8 +22,8 @@ ## # package version -%define V_tarball 1.14.24 -%define V_subdir 1.14.24 +%define V_tarball 1.16.8 +%define V_subdir 1.16.8 # package information Name: dpkg @@ -36,21 +36,17 @@ Group: Archiver License: GPL Version: %{V_tarball} -Release: 20090106 +Release: 20120800 # list of sources -Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Patch0: dpkg.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes -PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: gettext, libiconv, bzip2, zlib PreReq: gettext, libiconv, bzip2, zlib -AutoReq: no -AutoReqProv: no %description dpkg is the heart of the Debian GNU/Linux package management @@ -61,26 +57,32 @@ prog dpkg = { version = %{version} url = http://ftp.debian.org/debian/pool/main/d/dpkg/ - regex = dpkg_(__VER__)\.tar\.gz + regex = dpkg_(__VER__)\.tar\.xz } %prep %setup -q -n dpkg-%{V_subdir} %patch -p0 + %{l_shtool} subst \ + -e 's;\(defined(OSLinux)\)$;\1 || defined(OSsunos);g' \ + utils/start-stop-daemon.c %build + ( echo "ac_cv_header_kvm_h=no" + ) >config.cache CC="%{l_cc}" \ CXX="%{l_cxx}" \ CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ - CPPFLAGS="%{l_cppflags}" \ + CPPFLAGS="%{l_cppflags} -I`pwd`" \ LDFLAGS="%{l_ldflags}" \ + LIBS="-lintl -liconv" \ ./configure \ + --cache-file=./config.cache \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --with-libiconv-prefix=%{l_prefix} \ --with-libintl-prefix=%{l_prefix} \ - --without-included-gettext \ --with-dselect \ --without-start-stop-daemon \ --with-admindir=%{l_prefix}/var/dpkg \ @@ -90,8 +92,7 @@ %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT LINGUAS=doit + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale for bin in 822-date cleanup-info install-info update-alternatives; do @@ -108,5 +109,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT