From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-arch/pdv/Manifest | 8 ++++ app-arch/pdv/files/pdv-1.5.1-default-args.patch | 16 +++++++ app-arch/pdv/files/pdv-1.5.1-early-free.patch | 21 +++++++++ app-arch/pdv/files/pdv-1.5.1-no-strip.patch | 13 ++++++ app-arch/pdv/files/pdv-1.5.1-opt.patch | 24 ++++++++++ app-arch/pdv/files/pdv-1.5.1-x-config.patch | 18 ++++++++ app-arch/pdv/metadata.xml | 10 +++++ app-arch/pdv/pdv-1.5.1-r3.ebuild | 60 +++++++++++++++++++++++++ 8 files changed, 170 insertions(+) create mode 100644 app-arch/pdv/Manifest create mode 100644 app-arch/pdv/files/pdv-1.5.1-default-args.patch create mode 100644 app-arch/pdv/files/pdv-1.5.1-early-free.patch create mode 100644 app-arch/pdv/files/pdv-1.5.1-no-strip.patch create mode 100644 app-arch/pdv/files/pdv-1.5.1-opt.patch create mode 100644 app-arch/pdv/files/pdv-1.5.1-x-config.patch create mode 100644 app-arch/pdv/metadata.xml create mode 100644 app-arch/pdv/pdv-1.5.1-r3.ebuild (limited to 'app-arch/pdv') diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest new file mode 100644 index 000000000000..ef22b41fc38b --- /dev/null +++ b/app-arch/pdv/Manifest @@ -0,0 +1,8 @@ +AUX pdv-1.5.1-default-args.patch 892 BLAKE2B 24fb0f0931ffd35e36eff66f0a0d8c09483b8f16b50e8db824a4313b650a4f2b8ba4db8a1fd985c647fea3b057a19c17acca9623e04f0901376a51d27c3532c1 SHA512 31f3b4f3331723e1bb99b16a9e9c80eb55d95dfce3bc3cbce7d3f629c1aadb16e5dc037bfa4a6157e1a85e889444d0c5c0b687022bf1e60d9a49acc8352e4f34 +AUX pdv-1.5.1-early-free.patch 512 BLAKE2B 085bb8891aacdaf8193dc70cdc009c845a87a53700b9d4100b6984fae7ee6afdd628a12b53b555a45c17400a0e62dbc3a5541556eb246f1bf708939494de3eb7 SHA512 52c921d80e33233e92c44948e9468f93b093bac4ae500e7e3a6b54b6e9b3d8d38c30ad776ea53e86e2000d634a0e7fb03e95b0df39b1fd88624831bb4f95e563 +AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19f7d965ae0e1f9af91f597dbaa91e2157b461d1492ff21704d5664dbe1583c13d4aa100b94592b31e13566efec SHA512 e45976aea1f0573ccd31379759c32e2504637b183a31451aca0ccf628ce12301760fb005376768c2f98d697dde59489768edad10c542d21a06a69d06b6c43b19 +AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599 +AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6 +DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9 +EBUILD pdv-1.5.1-r3.ebuild 1420 BLAKE2B a2185d1edcc325de5b26f1dfc33c0d6d6dfc91c2d6c59da038ec07c8655e6ad0ad69ce5abfa820c0c5e686bb5b289c22e89b8d5c88ff916690bcb03582edac55 SHA512 f52996ffa01d64ec5e883250187a4ea351f7d411fc5ad6cd0208707554a807a93b01b4304fcf787dcba26020c01fb7fe26326cad3aef037c5a0fb1e877ae11fa +MISC metadata.xml 368 BLAKE2B 2e8f5fb6b3f8549f4ab592d8fa60bc700c0c646115c381deebe95c8f9bb0461b5cb7d88d2e49a983fb70393a799713658d4e7dca01c23609cb645e6972823c9b SHA512 99c932094f434a6fff58492ce7bd1e2195bd6c7bfd69dc3dcfd46b8ef2ce0111dfb56a679b6e696b02a8333f1a6459ed107ac6226bb8b9624fea009a74bdd488 diff --git a/app-arch/pdv/files/pdv-1.5.1-default-args.patch b/app-arch/pdv/files/pdv-1.5.1-default-args.patch new file mode 100644 index 000000000000..dc61def911fb --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-default-args.patch @@ -0,0 +1,16 @@ +diff -ur pdv-1.5.1.orig/pdv.h pdv-1.5.1/pdv.h +--- pdv-1.5.1.orig/pdv.h 2001-09-01 12:09:28.000000000 -0700 ++++ pdv-1.5.1/pdv.h 2006-07-22 22:20:43.000000000 -0700 +@@ -47,9 +47,9 @@ + char *cmd; /* command to execute after delivery */ + char *hlpmsg; /* user help message */ + char *agrmsg; /* optional agreement message */ +- char iscompressed; /* filter payload through uncompress */ +- char isatar; /* filter payload through tar */ +- char iszipped; /* use internal compression library */ ++ signed char iscompressed; /* filter payload through uncompress */ ++ signed char isatar; /* filter payload through tar */ ++ signed char iszipped; /* use internal compression library */ + off_t payloadstart; /* start of payload (after pdv stub) */ + off_t metadatastart; /* start of payload data (at end of file) */ + }; diff --git a/app-arch/pdv/files/pdv-1.5.1-early-free.patch b/app-arch/pdv/files/pdv-1.5.1-early-free.patch new file mode 100644 index 000000000000..6896d9437f47 --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-early-free.patch @@ -0,0 +1,21 @@ +diff -ur pdv-1.5.1-orig/mkpkgutils.c pdv-1.5.1/mkpkgutils.c +--- pdv-1.5.1-orig/mkpkgutils.c 2005-04-26 15:01:30.525131384 -0700 ++++ pdv-1.5.1/mkpkgutils.c 2005-04-26 15:55:19.004327944 -0700 +@@ -114,8 +114,6 @@ + if(access(fn_tst, R_OK) == 0) + fn = strdup(fn_tst); + +- free(fn_tst); +- + /* if we could not find it then try the search path + including the current directory as a last resort */ + +@@ -144,6 +142,8 @@ + free(path); + } /* if(fn == NULL) */ + ++ free(fn_tst); ++ + return fn; + } /* findpdv */ + diff --git a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch new file mode 100644 index 000000000000..630bf5eb7c36 --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch @@ -0,0 +1,13 @@ +diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c +--- pdv-1.5.1-orig/Makefile.in 2008-12-06 23:17:46.000000000 -0800 ++++ pdv-1.5.1/Makefile.in 2008-12-06 23:18:37.000000000 -0800 +@@ -536,7 +536,8 @@ + touch $@ + + pdv_fixed : pdv_fixed.c pdv +- $(STRIPBIN) pdv ++ # let portage decide whether to strip binaries ++ #$(STRIPBIN) pdv + printf "%-5.5s" $$VERSION >> pdv + printf "\000\000\000\000\000\000\000\000" >> pdv + sleep 1 diff --git a/app-arch/pdv/files/pdv-1.5.1-opt.patch b/app-arch/pdv/files/pdv-1.5.1-opt.patch new file mode 100644 index 000000000000..df3ebb1b6699 --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-opt.patch @@ -0,0 +1,24 @@ +diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c +--- pdv-1.5.1-orig/pdv.c 2005-04-24 19:27:15.705946000 -0700 ++++ pdv-1.5.1/pdv.c 2005-04-24 19:17:27.042436456 -0700 +@@ -79,7 +79,7 @@ + int + main(int argc, char *argv[]) + { +- char opt; ++ int opt; + int retval = 0; + int showhelp = 0; + struct payload_st pld_data; +diff -ur pdv-1.5.1-orig/pdvmkpkg.c pdv-1.5.1/pdvmkpkg.c +--- pdv-1.5.1-orig/pdvmkpkg.c 2005-04-24 19:27:28.680973496 -0700 ++++ pdv-1.5.1/pdvmkpkg.c 2005-04-24 19:21:49.992461976 -0700 +@@ -94,7 +94,7 @@ + int promptusr = 0; + int nopts = 0; + int result; +- char opt; ++ int opt; + struct stat payldstat; + struct payload_st pld_data; + struct pdvspec_st spec; diff --git a/app-arch/pdv/files/pdv-1.5.1-x-config.patch b/app-arch/pdv/files/pdv-1.5.1-x-config.patch new file mode 100644 index 000000000000..8bab9bee1bfe --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-x-config.patch @@ -0,0 +1,18 @@ +diff -ur pdv-1.5.1-orig/X11/configure.in pdv-1.5.1/X11/configure.in +--- pdv-1.5.1-orig/X11/configure.in 2005-05-13 13:43:27.577544136 -0700 ++++ pdv-1.5.1/X11/configure.in 2005-05-13 13:36:14.218424736 -0700 +@@ -17,8 +17,12 @@ + AC_PATH_X + + dnl Checks for libraries. +-CFLAGS=-I$x_includes +-LDFLAGS=-L$x_libraries ++if test "x$x_includes" != x ; then ++ CFLAGS="$CFLAGS -I$x_includes" ++fi ++if test "x$x_libraries" != x ; then ++ LDFLAGS="$LDFLAGS -L$x_libraries" ++fi + + AC_CHECK_LIB(Xt, XtManageChild) + AC_CHECK_LIB(X11, XLoadFont) diff --git a/app-arch/pdv/metadata.xml b/app-arch/pdv/metadata.xml new file mode 100644 index 000000000000..c2df9b225a0e --- /dev/null +++ b/app-arch/pdv/metadata.xml @@ -0,0 +1,10 @@ + + + + + A payload Delivery vehicle that contains a complete package and +the commands to install it. + + pdv + + diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r3.ebuild new file mode 100644 index 000000000000..8b712196c4de --- /dev/null +++ b/app-arch/pdv/pdv-1.5.1-r3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools toolchain-funcs + +DESCRIPTION="build a self-extracting and self-installing binary package" +HOMEPAGE="https://sourceforge.net/projects/pdv" +SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos" +IUSE="X" + +DEPEND=" + X? ( + >=x11-libs/motif-2.3:0 + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libXext-1.0.0 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + # fix a size-of-variable bug + eapply "${FILESDIR}"/${P}-opt.patch + # fix a free-before-use bug + eapply "${FILESDIR}"/${P}-early-free.patch + # fix a configure script bug + eapply "${FILESDIR}"/${P}-x-config.patch + # fix default args bug from assuming 'char' is signed + eapply "${FILESDIR}"/${P}-default-args.patch + # prevent pre-stripped binaries + eapply "${FILESDIR}"/${P}-no-strip.patch + + # re-build configure script since patch was applied to configure.in + cd "${S}"/X11 + mv configure.in configure.ac || die + eautoreconf + tc-export CC +} + +src_configure() { + local myconf="" + use X || myconf="--without-x" # configure script is broken, cant use use_with + econf ${myconf} +} + +src_install() { + dobin pdv pdvmkpkg + doman pdv.1 pdvmkpkg.1 + if use X ; then + dobin X11/xmpdvmkpkg + doman xmpdvmkpkg.1 + fi + dodoc AUTHORS ChangeLog NEWS README pdv.lsm +} -- cgit v1.2.3