# HG changeset patch # User Michael Schloh von Bennewitz # Date 1231453614 -3600 # Node ID 3ca9c03168f4ecdd0eadd1ec35810fb436558318 # Parent e12fbbfbe80e32351b1fe20b21501e81da75c4ef Import package vendor original specs for necessary manipulations. diff -r e12fbbfbe80e -r 3ca9c03168f4 dpkg/dpkg.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dpkg/dpkg.patch Thu Jan 08 23:26:54 2009 +0100 @@ -0,0 +1,162 @@ +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 + + 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 + + all: all-am + +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 + + 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-no: +-all-local-yes: man.stamp ++all-local-yes: + + # 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 e12fbbfbe80e -r 3ca9c03168f4 dpkg/dpkg.spec --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dpkg/dpkg.spec Thu Jan 08 23:26:54 2009 +0100 @@ -0,0 +1,112 @@ +## +## dpkg.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2008 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 +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package version +%define V_tarball 1.14.24 +%define V_subdir 1.14.24 + +# package information +Name: dpkg +Summary: Debian Package Management Toolchain +URL: http://packages.debian.org/dpkg +Vendor: Ian Jackson et al. +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class: EVAL +Group: Archiver +License: GPL +Version: %{V_tarball} +Release: 20081229 + +# list of sources +Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz +Patch0: dpkg.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes +PreReq: OpenPKG, openpkg >= 20040130 +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 + toolchain. It is the package format technology underlying APT and + other higher-level package management tools. + +%track + prog dpkg = { + version = %{version} + url = http://ftp.debian.org/debian/pool/main/d/dpkg/ + regex = dpkg_(__VER__)\.tar\.gz + } + +%prep + %setup -q -n dpkg-%{V_subdir} + %patch -p0 + +%build + CC="%{l_cc}" \ + CXX="%{l_cxx}" \ + CFLAGS="%{l_cflags -O}" \ + CXXFLAGS="%{l_cxxflags -O}" \ + CPPFLAGS="%{l_cppflags}" \ + LDFLAGS="%{l_ldflags}" \ + ./configure \ + --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 \ + --with-zlib \ + --with-bz2 \ + --without-selinux + %{l_make} %{l_mflags} + +%install + rm -rf $RPM_BUILD_ROOT + %{l_make} %{l_mflags} install AM_MAKEFLAGS="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 + if [ -f $RPM_BUILD_ROOT%{l_prefix}/bin/$bin ]; then + mv $RPM_BUILD_ROOT%{l_prefix}/bin/$bin \ + $RPM_BUILD_ROOT%{l_prefix}/bin/dpkg-$bin + elif [ -f $RPM_BUILD_ROOT%{l_prefix}/sbin/$bin ]; then + mv $RPM_BUILD_ROOT%{l_prefix}/sbin/$bin \ + $RPM_BUILD_ROOT%{l_prefix}/sbin/dpkg-$bin + fi + done + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT +