diff options
| author | Coelacanthus | 2021-01-31 21:36:39 +0800 |
|---|---|---|
| committer | Coelacanthus | 2021-01-31 21:36:39 +0800 |
| commit | c22d81f480d091541aa07e9bdb5b9679a809eae5 (patch) | |
| tree | d27a309ca0e8a42b9d987c0146621deb6be83c69 | |
| parent | 1fdb021fec4a060796e9ad140e77f8f641a329c5 (diff) | |
| download | aur-c22d81f480d091541aa07e9bdb5b9679a809eae5.tar.gz | |
upgpkg: checkinstall 1.6.2-2
follow upstream bug fix
fix no FULL RELRO
29 files changed, 3243 insertions, 110 deletions
@@ -1,20 +1,66 @@ pkgbase = checkinstall pkgdesc = Track files modified by an installation script and create a Slackware, RPM or Debian package pkgver = 1.6.2 - pkgrel = 1 + pkgrel = 2 url = http://checkinstall.izto.org arch = i686 arch = x86_64 license = GPL depends = bash depends = glibc + optdepends = dpkg: to create deb packages + optdepends = rpm-tools: to create RPM packages provides = installwatch source = http://checkinstall.izto.org/files/source/checkinstall-1.6.2.tar.gz - source = installwatch.patch - source = makefile.patch - sha256sums = dc61192cf7b8286d42c44abae6cf594ee52eafc08bfad0bea9d434b73dd593f4 - sha256sums = 91f99f594953c3fa1d4f6a41a7d3fa3b4a86c5187b325145336608ab49e10d32 - sha256sums = 46e60ae1c0b199051ac10e70dcad7dfc94508960e98885882b5d71a11fed7f0a + source = 0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch + source = 0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch + source = 0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch + source = 0004-Fixed-bug-1-Source-directory-package-name-with-space.patch + source = 0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch + source = 0006-Added-Norwegian-translation-update-from-Andreas-Note.patch + source = 0007-Added-summary-command-line-option.patch + source = 0008-Fixed-glibc-minor-version-handling.patch + source = 0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch + source = 0010-Support-for-the-Makefile-PREFIX-variable.patch + source = 0011-We-now-create-Slackware-packages-in-TMP_DIR.patch + source = 0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch + source = 0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch + source = 0014-Fixed-typo-in-create-localdecls.patch + source = 0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch + source = 0016-Fixed-bug-38.-.spec-file-macro-processing.patch + source = 0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch + source = 0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch + source = 0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch + source = 0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch + source = 0021-Load-checkinstallrc-from-etc.patch + source = 0022-Drop-cases-for-glibc-2.4.patch + source = 0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch + source = 0024-using-custom-cflag-and-ldflag.patch + b2sums = 3faaebe60c0dc40f36de0ed1854817ecc2d11467e63611d79e2300af17af0708c67491fd0c0a947ded89fd6e53bb15faebf9a85445cabb97be6d21e24cdd70a9 + b2sums = 994ee7e7664ce400c6cf4338cb348079064cf985278231485f0434b884278ce60dfa25b3e63377331871f95be2a608fda32409a19db4044c1cd2eb48c789a24b + b2sums = 9d94e308ae7534dc27c51516eb930abb99112180f493aacef786d3de6ee397c077876ff690558a4f742a2d4c5d97579f6a9582d90b2bab915f5c025f3a4a1782 + b2sums = b113f336bbc9f555d52170e7745373067ac1bc21f12b99197eef091b08be6114ad2f6a61fa0f52a1eef246846245d64629beabc018ac8f7e1753c945720ebd28 + b2sums = 9000e4e6de09ced649e5d8fb8e0f419232f0cab0cb6a489da1d4bb86039d66ee728ac9b0bb2c8d766c80841a1322038b1015c9be343a80b72e90038067759ceb + b2sums = 6112a545109e7838adc2495bf3287f6cf5a4365a08240562961acfec60a022cb5a90b4fe3d40c29639f82923c0f484efcc8797a3512b68d5c568b7334b1abff6 + b2sums = d2d00dc4cc4ecd19c8f18397d084d2e1d12ccfdea797e787dcc32f6784411104f9716c2a49121f6e8291e3b46c41808b80ca4dada38dda63ac6d4a85e71dcb4b + b2sums = a7ae461f2848c4b2642b56ae8cf82a6706af86b4ed534f68ae4852c764e1d032daa141a5bec66d1c9685a2a4f468eacaee4dbe1f49da516932e8f970cb431d1b + b2sums = ea1146405145ae31114ebef8e69547fbe14965b01462cd75b378a4997896519c684a62c4a5f4b4972016d09d59fe2cf89e268164e5894728b0dbb151b000bd1f + b2sums = b33c580e6c4fb52831d6252c77342e6095bd2c323b1167bebe7d8486a0a4ccb3802df790b8208f2f054098fa904d553eab501853fe1a72e0307b7d571f8bd65d + b2sums = 13e7c097a10e5532cff125044b15a81fa8766bd4ebb26acf0fb7549fd5305e7b1c6b07d8b6ff29b025064fd6c0779cfeca58deaa74366be352cbe81d2372da2a + b2sums = 3b05766fc1754de8535de64eefd1b6719630cf825a3621734e848cdba2d1de7acd5a9598edf3e1862dbb4b2d9860660515a8e7528ddd9fcaba26362f3a2b9f97 + b2sums = 4a88981a8bcbaae8a2cbeb3652601b9d17b9523b87f96e6c9228c2aca57e36e37b270a6e9862dab3ad3f9f2a7f60bf0e75f0b7376592930f36960818f72e5977 + b2sums = a638683f5d2812424ba82b7e2f237d26c7b0d833d7c670cba984301c97eb97c26bdb347c458b809256a4303e343a7d12ed9912c8a76b1fc21f0fabe6cf880670 + b2sums = 07f2569a9e0f94b832476303bf487c431b35301a63c711ed1104f2a88e27a7c52ab8e40011ccdebdde92f5f32ba1a7e1c5acc03f6e9afd6588703718ee4b623b + b2sums = d324ac1360699a99d9ad8aceb6b7201c06752bc62e55ee254508ea00dffbe0fb8fb6c9b2aaa54f73db876f8fbe90494d0048ab9c243b029f4e8bf1a7839c3f67 + b2sums = 4a58e51416f4f18504c82b526725e21d1ad7c7bd7ee896b7e27f7ce0c68990db8a1db23670b0d8678e2800cb995ca24ebd29388254037dcf4ba5548d00bdc878 + b2sums = 4ad781d59d911b36316bcbea2ce489f8a91fb26a0253fafa7cae6f1dcd8331995aba2faa16d693e6cbf03561d4f58d246ddb31da1fe99df14b62535914537d88 + b2sums = f6e401290b06afaa5a22b37a7ca36ee6399af3c6565afc711a05e21b8150925cfb655b740330a236a46884b5d3098d272841dd08a95ba5ae165c790ee59fa620 + b2sums = a947109b5010bbb349f608c6139d291daff6538af9e8fdf827f3c3184d1b47268a1b889d4870f80217b06e7594b1dbe59a917729f266bde676e8c1abb6ea4a7f + b2sums = 94bc1a97619f15617687f2fb65e15991bc6fcaabd09e866f1047cdaddbdf0e6e61cf9d91fdc7489fe76291c8539f4dad169dd8a68690188e3916b25cb37419f7 + b2sums = 882d01f77fc57d977f2e63440c2b0a9f967a119fad0276bded5b43072880f8a29d163589b16270dcdd383d998973876d96eff4757b50d494a85eb8d292b28e4a + b2sums = fd919f347978a8ffcdefa3ca11000c80e341e72495d020238cc3dcf00f06f9e0fd77677bc4dee51ea7ffa596a7c305d547a91d63426c8386f6c353ffe07b05f5 + b2sums = 8dde83a0cf2d490cc30e2787dd20dbc2d92b764b370002560309296b9592a7329e2b424e973a12b00d92ea89de42e2517bd3a95e6befe6c5f88a29e9793eba8b + b2sums = 414261dd6eb8112f26e93ea80faba698ea2b42ada99f0c10bceb0e8c1ff0636717b1c922fc9696f59bcb403af0e0ce1863d3e7b9c33643c3db5553379fb8597d pkgname = checkinstall diff --git a/0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch b/0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch new file mode 100644 index 000000000000..a3e4fa9bd371 --- /dev/null +++ b/0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch @@ -0,0 +1,203 @@ +From f8458d94e540c610085ab2d3665060248afae268 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Wed, 10 Feb 2010 14:44:14 -0600 +Subject: [PATCH 01/20] Felipe Sateler: Tag only regular files as conffiles + +Jirka Hladky: Support for changes in scandir() and scandir64() in glibc-2.10 +--- + INSTALL | 7 +++---- + checkinstall | 10 +++++----- + description-pak | 2 +- + installwatch/create-localdecls | 16 ++++++++++++++++ + installwatch/description-pak | 1 - + installwatch/installwatch.c | 26 ++++++++++++++++++++++++++ + 6 files changed, 51 insertions(+), 11 deletions(-) + delete mode 100644 installwatch/description-pak + +diff --git a/INSTALL b/INSTALL +index 40be5c5..2abdf7a 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -12,15 +12,14 @@ checkinstall + "make install" goes first because we have no checkinstall installed yet :) + + "checkinstall" goes latter so we can have a properly installed (and removable) +- package for checkinstall-1.6.1 ++ package for checkinstall-1.6.2 + + (Be sure to read the README if you're planning on building RPM or + Debian binary packages) + + +-This will install checkinstall-1.6.1, makepak (modified makepkg) and +-installwatch-0.7.0beta5 ++This will install checkinstall-1.6.2, makepak (modified makepkg) and ++installwatch-0.7.0 + + + ========== +-$Id: INSTALL,v 1.6.0.3 2004/12/01 21:36:17 izto Exp $ +diff --git a/checkinstall b/checkinstall +index 41a7978..076aeaa 100755 +--- a/checkinstall ++++ b/checkinstall +@@ -1,10 +1,10 @@ + #!/bin/bash + ############################################################################## +-# $Id: checkinstall,v 1.6.2.17 2009/12/26 13:15:21 izto Exp $ ++# $Id: checkinstall,v 1.6.3.1 2010/02/10 14:42:32 izto Exp $ + # ######################## + # + # +-# CheckInstall v1.6.2 ++# CheckInstall v1.6.3 + # + # Installs a compiled program from the program's source directory using + # "make install" or any other command supplied on checkinstall's command +@@ -38,7 +38,7 @@ + # Trap the INT signal (ctrl-c, for example) + trap trapint 2 + +-CHECKINSTALL_VERSION=1.6.2 ++CHECKINSTALL_VERSION=1.6.3 + + # locate the file or directory that the parameter corresponds to; + # always prints absolute path +@@ -2463,7 +2463,7 @@ cd "$DIRECTORIO_FUENTE" + + echo + echogn "Building RPM package..." +-$RPMBUILD -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log ++$RPMBUILD -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" --buildroot="$BROOTPATH" &> ${TMP_DIR}/rpmbuild.log + okfail + + if [ $? -gt 0 ]; then +@@ -2608,7 +2608,7 @@ if [ -f postremove-pak ]; then + fi + + # Tag files in /etc to be conffiles +-find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ ++find $BUILD_DIR/etc -type f 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ + grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles + + # The package will be saved here (ignores <epoch>: prefix): +diff --git a/description-pak b/description-pak +index d9ace66..01fd583 100644 +--- a/description-pak ++++ b/description-pak +@@ -1,4 +1,4 @@ +-CheckInstall installations tracker, version 1.6.2a1 - pre git ++CheckInstall installations tracker, version 1.6.2 + + CheckInstall keeps track of all the files created or + modified by your installation script ("make install" +diff --git a/installwatch/create-localdecls b/installwatch/create-localdecls +index cce5bc9..f7adf4d 100755 +--- a/installwatch/create-localdecls ++++ b/installwatch/create-localdecls +@@ -64,6 +64,7 @@ if test "$VERSION" = 'libc.so.6' ; then + case "$OsLibcMajor" in + 2) + # 2 is the glibc version ++ echo "JH OsLibcMinor is $OsLibcMinor" + case "$OsLibcMinor" in + 0) + echo '#define GLIBC_MINOR 0' >> $OUTFILE +@@ -89,6 +90,21 @@ if test "$VERSION" = 'libc.so.6' ; then + 7) + echo '#define GLIBC_MINOR 7' >> $OUTFILE + SUBVERSION='glibc-2.7' ;; ++ 8) ++ echo '#define GLIBC_MINOR 8' >> $OUTFILE ++ SUBVERSION='glibc-2.8' ;; ++ 9) ++ echo '#define GLIBC_MINOR 9' >> $OUTFILE ++ SUBVERSION='glibc-2.9' ;; ++ 10) ++ echo '#define GLIBC_MINOR 10' >> $OUTFILE ++ SUBVERSION='glibc-2.10' ;; ++ 11) ++ echo '#define GLIBC_MINOR 11' >> $OUTFILE ++ SUBVERSION='glibc-2.11' ;; ++ 12) ++ echo '#define GLIBC_MINOR 12' >> $OUTFILE ++ SUBVERSION='glibc-2.12' ;; + *) + echo 'Treated as glibc >= 2.1 (finger crossed)' + echo '#define GLIBC_MINOR 1' >> $OUTFILE +diff --git a/installwatch/description-pak b/installwatch/description-pak +deleted file mode 100644 +index e8014b9..0000000 +--- a/installwatch/description-pak ++++ /dev/null +@@ -1 +0,0 @@ +-Package created with checkinstall 1.6.0beta1 +diff --git a/installwatch/installwatch.c b/installwatch/installwatch.c +index 21c91c7..8004b5b 100644 +--- a/installwatch/installwatch.c ++++ b/installwatch/installwatch.c +@@ -98,9 +98,20 @@ static int (*true_rename)(const char *, const char *); + static int (*true_rmdir)(const char *); + static int (*true_xstat)(int,const char *,struct stat *); + static int (*true_lxstat)(int,const char *,struct stat *); ++ ++#if(GLIBC_MINOR >= 10) ++ ++static int (*true_scandir)( const char *,struct dirent ***, ++ int (*)(const struct dirent *), ++ int (*)(const struct dirent **,const struct dirent **)); ++ ++#else ++ + static int (*true_scandir)( const char *,struct dirent ***, + int (*)(const struct dirent *), + int (*)(const void *,const void *)); ++#endif ++ + static int (*true_symlink)(const char *, const char *); + static int (*true_truncate)(const char *, TRUNCATE_T); + static int (*true_unlink)(const char *); +@@ -118,9 +129,16 @@ static FILE *(*true_fopen64)(const char *,const char *); + static int (*true_ftruncate64)(int, __off64_t); + static int (*true_open64)(const char *, int, ...); + static struct dirent64 *(*true_readdir64)(DIR *dir); ++ ++#if(GLIBC_MINOR >= 10) ++static int (*true_scandir64)( const char *,struct dirent64 ***, ++ int (*)(const struct dirent64 *), ++ int (*)(const struct dirent64 **,const struct dirent64 **)); ++#else + static int (*true_scandir64)( const char *,struct dirent64 ***, + int (*)(const struct dirent64 *), + int (*)(const void *,const void *)); ++#endif + static int (*true_xstat64)(int,const char *, struct stat64 *); + static int (*true_lxstat64)(int,const char *, struct stat64 *); + static int (*true_truncate64)(const char *, __off64_t); +@@ -3079,7 +3097,11 @@ int rmdir(const char *pathname) { + + int scandir( const char *dir,struct dirent ***namelist, + int (*select)(const struct dirent *), ++#if (GLIBC_MINOR >= 10) ++ int (*compar)(const struct dirent **,const struct dirent **) ) { ++#else + int (*compar)(const void *,const void *) ) { ++#endif + int result; + + if (!libc_handle) +@@ -3691,7 +3713,11 @@ struct dirent64 *readdir64(DIR *dir) { + + int scandir64( const char *dir,struct dirent64 ***namelist, + int (*select)(const struct dirent64 *), ++#if (GLIBC_MINOR >= 10) ++ int (*compar)(const struct dirent64 **,const struct dirent64 **) ) { ++#else + int (*compar)(const void *,const void *) ) { ++#endif + int result; + + if (!libc_handle) +-- +2.30.0 + diff --git a/0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch b/0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch new file mode 100644 index 000000000000..ca624437751c --- /dev/null +++ b/0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch @@ -0,0 +1,75 @@ +From 5c72c346bd6cd395dcbb23c94b64345e6f46db8c Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Wed, 21 Apr 2010 19:11:06 -0500 +Subject: [PATCH 02/20] Backtick patch from Andrey Schmachev, Copyright year + bump + +From: Felipe Sateler <fsateler@gmail.com> +Date: Thu, 15 Apr 2010 14:48:36 -0400 +Subject: [PATCH 2/3] Remove backticks from message + +Backticks have to be escaped in HEREDOCs. Remove it since it is ugly anyway. +Thanks Andrey Smachev. +--- + checkinstall | 6 +++--- + installwatch/installwatch | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/checkinstall b/checkinstall +index 076aeaa..4a7c6e8 100755 +--- a/checkinstall ++++ b/checkinstall +@@ -16,7 +16,7 @@ + # holding the temp dir (see BASE_TEMP_DIR below) to write there a temporary + # copy of the package. + # +-# Copyright (C) 2004 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> ++# Copyright (C) 2010 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> + # + # + # This program is free software; you can redistribute it and/or modify +@@ -107,7 +107,7 @@ function echogn() { + + function ckversion { + echo +- echo "checkinstall $CHECKINSTALL_VERSION, Copyright 2009 Felipe Eduardo Sanchez Diaz Duran" ++ echo "checkinstall $CHECKINSTALL_VERSION, Copyright 2010 Felipe Eduardo Sanchez Diaz Duran" + echog " This software is released under the GNU GPL." + } + +@@ -794,7 +794,7 @@ while [ "$1" != "--" ]; do + --copyright|--version) + cat << EOF + +-Copyright (c) 2009 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> ++Copyright (c) 2010 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> + + This program is free software; you can redistribute it and/or modify + it under the terms of the version 2 of the GNU General Public License +diff --git a/installwatch/installwatch b/installwatch/installwatch +index 0a4ccbf..ab38178 100755 +--- a/installwatch/installwatch ++++ b/installwatch/installwatch +@@ -43,7 +43,7 @@ function ckversion { + echo + echo -n "installwatch $INSTALLWATCH_VERSION, " + echo "Copyright 1998 Pancrazio de Mauro" +- echo "Copyright 2002 Felipe Eduardo Sanchez Diaz Duran" ++ echo "Copyright 2010 Felipe Eduardo Sanchez Diaz Duran" + echo " This software is released under the GNU GPL." + } + +@@ -179,8 +179,8 @@ while [ "$1" != "--" ]; do + --copyright|--version) + cat << EOF + +-Copyright (C) 1998 Pancrazio `Ezio' de Mauro +-Copyright (C) 2002 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> ++Copyright (C) 1998 Pancrazio 'Ezio' de Mauro ++Copyright (C) 2010 Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +-- +2.30.0 + diff --git a/0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch b/0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch new file mode 100644 index 000000000000..638a079c60b9 --- /dev/null +++ b/0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch @@ -0,0 +1,49 @@ +From 67ee6db42e15064ba3c6ff289359a33aeea3cf86 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 20 Sep 2010 14:20:01 -0500 +Subject: [PATCH 03/20] Fixed bug #3 - Removed extra okfail and fixed spanish + translation. + +--- + checkinstall | 1 - + locale/checkinstall-es.po | 8 ++++---- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/checkinstall b/checkinstall +index 4a7c6e8..03b7969 100755 +--- a/checkinstall ++++ b/checkinstall +@@ -2798,7 +2798,6 @@ if [ $? -eq 0 ]; then + # We do this for the same reason as in restore_backup + FILES=$(ls -A) + $TAR -cpf - $FILES | gzip -9 > "${DIRECTORIO_FUENTE}/backup-`date +%m%d%Y%H%M`-pre-${PKG_BASENAME}.tgz" +- okfail + + okfail + fi +diff --git a/locale/checkinstall-es.po b/locale/checkinstall-es.po +index 214f4ea..b2cd858 100644 +--- a/locale/checkinstall-es.po ++++ b/locale/checkinstall-es.po +@@ -1,6 +1,6 @@ +-# MENSAJES PARA CHECKINSTALL-1.6.0beta1 en ESPAÑOL +-# Copyright (C) 2002 Felipe Eduardo Sánchez Díaz Durán +-# Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx>, 2002. ++# MENSAJES PARA CHECKINSTALL-1.6.3 en ESPAÑOL ++# Copyright (C) 2002 - 2010 Felipe Eduardo Sánchez Díaz Durán ++# Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx>, 2010. + # + #, fuzzy + msgid "" +@@ -607,7 +607,7 @@ msgid "Deleting doc-pak directory..." + msgstr "Borrando el directorio doc-pak..." + + msgid "Writing backup package..." +-msgstr "Escribiendo el paquete de respaldo" ++msgstr "Escribiendo el paquete de respaldo..." + + msgid "Deleting temp dir..." + msgstr "Borrando el directorio temporal..." +-- +2.30.0 + diff --git a/0004-Fixed-bug-1-Source-directory-package-name-with-space.patch b/0004-Fixed-bug-1-Source-directory-package-name-with-space.patch new file mode 100644 index 000000000000..57eccefd79fb --- /dev/null +++ b/0004-Fixed-bug-1-Source-directory-package-name-with-space.patch @@ -0,0 +1,182 @@ +From 9f2cef7810cfec70c37a79b024989bb479cada7e Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 20 Sep 2010 15:02:09 -0500 +Subject: [PATCH 04/20] Fixed bug #1 - Source directory / package name with + spaces in them. + +If we find a package name with spaces (i.e. as a result of a source directory +with blank spaces in its name) then we'll replace the blanks with underscores. +--- + checkinstall | 61 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 34 insertions(+), 27 deletions(-) + +diff --git a/checkinstall b/checkinstall +index 03b7969..978360f 100755 +--- a/checkinstall ++++ b/checkinstall +@@ -325,8 +325,8 @@ function cleanup { + rm -f "${RPMSOURCEDIR}/SOURCES/${PKG_BASENAME}.tgz" + + # If we had a pre-existing postinstall-pak, we keep it as it was. +- if [ -f ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ]; then +- mv ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ${DIRECTORIO_FUENTE}/postinstall-pak ++ if [ -f "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" ]; then ++ mv "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" "${DIRECTORIO_FUENTE}/postinstall-pak" + fi + + true; okfail +@@ -1271,27 +1271,34 @@ fi + ! [ "$SUMMARY" ] && SUMMARY=`head -1 description-pak` + ! [ "$NAME" ] && NAME=`echo "$PKG_BASENAME" | rev | cut -f2- -d"-" | rev` + ++ echo "$NAME" | grep -e "[[:blank:]]" &> /dev/null ++ if [ $? -eq 0 ]; then ++ echo ++ echog "*** Warning: The package name \"%s\" contains spaces.\n*** Warning: Package names with spaces in them are not valid in most\n*** Warning: packaging systems so I changed all spaces to underscores." "$NAME" ++ NAME=`echo "$NAME" | tr ' \t' '__'` ++ fi ++ + if [ "$CK_DEBIAN" ]; then # Make the name policy compliant +- echo $NAME | grep -e "[[:upper:]]" &> /dev/null ++ echo "$NAME" | grep -e "[[:upper:]]" &> /dev/null + + if [ $? -eq 0 ]; then + echo + echog "*** Warning: The package name \"%s\" contains upper case\n*** Warning: letters. dpkg might not like that so I changed\n*** Warning: them to lower case." "$NAME" +- NAME=`echo $NAME | tr 'A-Z' 'a-z'` ++ NAME=`echo "$NAME" | tr 'A-Z' 'a-z'` + + + fi +- echo $NAME | grep -e '^[^0-9a-z]' &> /dev/null ++ echo "$NAME" | grep -e '^[^0-9a-z]' &> /dev/null + if [ $? -eq 0 ]; then + echo + echog "*** Warning: The package name \"%s\" does not start with\n*** Warning: an alphanumetic character. dpkg might not like that so I prefixed\n*** Warning: it with a number 0." "$NAME" +- NAME=`echo $NAME | sed -e 's/^/0/'` ++ NAME=`echo "$NAME" | sed -e 's/^/0/'` + fi +- echo $NAME | grep -e '[^0-9a-z+.-]' &> /dev/null ++ echo "$NAME" | grep -e '[^0-9a-z+.-]' &> /dev/null + if [ $? -eq 0 ]; then + echo + echog "*** Warning: The package name \"%s\" contains illegal\n*** Warning: characters. dpkg might not like that so I changed\n*** Warning: them to dashes." "$NAME" +- NAME=`echo $NAME | sed -e 's/[^0-9a-z+.-]/-/g'` ++ NAME=`echo "$NAME" | sed -e 's/[^0-9a-z+.-]/-/g'` + fi + fi + +@@ -1930,7 +1937,7 @@ okfail + + # Do we have a postinstall script? + PINST_EXISTS=0 +-[ -f ${DIRECTORIO_FUENTE}/postinstall-pak ] && PINST_EXISTS=1 ++[ -f "${DIRECTORIO_FUENTE}/postinstall-pak" ] && PINST_EXISTS=1 + + ############################################################################## + # Identify shared libraries # +@@ -1957,12 +1964,12 @@ if [ -f ${TMP_DIR}/libdirs ]; then + # If we have a pre-existing postinstall-pak we save it + + if [ $PINST_EXISTS -gt 0 ]; then +- mv ${DIRECTORIO_FUENTE}/postinstall-pak ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ++ mv "${DIRECTORIO_FUENTE}/postinstall-pak" "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" + PINST_EXISTS=1 + fi + + if ! [ $PINST_EXISTS -gt 0 ]; then +- cat << EOF > ${DIRECTORIO_FUENTE}/postinstall-pak ++ cat << EOF > "${DIRECTORIO_FUENTE}/postinstall-pak" + #!/bin/sh + # + # postinstall script, created by checkinstall-${CHECKINSTALL_VERSION} +@@ -1970,7 +1977,7 @@ if [ -f ${TMP_DIR}/libdirs ]; then + EOF + fi + +- echo "echo" >> ${DIRECTORIO_FUENTE}/postinstall-pak ++ echo "echo" >> "${DIRECTORIO_FUENTE}/postinstall-pak" + + cat ${TMP_DIR}/libdirs | while read libdir; do + ( +@@ -1978,15 +1985,15 @@ EOF + echo " echo \"Adding \"/$libdir\" to /etc/ld.so.conf\"" + echo " echo /$libdir >> /etc/ld.so.conf" + echo fi +- ) >> ${DIRECTORIO_FUENTE}/postinstall-pak ++ ) >> "${DIRECTORIO_FUENTE}/postinstall-pak" + done + +- echo ldconfig >> ${DIRECTORIO_FUENTE}/postinstall-pak ++ echo ldconfig >> "${DIRECTORIO_FUENTE}/postinstall-pak" + + # If we had an existing postinstall-pak, append it to the new one + +- if [ -f ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ]; then +- cat ${DIRECTORIO_FUENTE}/postinstall-pak.tmp >> ${DIRECTORIO_FUENTE}/postinstall-pak ++ if [ -f "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" ]; then ++ cat "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" >> "${DIRECTORIO_FUENTE}/postinstall-pak" + fi + + fi # End of did we find any libdirs? +@@ -2022,18 +2029,18 @@ if [ ! -z "$DEPFILES" ] ; then + # Add depmod to the postinst + # This will be redundant if we already have a postinstall script. + # Nevertheless, it is harmless. +- echo "#!/bin/sh" >> ${DIRECTORIO_FUENTE}/postinstall-pak +- echo "#" >> ${DIRECTORIO_FUENTE}/postinstall-pak +- echo "# postinstall script, created by checkinstall-${CHECKINSTALL_VERSION}" >> ${DIRECTORIO_FUENTE}/postinstall-pak +- echo "#" >> ${DIRECTORIO_FUENTE}/postinstall-pak +- echo "depmod $KVER" >> ${DIRECTORIO_FUENTE}/postinstall-pak ++ echo "#!/bin/sh" >> "${DIRECTORIO_FUENTE}/postinstall-pak" ++ echo "#" >> "${DIRECTORIO_FUENTE}/postinstall-pak" ++ echo "# postinstall script, created by checkinstall-${CHECKINSTALL_VERSION}" >> "${DIRECTORIO_FUENTE}/postinstall-pak" ++ echo "#" >> "${DIRECTORIO_FUENTE}/postinstall-pak" ++ echo "depmod $KVER" >> "${DIRECTORIO_FUENTE}/postinstall-pak" + fi + + ################################## + # End of Identify kernel modules # + ############################################################################## + +-cd $DIRECTORIO_FUENTE ++cd "$DIRECTORIO_FUENTE" + + FAILED=0 + +@@ -2360,7 +2367,7 @@ if ! [ -f "$SPEC_PATH" ]; then + # This is obviously a hack, I hope we can do it the right way when rpm is + # fixed. + +-if ( echo $DIRECTORIO_FUENTE | grep " " &> /dev/null ); then ++if ( echo "$DIRECTORIO_FUENTE" | grep " " &> /dev/null ); then + BROOTPATH="${DIRECTORIO_FUENTE}/buildroot" + else + BROOTPATH=$BUILD_DIR +@@ -2534,7 +2541,7 @@ fi # End of the "no rpm in the path" if + d|D) + + # As we said before: +-PKG_BASENAME=$NAME ++PKG_BASENAME="$NAME" + # maybe PKG_BASENAME should be defined locally for all the install + # types, and not only on debian... + +@@ -2779,11 +2786,11 @@ fi + # If PINST_EXISTS=0 and there is a postinstall-pak file, then + # it's the one we created and has to be deleted + if [ $PINST_EXISTS -eq 0 ]; then +- rm -f ${DIRECTORIO_FUENTE}/postinstall-pak ++ rm -f "${DIRECTORIO_FUENTE}/postinstall-pak" + fi + +-if [ -f ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ]; then +- mv ${DIRECTORIO_FUENTE}/postinstall-pak.tmp ${DIRECTORIO_FUENTE}/postinstall-pak ++if [ -f "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" ]; then ++ mv "${DIRECTORIO_FUENTE}/postinstall-pak.tmp" "${DIRECTORIO_FUENTE}/postinstall-pak" + fi + + +-- +2.30.0 + diff --git a/0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch b/0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch new file mode 100644 index 000000000000..e546c2241bcf --- /dev/null +++ b/0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch @@ -0,0 +1,27 @@ +From ec0e2d0c5820c92df182ddf5eb66a7571a1d4164 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Sat, 12 Feb 2011 01:26:34 -0600 +Subject: [PATCH 05/20] Applied patch from Ladislav Hagara for compiling + installwatch with glibc-2.13 + +--- + installwatch/create-localdecls | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/installwatch/create-localdecls b/installwatch/create-localdecls +index f7adf4d..0cb3e27 100755 +--- a/installwatch/create-localdecls ++++ b/installwatch/create-localdecls +@@ -105,6 +105,9 @@ if test "$VERSION" = 'libc.so.6' ; then + 12) + echo '#define GLIBC_MINOR 12' >> $OUTFILE + SUBVERSION='glibc-2.12' ;; ++ 13) ++ echo '#define GLIBC_MINOR 13' >> $OUTFILE ++ SUBVERSION='glibc-2.13' ;; + *) + echo 'Treated as glibc >= 2.1 (finger crossed)' + echo '#define GLIBC_MINOR 1' >> $OUTFILE +-- +2.30.0 + diff --git a/0006-Added-Norwegian-translation-update-from-Andreas-Note.patch b/0006-Added-Norwegian-translation-update-from-Andreas-Note.patch new file mode 100644 index 000000000000..3ac6f61184a7 --- /dev/null +++ b/0006-Added-Norwegian-translation-update-from-Andreas-Note.patch @@ -0,0 +1,1547 @@ +From 39be972d6a336a95de30a55bc7e615bc1d92aefa Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Wed, 9 Mar 2011 11:10:59 -0600 +Subject: [PATCH 06/20] Added Norwegian translation update from Andreas Noteng + +Added sgml source for manual pages: + + * checkinstall-man.sgml + * installwatch-man.sgml +--- + checkinstall-man.sgml | 508 ++++++++++++++++++++++++++++++++++++++ + installwatch-man.sgml | 209 ++++++++++++++++ + locale/checkinstall-no.po | 337 +++++++++++++------------ + 3 files changed, 891 insertions(+), 163 deletions(-) + create mode 100644 checkinstall-man.sgml + create mode 100644 installwatch-man.sgml + +diff --git a/checkinstall-man.sgml b/checkinstall-man.sgml +new file mode 100644 +index 0000000..8f156f4 +--- /dev/null ++++ b/checkinstall-man.sgml +@@ -0,0 +1,508 @@ ++<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++ ++ <!-- Fill in your name for FIRSTNAME and SURNAME. --> ++ <!ENTITY dhfirstname "<firstname>Felipe</firstname>"> ++ <!ENTITY dhsurname "<surname>Sateler</surname>"> ++ <!-- Please adjust the date whenever revising the manpage. --> ++ <!ENTITY dhdate "<date>November 13, 2007</date>"> ++ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are ++ allowed: see man(7), man(1). --> ++ <!ENTITY dhsection "<manvolnum>8</manvolnum>"> ++ <!ENTITY dhemail "<email>fsateler@gmail.com</email>"> ++ <!ENTITY dhusername "Felipe Sateler"> ++ <!ENTITY dhucpackage "<refentrytitle>CheckInstall</refentrytitle>"> ++ <!ENTITY dhpackage "checkinstall"> ++ ++ <!ENTITY debian "<productname>Debian</productname>"> ++ <!ENTITY gnu "<acronym>GNU</acronym>"> ++ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> ++]> ++ ++<refentry> ++ <refentryinfo> ++ <address> ++ &dhemail; ++ </address> ++ <author> ++ &dhfirstname; ++ &dhsurname; ++ </author> ++ <copyright> ++ <year>2006</year> ++ <holder>&dhusername;</holder> ++ </copyright> ++ &dhdate; ++ </refentryinfo> ++ <refmeta> ++ &dhucpackage; ++ ++ &dhsection; ++ </refmeta> ++ <refnamediv> ++ <refname>&dhpackage;</refname> ++ <refpurpose> ++ Track installation of local software, and produce a binary manageable ++ with your package management software. ++ </refpurpose> ++ </refnamediv> ++ <refsynopsisdiv> ++ <cmdsynopsis> ++ <command>&dhpackage;</command> ++ ++ <arg><replaceable>options</replaceable></arg> ++ ++ <arg><replaceable>install command</replaceable></arg> ++ </cmdsynopsis> ++ </refsynopsisdiv> ++ <refsect1> ++ <title>DESCRIPTION</title> ++ ++ <para> ++ <command>&dhpackage;</command> is a program that monitors an installation ++ procedure (such as <command>make install</command>, <command>install.sh ++ </command>), and creates a standard package for your distribution ++ (currently deb, rpm and tgz packages are supported) that you can install ++ through your distribution's package management system (dpkg, rpm or ++ installpkg). ++ </para> ++ <para> ++ Note that for most useful actions, <command>&dhpackage;</command> must ++ be run as root. ++ </para> ++ ++ </refsect1> ++ <refsect1> ++ <title>OPTIONS</title> ++ ++ <para>These programs follow the usual &gnu; command line syntax, ++ with long options starting with two dashes ('-'). A summary of ++ options is included below.</para> ++ <para>All the options that toggle a switch default to activate the option. ++ To force activation or deactivation, call them with '=yes' or '=no'. As ++ an example, to disable stripping use --strip=no.</para> ++ ++ <variablelist> ++ <varlistentry> ++ <term><option>-h</option> ++ <option>--help</option> ++ </term> ++ <listitem> ++ <para>Show summary of options.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--version</option> ++ </term> ++ <listitem> ++ <para>Show version information.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--copyright</option> ++ </term> ++ <listitem><para>Show Copyright information</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--type</option> ++ </term> ++ <listitem> ++ <para>Choose packaging system. Can be one of 'slackware', 'debian' ++ or 'rpm'.</para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term><option>-D</option> ++ </term> ++ <listitem><para>Create a Debian package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-R</option> ++ </term> ++ <listitem><para>Create a RPM package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-S</option> ++ </term> ++ <listitem><para>Create a Slackware Package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--install</option> ++ </term> ++ <listitem><para>Toggle installation of the created package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--fstrans</option> ++ </term> ++ <listitem> ++ <para>Enable/disable filesystem translation. Filesystem translation ++ enabled causes the install to proceed in a temporary directory, thus ++ not actually touching your system.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-y</option> ++ <option>--default</option> ++ </term> ++ <listitem><para>Accept default answers to all questions.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkgname</option> ++ </term> ++ <listitem><para>Set the package name.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkgversion</option> ++ </term> ++ <listitem><para>Set package version.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-A</option> ++ <option>--arch</option> ++ <option>--pkgarch</option> ++ </term> ++ <listitem><para>Set package architecture.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkgrelease</option> ++ </term> ++ <listitem><para>Set the package release.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkglicense</option> ++ </term> ++ <listitem><para>Set package license.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkggroup</option> ++ </term> ++ <listitem><para>Set the package group.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkgsource</option> ++ </term> ++ <listitem><para>Set source location</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pkgaltsource</option> ++ </term> ++ <listitem><para>Set alternate source location</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--pakdir</option> ++ </term> ++ <listitem><para>Where to save the new package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--maintainer</option> ++ </term> ++ <listitem> ++ <para>Set the package maintainer. Be careful to correctly ++ quote/escape the name, to prevent shell expansion</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--provides</option> ++ </term> ++ <listitem><para>Features provided by this package (currently only on RPM and Deb).</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--requires</option> ++ </term> ++ <listitem><para>Dependencies required by this package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--rpmflags</option> ++ </term> ++ <listitem><para>Pass this flags to the rpm installer.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--rpmi</option> ++ </term> ++ <listitem><para>Use the -i flag when installing a rpm.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--rpmu</option> ++ </term> ++ <listitem><para>Use the -U flag when installing a rpm.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--dpkgflags</option> ++ </term> ++ <listitem><para>Pass this flags to the dpkg installer</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--spec</option> ++ </term> ++ <listitem><para>Where the .spec file is located</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--nodoc</option> ++ </term> ++ <listitem><para>Do not include documentation files.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-d</option> ++ </term> ++ <listitem><para>Set debug level. Must be one of 0, 1 and 2.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-si</option> ++ </term> ++ <listitem><para>Run an interactive install command</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--showinstall</option> ++ </term> ++ <listitem><para>Toggle interactive install command.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-ss</option> ++ </term> ++ <listitem><para>Run an interactive Slackware installation script.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--showslack</option> ++ </term> ++ <listitem><para>Toggle interactive Slackware installation script.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--autodoinst</option> ++ </term> ++ <listitem><para>Toggle creation of a doinst.sh script.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--strip</option> ++ </term> ++ <listitem><para>Toggle stripping any ELF binaries found inside the package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--stripso</option> ++ </term> ++ <listitem><para>Toggle stripping any ELF libraries (.so) found inside the package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--addso</option> ++ </term> ++ <listitem><para>Search for any shared libs and add them to /etc/ld.so.conf</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--reset-uids</option> ++ </term> ++ <listitem><para>Reset perms for all files/dirs to 755 and the owner/group for all dirs to root.root</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--gzman</option> ++ </term> ++ <listitem><para>Compress any man pages found inside the package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--docdir</option> ++ </term> ++ <listitem><para>Where to put documentation files.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--umask</option> ++ </term> ++ <listitem><para>Set the umask value.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--exclude</option> ++ </term> ++ <listitem><para>Exclude these files/directories from the package.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--include</option> ++ </term> ++ <listitem><para>Force the inclusion in the package of the files/dirs listed in the argument (a file).</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--inspect</option> ++ </term> ++ <listitem><para>Inspect the package's file list</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--review-spec</option> ++ </term> ++ <listitem><para>Review the spec file before creating a .rpm.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--review-control</option> ++ </term> ++ <listitem><para>Review the control file before creating a .deb.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--newslack</option> ++ </term> ++ <listitem><para>Use the new (8.1+) Slackware description format ("--newslack" implies "-S")</para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term><option>--with-tar</option> ++ </term> ++ <listitem><para>Manually set the path to the tar binary.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--deldoc</option> ++ </term> ++ <listitem><para>Toggle deletion of doc-pak upon termination.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--deldesc</option> ++ </term> ++ <listitem><para>Toggle deletion of description-pak upon termination.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--delspec</option> ++ </term> ++ <listitem><para>Toggle deletion of spec file upon termination.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--bk</option> ++ </term> ++ <listitem><para>Backup any overwritten files</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>--backup</option> ++ </term> ++ <listitem><para>Toggle backup</para> ++ </listitem> ++ </varlistentry> ++ ++ </variablelist> ++ </refsect1> ++ <refsect1> ++ <title>FILES</title> ++ <para>This program reads its configuration from /etc/checkinstallrc, which can be used to override defaults. ++ Command line arguments override settings in the configuration file. ++ </para> ++ </refsect1> ++ <refsect1> ++ <title>AUTHOR</title> ++ ++ <para>This manual page was written by &dhusername; <&dhemail> for ++ the &debian; system (but may be used by others). Permission is ++ granted to copy, distribute and/or modify this document under ++ the terms of the &gnu; General Public License, Version 2. ++ </para> ++ <para> ++ On Debian systems, the complete text of the GNU General Public ++ License can be found in /usr/share/common-licenses/GPL. ++ </para> ++ ++ </refsect1> ++</refentry> ++ ++<!-- Keep this comment at the end of the file ++Local variables: ++mode: sgml ++sgml-omittag:t ++sgml-shorttag:t ++sgml-minimize-attributes:nil ++sgml-always-quote-attributes:t ++sgml-indent-step:2 ++sgml-indent-data:t ++sgml-parent-document:nil ++sgml-default-dtd-file:nil ++sgml-exposed-tags:nil ++sgml-local-catalogs:nil ++sgml-local-ecat-files:nil ++End: ++--> ++ ++ +diff --git a/installwatch-man.sgml b/installwatch-man.sgml +new file mode 100644 +index 0000000..48fabc8 +--- /dev/null ++++ b/installwatch-man.sgml +@@ -0,0 +1,209 @@ ++<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++ ++ <!-- Fill in your name for FIRSTNAME and SURNAME. --> ++ <!ENTITY dhfirstname "<firstname>Felipe</firstname>"> ++ <!ENTITY dhsurname "<surname>Sateler</surname>"> ++ <!-- Please adjust the date whenever revising the manpage. --> ++ <!ENTITY dhdate "<date>June 21, 2006</date>"> ++ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are ++ allowed: see man(7), man(1). --> ++ <!ENTITY dhsection "<manvolnum>1</manvolnum>"> ++ <!ENTITY dhemail "<email>fsateler@gmail.com</email>"> ++ <!ENTITY dhusername "Felipe Sateler"> ++ <!ENTITY dhucpackage "<refentrytitle>installwatch</refentrytitle>"> ++ <!ENTITY dhpackage "installwatch"> ++ ++ <!ENTITY debian "<productname>Debian</productname>"> ++ <!ENTITY gnu "<acronym>GNU</acronym>"> ++ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> ++]> ++ ++<refentry> ++ <refentryinfo> ++ <address> ++ &dhemail; ++ </address> ++ <author> ++ &dhfirstname; ++ &dhsurname; ++ </author> ++ <copyright> ++ <year>2006</year> ++ <holder>&dhusername;</holder> ++ </copyright> ++ &dhdate; ++ </refentryinfo> ++ <refmeta> ++ &dhucpackage; ++ ++ &dhsection; ++ </refmeta> ++ <refnamediv> ++ <refname>&dhpackage;</refname> ++ ++ <refpurpose>Track installation of software</refpurpose> ++ </refnamediv> ++ <refsynopsisdiv> ++ <cmdsynopsis> ++ <command>&dhpackage;</command> ++ ++ <arg><replaceable>options</replaceable></arg> ++ ++ <arg>command</arg> ++ </cmdsynopsis> ++ </refsynopsisdiv> ++ <refsect1> ++ <title>DESCRIPTION</title> ++ ++ <para> ++ <command>&dhpackage;</command> is a program that is used in order ++ to track the changes made while installing local software (i.e. ++ "make install"). It monitors the requested command, and produces ++ a log which indicates all created and modified files. By default ++ it outputs to <application>syslog(3)</application> using a priority ++ of "LOG_USER | LOG_INFO". This may be overridden by the use of the ++ <option>-o</option> flag. The log format is as follows: ++ </para> ++ <para> ++ <computeroutput><return-value> <syscall-name> <argument> #<comment></computeroutput> ++ </para> ++ <para> ++ Each field is delimited by a "⁁I" character if logging to ++ <application>syslog(3)</application>, or by a tab when logging to a file. ++ </para> ++ </refsect1> ++ <refsect1> ++ <title>ENVIRONMENT</title> ++ ++ <variablelist> ++ <varlistentry> ++ <term>INSTALLWATCH_BACKUP_PATH</term> ++ <listitem> ++ <para>Set this variable to the location that you want ++ installwatch to copy the original version of files which ++ get modified. The directory will be created if it does ++ not exist, assuming that the parent is writable.</para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ <refsect1> ++ <title>OPTIONS</title> ++ ++ <para>These program follow the usual &gnu; command line syntax, ++ with long options starting with two dashes (`-'). A summary of ++ options is included below.</para> ++ ++ <variablelist> ++ <varlistentry> ++ <term> ++ <option>-o</option> ++ <option>--logfile</option> ++ </term> ++ <listitem> ++ <para>Directs that output from the logged command be written to ++ the filename specified. If the specified file already exists, ++ it will be truncated.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-r</option> ++ <option>--root</option> ++ </term> ++ <listitem> ++ <para>Sets the directory under which meta-info and translated ++ files will be stored.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-t</option> ++ <option>--trans</option> ++ </term> ++ <listitem> ++ <para>Toggle translation capabilities.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-e</option> ++ <option>--exclude</option> ++ </term> ++ <listitem> ++ <para>Sets a comma separated neutral directory list, that won't ++ be concerned by translation or backups.</para> ++ </listitem> ++ </varlistentry> ++ ++ <varlistentry> ++ <term><option>-d</option> ++ <option>--dbgfile</option> ++ </term> ++ <listitem> ++ <para>Specify a debug file.</para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term><option>-v</option> ++ <option>--dbglvl</option></term> ++ <listitem> ++ <para>Sets the debug level to be used.</para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term><option>-h</option> ++ <option>--help</option></term> ++ <listitem> ++ <para>Show help information.</para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ <refsect1> ++ <title>BUGS</title> ++ ++ <para> ++ &dhpackage; does not work with programs which are statically linked with ++ libc. Due to LD_PRELOAD limitations, it does not work with suid programs ++ (this would probably introduce security problems, anyway). ++ </para> ++ <para> ++ <application>mknod(2)</application> is not monitored. ++ </para> ++ </refsect1> ++ <refsect1> ++ <title>AUTHOR</title> ++ ++ <para>This manual page was written by &dhusername; <&dhemail;> for ++ the &debian; system (but may be used by others). Original text ++ by Greg Norris <adric@debian.org>. Permission is ++ granted to copy, distribute and/or modify this document under ++ the terms of the &gnu; General Public License, Version 2. ++ </para> ++ <para> ++ On Debian systems, the complete text of the GNU General Public ++ License can be found in /usr/share/common-licenses/GPL. ++ </para> ++ ++ </refsect1> ++</refentry> ++ ++<!-- Keep this comment at the end of the file ++Local variables: ++mode: sgml ++sgml-omittag:t ++sgml-shorttag:t ++sgml-minimize-attributes:nil ++sgml-always-quote-attributes:t ++sgml-indent-step:2 ++sgml-indent-data:t ++sgml-parent-document:nil ++sgml-default-dtd-file:nil ++sgml-exposed-tags:nil ++sgml-local-catalogs:nil ++sgml-local-ecat-files:nil ++End: ++--> ++ ++ +diff --git a/locale/checkinstall-no.po b/locale/checkinstall-no.po +index af704a6..9c38df8 100644 +--- a/locale/checkinstall-no.po ++++ b/locale/checkinstall-no.po +@@ -1,155 +1,163 @@ + # MESSAGES FOR CHECKINSTALL-1.6.0beta1 in Norwegian + # Copyright (C) 2002 Felipe Eduardo Sanchez Diaz Duran +-# Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx>, 2002. + # + # + # Replace the above and following info with the appropriate data for + # your name, date and language. ++# Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx>, 2002, 2011. ++# Andreas Noteng <andreas@noteng.no>, 2011. + # +-# +-#, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: 1.6.0beta1\n" + "POT-Creation-Date: 2002-11-27 00:58-0600\n" +-"PO-Revision-Date: 2002-11-27 00:58-0600\n" +-"Last-Translator: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx>\n" +-"Language-Team: ES <izto@asic-linux.com.mx>\n" ++"PO-Revision-Date: 2011-03-09 17:25+0100\n" ++"Last-Translator: Andreas Noteng <andreas@noteng.no>\n" ++"Language-Team: NO <izto@asic-linux.com.mx>\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=ISO-8859-1\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + + msgid " This software is released under the GNU GPL." + msgstr " Denne programvaren er lisensiert under GNU GPL." + + msgid "Usage: checkinstall [options] [command [command arguments]]" +-msgstr "Bruk: checkinstall [options] [command [command arguments]]" ++msgstr "Bruk: checkinstall [valg] [kommando [kommandoargument]]" + + msgid "Options:" + msgstr "Valg:" + + msgid "*Package type selection*" +-msgstr "*Velg pakke*" ++msgstr "*Velg pakketype*" + + msgid "-t,--type=<slackware|rpm|debian> Choose packaging system" + msgstr "-t,--type=<slackware|rpm|debian> Velg pakkesystem" + + msgid "-S Build a Slackware package" +-msgstr "-S Bygg en Slackware pakke" ++msgstr "-S Bygg en Slackware-pakke" + + msgid "-R Build a RPM package" +-msgstr "-R Bygg en RPM pakke" ++msgstr "-R Bygg en RPM-pakke" + + msgid "-D Build a Debian package" +-msgstr "-D Bygg en Debian pakke" ++msgstr "-D Bygg en Debian-pakke" + + msgid "*Install options*" +-msgstr "*Installasjons valg" ++msgstr "*Installasjonsvalg" + + msgid "--install=<yes|no> Toggle created package installation" +-msgstr "--install=<yes|no> Bytt ferdig pakkeinstallasjon" ++msgstr "--install=<yes|no> Installer den ferdige pakken" + + msgid "*Scripting options*" +-msgstr "*Scripting valg*" ++msgstr "*Skriptvalg*" + + msgid "-y, --default Accept default answers to all questions" +-msgstr "-y, --default Godta forvalgt svar på alle" ++msgstr "-y, --default Godta standardsvarene pÃ¥ alle spørsmÃ¥l" + + msgid "--pkgname=<name> Set name" +-msgstr "--pkgname=<name> Sett navn" +- ++msgstr "--pkgname=<navn> Sett pakkenavn" ++ + msgid "--pkgversion=<version> Set version" +-msgstr "--pkgversion=<version> Sett versjon" ++msgstr "--pkgversion=<versjon> Sett versjon" + + msgid "-A, --arch, --pkgarch=<arch> Set architecture" + msgstr "-A, --arch, --pkgarch=<arch> Sett arkitektur" + + msgid "--pkgrelease=<release> Set release" +-msgstr "--pkgrelease=<release> Sett versjon" ++msgstr "--pkgrelease=<release> Sett utgave" + + msgid "--pkglicense=<license> Set license" +-msgstr "--pkglicense=<license> Sett lisens" ++msgstr "--pkglicense=<lisens> Sett lisens" + + msgid "--pkggroup=<group> Set software group" +-msgstr "--pkggroup=<group> Sett pakkegruppe" ++msgstr "--pkggroup=<gruppe> Sett pakkegruppe" + + msgid "--pkgsource=<source> Set source location" +-msgstr "--pkgsource=<source> Sett kildeplassering" ++msgstr "--pkgsource=<kilde> Sett kildeplassering" + + msgid "--pkgaltsource=<altsource> Set alternate source location" + msgstr "--pkgaltsource=<altsource> Sett alternativ kildeplassering" + + msgid "--pakdir=<directory> The new package will be saved here" +-msgstr "--pakdir=<directory> Den nye pakken vil bli lagret her" ++msgstr "--pakdir=<mappe> Den nye pakken vil bli lagret her" + + msgid "--maintainer=<email addr> The package maintainer (.deb)" +-msgstr "--maintainer=<email addr> Pakke byggeren (.deb)" ++msgstr "--maintainer=<email addr> Vedlikeholder av pakken (.deb)" + + msgid "--provides=<list> Features provided by this package (.rpm)" +-msgstr "" ++msgstr "--provides=<list> Denne pakkens funksjoner (.rpm)" + + msgid "--requires=<list> Features required by this package (.rpm)" + msgstr "" ++"--requires=<list> Funksjoner denne pakken er avhengig av (.rpm)" + + msgid "--rpmflags=<flags> Pass this flags to the rpm installer" + msgstr "" ++"--rpmflags=<flags> Send disse flaggene til rpm-installereren" + + msgid "--dpkgflags=<flags> Pass this flags to the dpkg installer" + msgstr "" ++"--dpkgflags=<flags> Send disse flaggene til dpkg-installereren" + + msgid "--spec=<path> .spec file location" +-msgstr "" ++msgstr "--spec=<path> bane til .spec-filen" + + msgid "--nodoc Do not include documentation files" +-msgstr "" ++msgstr "--nodoc Ikke inkluder dokumentasjon" + + msgid "*Info display options*" +-msgstr "" ++msgstr "*Visningsvalg for info*" + + msgid "-d<0|1|2> Set debug level" +-msgstr "" ++msgstr "-d<0|1|2> Sett feilsøkingsprogram" + + msgid "-si Run an interactive install command" + msgstr "" ++"-si Kjør en interaktiv installasjonskommando" + + msgid "--showinstall=<yes|no> Toggle interactive install command" + msgstr "" ++"--showinstall=<yes|no> SlÃ¥ av eller pÃ¥ interaktive " ++"installasjonskommandoer" + + msgid "" + "-ss Run an interactive Slackware installation " + "script" + msgstr "" ++"-ss Kjør et interaktivt installasjonsskript for " ++"Slackware" + + msgid "" + "--showslack=<yes|no> Toggle interactive Slackware installation " + "script" + msgstr "" ++"--showslack=<yes|no> SlÃ¥ av/pÃ¥ interaktive installasjonsskript for " ++"Slackware" + + msgid "*Package tuning options*" +-msgstr "*Tuning av pakker*" ++msgstr "*Justering av pakker*" + + msgid "" + "--autodoinst=<yes|no> Toggle the creation of a doinst.sh script" +-msgstr "" +-"--autodoinst=<yes|no> Valg av bygging av et doinst.sh script" ++msgstr "--autodoinst=<yes|no> Opprette et doinst.sh skript?" + + msgid "" + "--strip=<yes|no> Strip any ELF binaries found inside the " + "package" + msgstr "" +-"--strip=<yes|no> Avkle alle ELF Binærer funnet inni " +-"pakke" ++"--strip=<yes|no> Stripp ELF binærfiler for " ++"feilsøkingsinformasjon" + + msgid "" + "--stripso=<yes|no> Strip any ELF binary libraries (.so files)" + msgstr "" +-"--stripso=<yes|no> Avkle alle ELF binære biblioteker (.so filer)" ++"--stripso=<yes|no> Stripp ELF bibliotek for " ++"feilsøkingsinformasjon (.so filer)" + + msgid "" + "--gzman=<yes|no> Compress any man pages found inside the " + "package" +-msgstr "--gzman=<yes|no> Kompress alle manualsider funnet inni " +-"pakke" ++msgstr "--gzman=<yes|no> Komprimer alle manualsider i pakken" + + msgid "--docdir=<path> Where to put documentation files" + msgstr "--docdir=<path> Plassering av dokumentasjonsfiler" +@@ -161,64 +169,65 @@ msgid "" + "--exclude=<file|dir[,...]> Exclude these files/directories from the " + "package" + msgstr "" +-"--exclude=<file|dir[,...]> Eksluder disse filene/mappene fra " +-"pakke" ++"--exclude=<file|dir[,...]> Eksluder disse filene/mappene fra pakken" + +-msgid "--include=<listfile> Force the inclusion in the package of the" +-msgstr "--include=<listfile> Tving inkludering i pakken av" ++msgid "" ++"--include=<listfile> Force the inclusion in the package of the" ++msgstr "--include=<listfile> Inkluder fil i pakken" + + msgid "--inspect Inspect the package's file list" +-msgstr "--inspect Inspiser pakkens filliste" ++msgstr "--inspect Inspiser fillisten" + + msgid "" + "--review-spec Review the spec file before creating a .rpm" + msgstr "" +-"--review-spec Forhåndsvis spec-filen før bygging av .rpm" ++"--review-spec Se over .spec-filen før .rpm-pakken lages" + + msgid "" + "--review-control Review the control file before creating a .deb" + msgstr "" +-"--review-control Forhåndsvis kontrollfilen før bygging av .deb" ++"--review-control Se over control-fila før .deb-pakken lages" + + msgid "" + "--newslack Use the new (8.1+) Slackware description " + "format" + msgstr "" +-"--newslack Bruk den nye (8.1+) Slackware fortegnelsen " +-"format" +- ++"--newslack Bruk det nye pakkeformatet (8.1+) til " ++"Slackware" ++ + msgid " (\"--newslack\" implies \"-S\")" +-msgstr "" ++msgstr " (\"--newslack\" innebærer \"-S\")" + + msgid "*Cleanup options*" +-msgstr "*Resnings valg*" ++msgstr "*Rengjøringsvalg*" + + msgid "--deldoc=<yes|no> Delete doc-pak upon termination" +-msgstr "--deldoc=<yes|no> Slett doc-pak ved avslutt" ++msgstr "--deldoc=<yes|no> Slett doc-pak ved avsluttning" + + msgid "--deldesc=<yes|no> Delete description-pak upon termination" +-msgstr "--deldesc=<yes|no> Slett fortegnelse-pak ved avslutt" ++msgstr "--deldesc=<yes|no> Slett description-pak ved avsluttning" + + msgid "--delspec=<yes|no> Delete spec file upon termination" +-msgstr "--delspec=<yes|no> Slett spec-fil ved avslutt" ++msgstr "--delspec=<yes|no> Slett spec-fil ved avsluttning" + + msgid "--bk Backup any overwritten files" +-msgstr "--bk Backup og overskrevne filer" ++msgstr "" ++"--bk Utfør sikkerhetskopi av overskrevne filer" + + msgid "--backup=<yes|no> Toggle backup" +-msgstr "--backup=<yes|no> Slå av/på backup" ++msgstr "--backup=<yes|no> SlÃ¥ sikkerhetskopi av/pÃ¥" + + msgid "*About CheckInstall*" + msgstr "*Om CheckInstall*" + + msgid "--help, -h Show this message" +-msgstr "--help, -h Vis denne beskjeden" ++msgstr "--help, -h Vis denne meldingen" + + msgid "--copyright Show Copyright information" +-msgstr "--copyright Vis Copyright info" ++msgstr "--copyright Vis opphavsrettsinformasjon" + + msgid "--version Show version information" +-msgstr "--version Vis versjons info" ++msgstr "--version Vis versjonsinformasjon" + + msgid "Use --help or -h to get more information" + msgstr "Bruk --help eller -h for mer informasjon" +@@ -227,76 +236,76 @@ msgid "is an invalid value for" + msgstr "er en ugyldig verdi for" + + msgid "Restoring overwritten files from backup..." +-msgstr "Reparerer overskrene filer fra backup..." ++msgstr "Reparerer overskrevne filer fra sikkerhetskopi..." + + msgid "*** SIGINT received ***" + msgstr "*** SIGINT motatt ***" + + msgid "Cleaning up..." +-msgstr "Rensker opp..." ++msgstr "Rydder..." + + msgid "Bye." + msgstr "Ha det." + + msgid "The checkinstallrc file was not found at:" +-msgstr "checkinstallrc fila ble ikke finnet i:" ++msgstr "checkinstallrc ble ikke funnet i:" + + msgid "Assuming default values." +-msgstr "Antar standard verdier." ++msgstr "Antar standardverdier." + + msgid "I can't find $INSTALLWATCH." + msgstr "Jeg kan ikke finne $INSTALLWATCH." + + msgid "I can't continue. Either install installwatch or" +-msgstr "Jeg kan ikke fortsette. Enten installer installwatch eller" ++msgstr "Jeg kan ikke fortsette. Installer installwatch eller" + + msgid "modify the INSTALLWATCH variable in this script," +-msgstr "modifiser INSTALLWATCH'ens variabel i dette scriptet," ++msgstr "modifiser INSTALLWATCH-variabelen i dette skriptet," + + msgid "then run checkinstall again." +-msgstr "og kjør checkinstall igjen." ++msgstr "og kjør checkinstall pÃ¥ nytt." + + msgid "My temp dir exists already." +-msgstr "Min midlertidige mappe eksisterer allerede." ++msgstr "Midlertidig-mappen eksisterer allerede." + + msgid "This looks like a symlink attack!" +-msgstr "Dette ser ut som et symlink angrep!" ++msgstr "Dette ser ut som et symlenkeangrep!" + + msgid "*** Aborting" + msgstr "*** Avbryter" + + msgid "is an unacceptable value for the temp dir. Please" +-msgstr "er en uakseptabel verdi for den midlertidige mappa. Vennligst" ++msgstr "er en uakseptabel verdi for midlertidigmappe. Vennligst" + + msgid "edit the variable definition for" + msgstr "forandre definisjonen av variabelen for" + + msgid "and try again." +-msgstr "og prøv igjen." ++msgstr "og prøv pÃ¥ nytt" + + msgid "**** Failed to create temp dir!" +-msgstr "*** Kunne ikke opprette midlertidig mappe!" ++msgstr "*** Kunne ikke opprette midlertidigmappe!" + + msgid "**** Do you have write permission for ${BASE_TMP_DIR}?" +-msgstr "*** Har du skriverettigheter for ${BASE_TMP_DIR}?" ++msgstr "*** Har du skriverettigheter til ${BASE_TMP_DIR}?" + + msgid "The package documentation directory ./doc-pak does not exist." +-msgstr "Pakke-dokumentasjons-mappa ./doc-pak eksisterer ikke." ++msgstr "Mappen ./doc-pak eksisterer ikke." + + msgid "Should I create a default set of package docs? " +-msgstr "Skal jeg bygge et standard sett av pakke-dokumentasjon? " ++msgstr "Skal jeg bygge et standardsett som pakkedokumentasjon? " + + msgid "Preparing package documentation..." +-msgstr "Forbereder pakke dokumentasjon..." ++msgstr "Forbereder pakkedokumentasjon..." + + msgid "*** No known documentation files were found. The new package" +-msgstr "*** Ingen kjente dokumentasjons-filer ble funnet. Pakken" ++msgstr "*** Ingen kjente dokumentasjonsfiler ble funnet. Pakken" + + msgid "*** won't include a documentation directory." +-msgstr "*** vil ikke inkludere en dokumentasjons mappe." ++msgstr "*** vil ikke inkludere en dokumentasjonsmappe." + + msgid "Copying documentation directory..." +-msgstr "Kopierer dokumetasjons mappe..." ++msgstr "Kopierer dokumentasjonsmappe..." + + msgid "Installing with" + msgstr "Installerer med" +@@ -304,7 +313,7 @@ msgstr "Installerer med" + msgid "" + "========================= Installation results ===========================" + msgstr "" +-"========================= Installasjons resultater ===========================" ++"========================= Installasjonsresultater ===========================" + + msgid "" + "======================== Installation successful ==========================" +@@ -312,85 +321,87 @@ msgstr "" + "======================== Installasjon velykket ==========================" + + msgid "**** Installation failed. Aborting package creation." +-msgstr "*** Installasjonen feilet. Abryter pakkebygging." ++msgstr "*** Installasjonen feilet. Avbryter pakkebygging." + + msgid "Do you want to view the installation log file? " +-msgstr "Vil du se loggfila til installasjonen? " ++msgstr "Vil du se loggfilen? " + + msgid "Some of the files created by the installation are inside the build" +-msgstr "Noen av filene som ble lagd av installajsonen er inni" ++msgstr "Noen av filene som ble lagd av installasjonen er i" + + msgid "directory: `pwd`" +-msgstr "byggemappa: `pwd`" ++msgstr "mappen: `pwd`" + + msgid "You probably don't want them to be included in the package," +-msgstr "Du vil sannsynligvis ikke ha den inkludert i pakken," ++msgstr "Du vil antagelig ikke inkludere dem i pakken," + + msgid "especially if they are inside your home directory." +-msgstr "spessielt ikke om de er inni hjemme-mappa di." ++msgstr "spesielt ikke om de er i hjemmemappa di." + + msgid "Do you want me to list them? " +-msgstr "Vil du at jeg skal liste dem? " ++msgstr "Vil du ha dem listet opp? " + + msgid "Should I exclude them from the package? (Saying yes is a good idea) " +-msgstr "Skal jeg eksludere dem fra pakken? (ja er en god ide) " ++msgstr "Vil du ha dem ekskludert fra pakken? (ja er vanligvis en god ide) " + + msgid "You requested to review the list of files that will be" +-msgstr "Du ville forhåndsvise listen av filer som vil bli" ++msgstr "Du ba om Ã¥ fÃ¥ se over listen over filer som blir" + + msgid "included in this package." +-msgstr "inkludert i denne pakken." ++msgstr "inkludert i pakken." + + msgid "Now you'll have the chance to review and optionally modify it." +-msgstr "Du vil nå ha sjansen til å forhåndsvise og evt. modifisere den." ++msgstr "NÃ¥ har du sjansen til Ã¥ se over og eventuelt modifisere innholdet." + + msgid "Now you'll have the chance to review and optionally modify this file." +-msgstr "Du vil nå ha sjansen til å forhåndsvise og evt. modifisere denne fila." ++msgstr "NÃ¥ har du sjansen til Ã¥ se over og eventuelt modifisere innholdet." + + msgid "Press ENTER to continue." +-msgstr "Trykk ENTER for å fortsette." ++msgstr "Trykk ENTER for Ã¥ fortsette" + + msgid "Copying files to the temporary directory..." +-msgstr "Kopierer filer til midlertidig mappe..." ++msgstr "Kopierer filer til midlertidigmappen..." + + msgid "Striping ELF binaries and libraries..." +-msgstr "Avkler ELF binærer og biblioteker..." ++msgstr "Stripper ELF binærfiler og bibliotek" + + msgid "Striping ELF binaries..." +-msgstr "Avkler ELF binærer..." ++msgstr "Stripper ELF binærfiler." + + msgid "Compressing man pages..." +-msgstr "Kompresser manualsider..." ++msgstr "Komprimerer manualsider..." + + msgid "Building file list..." +-msgstr "Bygger fil-liste..." ++msgstr "Bygger filliste..." + + msgid "Please choose the packaging method you want to use." +-msgstr "Vennligst velg den pakkemetoden du vil bruke." ++msgstr "Velg ønsket pakkemetode." + + msgid "Slackware [S], RPM [R] or Debian [D]? " + msgstr "Slackware [S], RPM [R] eller Debian [D]? " + + msgid "Please write a description for the package." +-msgstr "Vennligst skriv en fortegnelse for pakken." ++msgstr "Gi en beskrivelse av pakken." + + msgid " Remember that pkgtool shows" + msgstr " Husk at pkgtool viser" + + msgid "only the first one when listing packages so make that one descriptive." +-msgstr "kun den første når man lister pakker så lag den innholdsrik." ++msgstr "" ++"kun den førsten linja, nÃ¥r den lister opp pakker, sÃ¥ sørg for at den " ++"beskriver innholdet godt." + + msgid "End your description with an empty line or EOF." +-msgstr "Avslutt din fortegnelse med en tom linje eller EOF." ++msgstr "Avslutt beskrivelsen din med en tom linje eller EOF." + + msgid "Package created with checkinstall $CHECKINSTALL_VERSION" + msgstr "Pakke bygd med checkinstall $CHECKINSTALL_VERSION" + + msgid "Warning: Your package description is bigger than 11 lines." +-msgstr "Advarsel: Din pakkefortegnelse er større enn 11 linjer." ++msgstr "Adversel: Beskrivelsen av pakken er lengre en 11 linjer." + + msgid "Warning: The Slackware 8.1+ pkgtools might not like it." +-msgstr "Advarsel: Slackware 8.1+'s pkgtools liker kanskje ikke det." ++msgstr "Advarsel: Slackware pkgtools 8.1+ liker ikke dette." + + msgid "*** Warning: The package name" + msgstr "*** Advarsel: Pakkens navn" +@@ -399,22 +410,22 @@ msgid "contains upper case" + msgstr "inneholder store bokstaver" + + msgid "*** Warning: letters. dpkg might not like that so I changed" +-msgstr "*** Advarsel: bokstaver. dpkg liker kanskje ikke det så jeg byttet" ++msgstr "*** dpkg liker ikke dette, sÃ¥ det er endret til" + + msgid "*** Warning: them to lower case." +-msgstr "*** Advarsel: de til små bokstaver." ++msgstr "*** Advarsel: smÃ¥ bokstaver" + + msgid "*** Warning: The package version \"${VERSION}\" does not" +-msgstr "*** Advarsel: Pakkeversjon \"${VERSION}\" gjør ikke det" ++msgstr "*** Advarsel: Pakkeversjonen \"${VERSION}\" inneholder ikke" + + msgid "*** Warning: contain any digits. dpkg might not like that." +-msgstr "*** Advarsel: inneholder siffer. dpkg liker kanskje ikke det." ++msgstr "*** Advarsel: siffer. dpkg liker ikke dette." + + msgid "This package will be built according to these values: " +-msgstr "Denne pakken vil bli bygget i henholdt til disse verdier: " ++msgstr "Pakken blir bygd etter følgende betingelser: " + + msgid "0 - Maintainer:" +-msgstr "0 - Byggherre:" ++msgstr "0 - Vedlikeholder:" + + msgid "1 - Summary:" + msgstr "1 - Oppsummering:" +@@ -432,7 +443,7 @@ msgid "6 - Group:" + msgstr "6 - Gruppe:" + + msgid "7 - Architecture:" +-msgstr "7 - Akritektur:" ++msgstr "7 - Arkitektur:" + + msgid "8 - Source location:" + msgstr "8 - Kildeplassering:" +@@ -441,79 +452,79 @@ msgid "9 - Alternate source location:" + msgstr "9 - Alternativ kildeplassering:" + + msgid "10 - Provides:" +-msgstr "10 - Krever:" ++msgstr "10 - Tilbyr:" + + msgid "11 - Requires:" + msgstr "11 - Krever:" + + msgid "Enter a number to change any of them or press ENTER to continue: " +-msgstr "Legg til et tall for å bytte noe eller trykk ENTER for å fortsette: " ++msgstr "Angi et tall for Ã¥ endre noe, eller trykk ENTER for Ã¥ fortsette:" + + msgid "Enter new summary: " +-msgstr "Legg til ny oppsummering: " ++msgstr "Ny oppsummering: " + + msgid "Enter new name: " +-msgstr "Legg til nytt navn: " ++msgstr "Nytt navn: " + + msgid "Enter new version: " +-msgstr "Legg til ny versjon: " ++msgstr "Ny versjon: " + + msgid "Enter new release number: " +-msgstr "Legg til nytt utgivelses nummer: " ++msgstr "Ny utgave: " + + msgid "Enter the license type: " +-msgstr "Legg til lisenstype: " ++msgstr "Angi lisenstype: " + + msgid "Enter the new software group: " +-msgstr "Legg til ny programvaregruppe: " ++msgstr "Angi ny programvaregruppe: " + + msgid "Enter the architecture type: " +-msgstr "Legg til arkitektur type: " ++msgstr "Angi arkitektur: " + + msgid "Enter the source location: " +-msgstr "Legg til kilde plassering: " ++msgstr "Angi kildeplassering: " + + msgid "Enter the alternate source location: " +-msgstr "Legg til alternativ kilde plassering: " ++msgstr "Angi alternativ kildeplassering: " + + msgid "Enter the maintaner's name and e-mail address: " +-msgstr "Legg til byggherrens navn og epostadresse: " ++msgstr "Angi vedlikeholderens navn og e-postadresse: " + + msgid "Enter the provided features: " +-msgstr "Legg til gitte features: " ++msgstr "Funksjoner pakken tilbyr: " + + msgid "Enter the additional requirements: " +-msgstr "Legg til extra valg:" ++msgstr "Angi pakker denne pakken krever:" + + msgid "********************************************" + msgstr "*******************************************" + + msgid "**** Slackware package creation selected ***" +-msgstr "*** Slackware pakkebygging valgt ***" ++msgstr "*** Slackwarepakke valgt ***" + + msgid "*** The \"installpkg\" program is not in your PATH!" +-msgstr "*** \"installpkg\" programmet er ikke i PATH'en din!" ++msgstr "*** \"installpkg\" er ikke i $PATH!" + + msgid "*** Slackware package creation aborted" +-msgstr "*** Slackware pakkebygging abrutt" ++msgstr "*** Slackwarepakke avbrutt" + + msgid "Preparing Slackware install directory..." + msgstr "Forbereder Slackware installasjonsmappe..." + + msgid "Writing package description..." +-msgstr "Skriver pakkefortegnelse..." ++msgstr "Skriver pakkebeskrivelsen..." + + msgid "Writing Slackware install script..." +-msgstr "Skriver Slckware installasjonscript..." ++msgstr "Skriver Slackware installasjonsskript..." + + msgid "Appending your script to the main install script..." +-msgstr "Legger til scriptet ditt til hovedinstalleringsscript" ++msgstr "Legger til skriptet ditt i installasjonsskriptet..." + + msgid "Creating package ${SLACK_PKG_BASENAME}..." +-msgstr "Bygger pakka ${SLACK_PKG_BASENAME}..." ++msgstr "Bygger pakken ${SLACK_PKG_BASENAME}..." + + msgid "Installing package..." +-msgstr "Installerer pakken..." ++msgstr "Installerer pakke..." + + msgid "*** Failed to install the package" + msgstr "*** Kunne ikke installere pakken" +@@ -528,82 +539,82 @@ msgid "**************************************" + msgstr "*************************************" + + msgid "**** RPM package creation selected ***" +-msgstr "*** RPM pakkebygging valgt" ++msgstr "*** RPM-pakke valgt" + + msgid "*** The \"rpm\" program is not in your PATH!" +-msgstr "*** \"rpm\" programmet er ikke i PATH'en din" ++msgstr "*** \"rpm\" er ikke i $PATH!" + + msgid "*** RPM package creation aborted" +-msgstr "*** RPM pakkebygging avbrutt" ++msgstr "*** RPM-pakke avbrutt" + + msgid "$RPMSOURCEDIR has no SOURCES directory. Please write the path to" +-msgstr "$RPMSOURCEDIR har ingen SOURCES mappe. Vennligst skriv banen til" ++msgstr "$RPMSOURCEDIR har ingen SOURCES mappe. Vennligst angi banen til" + + msgid "the RPM source directory tree: " +-msgstr "kilde-treet til RPM: " ++msgstr "RPM-kilden: " + + msgid "You requested to review the .spec file for this package." +-msgstr "Du ville se .spec fila for denne pakken." ++msgstr "Du ba om Ã¥ fÃ¥ se over .spec-fila." + + msgid "Building RPM package..." +-msgstr "Bygger RPM pakke..." ++msgstr "Bygger RPM-pakke..." + + msgid "*** Failed to build the package" + msgstr "*** Kunne ikke bygge pakken" + + msgid "Warning: the use of RPMFLAGS is deprecated." +-msgstr "Advarsel: bruken av RPMFLAGS er ikke foretrukket" ++msgstr "Advarsel: bruken av RPMFLAGS er utdatert." + + msgid "Warning: You should now use RPM_FLAGS," +-msgstr "Advarsel: Du burde nå bruke RPM_FLAGS," ++msgstr "Advarsel: RPM_FLAGS er nÃ¥værende standard," + + msgid "Warning: please update your checkinstallrc file." +-msgstr "Advarsel: vennligst oppdater din checkinstallrc fil." ++msgstr "Advarsel: vennligst oppdater checkinstallrc." + + msgid "Installing RPM package..." +-msgstr "Installerer RPM pakke..." ++msgstr "Installerer RPM-pakke..." + + msgid "NOTE: The package will not be installed" +-msgstr "NB: Pakken vil ikke bli installert" ++msgstr "NB: Pakken blir ikke installert" + + msgid "*****************************************" + msgstr "****************************************" + + msgid "**** Debian package creation selected ***" +-msgstr "*** Debian pakkebygging valgt ***" ++msgstr "*** Debianpakke valgt ***" + + msgid "*** The \"dpkg\" program is not in your PATH!" +-msgstr "*** \"dpkg\" programmet er ikke i PATH'en din!" ++msgstr "*** \"dpkg\" er ikke i $PATH!" + + msgid "*** Debian package creation aborted" +-msgstr "*** Debian pakkebygging avsluttet" ++msgstr "*** Debianpakke avsluttet" + + msgid "You requested to review the control file for this package." +-msgstr "Du ville se kontrollfilen for denne pakken." ++msgstr "Du ba om Ã¥ fÃ¥ se over control-fila." + + msgid "Building Debian package..." +-msgstr "Bygger Debian pakke..." ++msgstr "Bygger Debianpakke..." + + msgid "Installing Debian package..." +-msgstr "Installerer Debian pakke..." ++msgstr "Installerer Debianpakke..." + + msgid "*** No method was selected, I won't build any package." +-msgstr "*** Ingen metode valgt, jeg bygger ikke pakke." ++msgstr "*** Ingen pakketype angitt, ingen pakke blir bygget." + + msgid "*** The installation command \"$INSTALLCMD\"" +-msgstr "*** Installasjons kommando \"$INSTALLCMD\"" ++msgstr "*** Installasjonskommando \"$INSTALLCMD\"" + + msgid "*** has already been executed." +-msgstr "*** har allerede blitt kjørt." ++msgstr "*** er allerede utført." + + msgid "The package storage directory" +-msgstr "Pakkelagrings mappe" ++msgstr "Mappen pakken skal lagres i" + + msgid "doesn't exist. Do you want to create it?" +-msgstr "eksisterer ikke. Vil du lage den?" ++msgstr "eksisterer ikke. Vil du opprette den?" + + msgid "Creating package storage directory..." +-msgstr "Lager pakkelagrings mappe..." ++msgstr "Oppretter mappe..." + + msgid "*** Unable to create $PAK_DIR" + msgstr "*** Kan ikke opprette $PAK_DIR" +@@ -612,10 +623,10 @@ msgid "Transferring package to" + msgstr "Flytter pakke til" + + msgid "There's no package storage directory, the package" +-msgstr "Det er ingen pakkelagringsplass, pakken" ++msgstr "Det er ingen mappe Ã¥ lagre pakken i, pakken" + + msgid "will be stored at the default location." +-msgstr "vil bli lagret på standard plass." ++msgstr "pakken vil bli lagret pÃ¥ standardplassering." + + msgid "Erasing temporary files..." + msgstr "Sletter midlertidige filer..." +@@ -624,22 +635,22 @@ msgid "Deleting doc-pak directory..." + msgstr "Sletter doc-pak mappe..." + + msgid "Writing backup package..." +-msgstr "Skriver backup pakke..." ++msgstr "Lagrer sikkerhetskopipakke..." + + msgid "Deleting temp dir..." + msgstr "Sletter midlertidig mappe..." + + msgid "Building debug information package..." +-msgstr "Bygger debug informasjons pakke..." ++msgstr "Bygger feilsøkingspakke..." + + msgid " Done. The new package has been installed and saved to" +-msgstr " Ferdig. Den nye pakken har blitt installert og lagret på" ++msgstr " Ferdig. Den nye pakken er installert og lagret i" + + msgid " You can remove it from your system anytime using: " +-msgstr " Du kan fjerne den fra systemet ditt når som helst ved å:" ++msgstr "Du kan nÃ¥r som helst fjerne den fra systemet med:" + + msgid " Done. The new package has been saved to" +-msgstr " Ferdig. Pakken har nå blitt lagret på" ++msgstr " Ferdig. Den nye pakken er lagret i" + + msgid " You can install it in your system anytime using: " +-msgstr " Du kan installere den på systemet ditt når som helst ved å:" ++msgstr " Du kan nÃ¥r som helst installere den med: " +-- +2.30.0 + diff --git a/0007-Added-summary-command-line-option.patch b/0007-Added-summary-command-line-option.patch new file mode 100644 index 000000000000..79098eca5769 --- /dev/null +++ b/0007-Added-summary-command-line-option.patch @@ -0,0 +1,36 @@ +From 367a87247bb5ec491f2c9cdf40322b8ddba24516 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 24 Nov 2014 18:48:25 -0600 +Subject: [PATCH 07/20] Added --summary command line option + +--- + checkinstall | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/checkinstall b/checkinstall +index 978360f..cc0ad66 100755 +--- a/checkinstall ++++ b/checkinstall +@@ -506,7 +506,7 @@ fi + # Arguments parsing + + CKNAME=`basename "$0"` +-PARAMS=`getopt -a -n $CKNAME -o +d:DA:t:RShHy -l arch:,type:,si,showinstall::,ss,showslack::,deldoc::,delspec::,deldesc::,strip::,addso::,install::,stripso::,gzman::,bk,backup::,autodoinst::,reset-uids::,fstrans::,spec:,exclude:,include:,pkgname:,pkgversion:,pkgrelease:,pkglicense:,pkggroup:,pkgsource:,pkgaltsource:,pakdir:,docdir:,requires:,provides:,conflicts:,replaces:,maintainer:,dpkgflags:,rpmflags:,pkgarch:,umask:,with-tar:,inspect,review-spec,review-control,newslack,help,nodoc,rpmi,rpmu,version,copyright,default -- "$@"` ++PARAMS=`getopt -a -n $CKNAME -o +d:DA:t:RShHy -l arch:,type:,si,showinstall::,ss,showslack::,deldoc::,delspec::,deldesc::,strip::,addso::,install::,stripso::,gzman::,bk,backup::,autodoinst::,reset-uids::,fstrans::,spec:,exclude:,include:,pkgname:,pkgversion:,pkgrelease:,pkglicense:,pkggroup:,pkgsource:,pkgaltsource:,pakdir:,docdir:,requires:,provides:,conflicts:,replaces:,maintainer:,dpkgflags:,rpmflags:,pkgarch:,umask:,with-tar:,summary:,inspect,review-spec,review-control,newslack,help,nodoc,rpmi,rpmu,version,copyright,default -- "$@"` + + [ $? -gt 0 ] && help_notice + +@@ -573,6 +573,10 @@ while [ "$1" != "--" ]; do + shift + TAR=`eval echo $1` + ;; ++ --summary) ++ shift ++ SUMMARY=`eval echo $1` ++ ;; + --docdir) + shift + DOC_DIR=`eval echo $1` +-- +2.30.0 + diff --git a/0008-Fixed-glibc-minor-version-handling.patch b/0008-Fixed-glibc-minor-version-handling.patch new file mode 100644 index 000000000000..22dc037e888f --- /dev/null +++ b/0008-Fixed-glibc-minor-version-handling.patch @@ -0,0 +1,29 @@ +From 18fb416b0b1ed8e4d6652958acd786ea4bfa813f Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 24 Nov 2014 18:56:11 -0600 +Subject: [PATCH 08/20] Fixed glibc minor version handling + +--- + installwatch/create-localdecls | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/installwatch/create-localdecls b/installwatch/create-localdecls +index 0cb3e27..407e755 100755 +--- a/installwatch/create-localdecls ++++ b/installwatch/create-localdecls +@@ -109,9 +109,9 @@ if test "$VERSION" = 'libc.so.6' ; then + echo '#define GLIBC_MINOR 13' >> $OUTFILE + SUBVERSION='glibc-2.13' ;; + *) +- echo 'Treated as glibc >= 2.1 (finger crossed)' +- echo '#define GLIBC_MINOR 1' >> $OUTFILE +- SUBVERSION='glibc-2.1' ;; ++ echo 'Treated as glibc >= 2.13 (finger crossed)' ++ echo '#define GLIBC_MINOR 13' >> $OUTFILE ++ SUBVERSION='glibc-2.13' ;; + esac + ;; + esac +-- +2.30.0 + diff --git a/0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch b/0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch new file mode 100644 index 000000000000..260267870d88 --- /dev/null +++ b/0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch @@ -0,0 +1,26 @@ +From cfaaa3c7bb95068eb0859323988cc7da2a885da3 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 24 Nov 2014 18:57:08 -0600 +Subject: [PATCH 09/20] Fixed warning about uninitialized variable in fopen() + handler + +--- + installwatch/installwatch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/installwatch/installwatch.c b/installwatch/installwatch.c +index 8004b5b..e13c9d8 100644 +--- a/installwatch/installwatch.c ++++ b/installwatch/installwatch.c +@@ -2554,6 +2554,8 @@ FILE *fopen(const char *pathname, const char *mode) { + if (!libc_handle) + initialize(); + ++ result = NULL; ++ + #if DEBUG + debug(2,"fopen(%s,%s)\n",pathname,mode); + #endif +-- +2.30.0 + diff --git a/0010-Support-for-the-Makefile-PREFIX-variable.patch b/0010-Support-for-the-Makefile-PREFIX-variable.patch new file mode 100644 index 000000000000..3010649e2bca --- /dev/null +++ b/0010-Support-for-the-Makefile-PREFIX-variable.patch @@ -0,0 +1,72 @@ +From 6c5d831c75f9fcb9680f55cd473d6a2b8a9a9895 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 24 Nov 2014 19:34:39 -0600 +Subject: [PATCH 10/20] Support for the Makefile PREFIX variable + +Moved checkinstall to checkinstall.in. Now checkinstall is created +when running "make". +--- + Makefile | 5 +++-- + checkinstall => checkinstall.in | 5 ++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + rename checkinstall => checkinstall.in (99%) + +diff --git a/Makefile b/Makefile +index 2e28adc..18e260d 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,6 +19,7 @@ all: + ;; \ + esac ; \ + done ++ sed 's%MAKEFILE_PREFIX%$(PREFIX)%g' checkinstall.in > checkinstall + $(MAKE) -C installwatch + + install: all +@@ -26,7 +27,7 @@ install: all + $(MAKE) -C installwatch install + + mkdir -p $(BINDIR) +- install checkinstall makepak $(BINDIR) ++ install -m 0755 -o root -g root checkinstall makepak $(BINDIR) + for file in locale/*.mo ; do \ + LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \ + -e 's|\.mo||'` && \ +@@ -55,7 +56,7 @@ install: all + fi + + clean: +- for file in locale/checkinstall-*.mo ; do \ ++ for file in locale/checkinstall-*.mo checkinstall ; do \ + rm -f $${file} ; \ + done + $(MAKE) -C installwatch clean +diff --git a/checkinstall b/checkinstall.in +similarity index 99% +rename from checkinstall +rename to checkinstall.in +index cc0ad66..021d040 100755 +--- a/checkinstall ++++ b/checkinstall.in +@@ -61,8 +61,7 @@ function followlinks () { + fi + } + +-INSTALLDIR=`followlinks "$0"` +-INSTALLDIR=`dirname "$INSTALLDIR"`/.. ++INSTALLDIR=MAKEFILE_PREFIX + + # gettext variables + export TEXTDOMAINDIR="$INSTALLDIR"/lib/checkinstall/locale +@@ -492,7 +491,7 @@ function copy_dir_hierarchy { + ckversion + echo + +-CHECKINSTALLRC=${CHECKINSTALLRC:-${INSTALLDIR}/checkinstallrc} ++CHECKINSTALLRC=${CHECKINSTALLRC:-${INSTALLDIR}/lib/checkinstall/checkinstallrc} + if ! [ -f $CHECKINSTALLRC ]; then + echog "The checkinstallrc file was not found at:\n$CHECKINSTALLRC" + echo +-- +2.30.0 + diff --git a/0011-We-now-create-Slackware-packages-in-TMP_DIR.patch b/0011-We-now-create-Slackware-packages-in-TMP_DIR.patch new file mode 100644 index 000000000000..cc8da78433ce --- /dev/null +++ b/0011-We-now-create-Slackware-packages-in-TMP_DIR.patch @@ -0,0 +1,34 @@ +From d33deb80c921f372749b3daccdc09d648d5585a3 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 24 Nov 2014 20:54:57 -0600 +Subject: [PATCH 11/20] We now create Slackware packages in $TMP_DIR + +--- + checkinstall.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/checkinstall.in b/checkinstall.in +index 021d040..fe8c77e 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -2190,14 +2190,14 @@ chmod 755 $BUILD_DIR + export TAR + + if [ $SHOW_MAKEPKG -gt 0 ]; then +- $MAKEPKG $MAKEPKG_FLAGS "${SLACK_PKG_BASENAME}.tgz" ++ $MAKEPKG $MAKEPKG_FLAGS ${TMP_DIR}/"${SLACK_PKG_BASENAME}.tgz" + okfail + else +- $MAKEPKG $MAKEPKG_FLAGS "${SLACK_PKG_BASENAME}.tgz" &> /dev/null ++ $MAKEPKG $MAKEPKG_FLAGS ${TMP_DIR}/"${SLACK_PKG_BASENAME}.tgz" &> /dev/null + okfail + fi + +-mv "${SLACK_PKG_BASENAME}.tgz" "$DIRECTORIO_FUENTE" ++mv ${TMP_DIR}/"${SLACK_PKG_BASENAME}.tgz" "$DIRECTORIO_FUENTE" + + # + # If requested, we install the package to register it in Slackware's +-- +2.30.0 + diff --git a/0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch b/0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch new file mode 100644 index 000000000000..be8d2d527df9 --- /dev/null +++ b/0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch @@ -0,0 +1,177 @@ +From 4bb8c9fed4d4b2f8828282f17727dbc513ced45f Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Sun, 28 Dec 2014 14:09:23 -0600 +Subject: [PATCH 12/20] Fixed bug #110. create-localdecls correctly identifies + newer glibc versions. + +--- + installwatch/Makefile | 2 +- + installwatch/create-localdecls | 92 +++++++++------------------------- + installwatch/installwatch.c | 2 +- + installwatch/libcfiletest.c | 4 ++ + installwatch/libctest.c | 8 ++- + 5 files changed, 35 insertions(+), 73 deletions(-) + create mode 100644 installwatch/libcfiletest.c + +diff --git a/installwatch/Makefile b/installwatch/Makefile +index ae34fc1..4c7eb36 100644 +--- a/installwatch/Makefile ++++ b/installwatch/Makefile +@@ -40,7 +40,7 @@ uninstall: + rm -f $(BINDIR)/installwatch + + clean: +- rm -f *~ *.bak *.o installwatch.so core localdecls.h libctest test-installwatch ++ rm -f *~ *.bak *.o installwatch.so core localdecls.h libcfiletest libctest test-installwatch + + tarball: clean + tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION) +diff --git a/installwatch/create-localdecls b/installwatch/create-localdecls +index 407e755..533a378 100755 +--- a/installwatch/create-localdecls ++++ b/installwatch/create-localdecls +@@ -43,78 +43,32 @@ fi + ### + ### + +-echo -n 'Checking libc version... ' +-gcc -Wall -o libctest libctest.c +-VERSION=`ldd libctest | grep libc\\.so | awk '{print $1}'` +-rm libctest +-echo $VERSION +-echo "#define LIBC_VERSION \"$VERSION\"" >> $OUTFILE +-if test "$VERSION" = 'libc.so.5' ; then ++echo -n 'Checking which libc whe are using... ' ++gcc -Wall -o libcfiletest libcfiletest.c ++LIBC_FILE=`ldd libcfiletest | grep libc\\.so | awk '{print $1}'` ++echo $LIBC_FILE ++echo "#define LIBC_FILE \"$LIBC_FILE\"" >> $OUTFILE ++if test "$LIBC_FILE" = 'libc.so.5' ; then + echo '#define BROKEN_RTLD_NEXT' >> $OUTFILE + echo '#define LIBC 5' >> $OUTFILE +-fi ++else ++ if test "$LIBC_FILE" = 'libc.so.6' ; then ++ echo -n 'Checking libc version... ' ++ gcc -Wall -o libctest libctest.c ++ LIBC_VERSION=`./libctest` ++ echo $LIBC_VERSION ++ echo "#define LIBC_VERSION \"$LIBC_VERSION\"" >> $OUTFILE ++ echo -en 'glibc >= 2 found\nChecking glibc subversion... ' ++ OsLibcMajor=`echo $LIBC_VERSION | cut -f1 -d.` ++ OsLibcMinor=`echo $LIBC_VERSION | cut -f2 -d.` ++ echo "#define GLIBC_MAJOR $OsLibcMajor" >> $OUTFILE ++ echo "#define GLIBC_MINOR $OsLibcMinor" >> $OUTFILE ++ echo $OsLibcMinor ++ else ++ echo "Unknown libc found ($LIBC_FILE). Please update the create-localdecls script." ++ exit 1 ++ fi + +-if test "$VERSION" = 'libc.so.6' ; then +- echo -n 'Checking glibc subversion... ' +- tmp="`ldd /bin/sh | grep libc.so 2> /dev/null`" +- LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'` +- tmp="`strings $LibcPath | grep -i 'c library'`" +- OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'` +- OsLibcMinor=`expr "$tmp" : '.* [0-9][0-9]*\.\([0-9][0-9]*\)'` +- case "$OsLibcMajor" in +- 2) +- # 2 is the glibc version +- echo "JH OsLibcMinor is $OsLibcMinor" +- case "$OsLibcMinor" in +- 0) +- echo '#define GLIBC_MINOR 0' >> $OUTFILE +- SUBVERSION='glibc-2.0' ;; +- 1) +- echo '#define GLIBC_MINOR 1' >> $OUTFILE +- SUBVERSION='glibc-2.1' ;; +- 2) +- echo '#define GLIBC_MINOR 2' >> $OUTFILE +- SUBVERSION='glibc-2.2' ;; +- 3) +- echo '#define GLIBC_MINOR 3' >> $OUTFILE +- SUBVERSION='glibc-2.3' ;; +- 4) +- echo '#define GLIBC_MINOR 4' >> $OUTFILE +- SUBVERSION='glibc-2.4' ;; +- 5) +- echo '#define GLIBC_MINOR 5' >> $OUTFILE +- SUBVERSION='glibc-2.5' ;; +- 6) +- echo '#define GLIBC_MINOR 6' >> $OUTFILE +- SUBVERSION='glibc-2.6' ;; +- 7) +- echo '#define GLIBC_MINOR 7' >> $OUTFILE +- SUBVERSION='glibc-2.7' ;; +- 8) +- echo '#define GLIBC_MINOR 8' >> $OUTFILE +- SUBVERSION='glibc-2.8' ;; +- 9) +- echo '#define GLIBC_MINOR 9' >> $OUTFILE +- SUBVERSION='glibc-2.9' ;; +- 10) +- echo '#define GLIBC_MINOR 10' >> $OUTFILE +- SUBVERSION='glibc-2.10' ;; +- 11) +- echo '#define GLIBC_MINOR 11' >> $OUTFILE +- SUBVERSION='glibc-2.11' ;; +- 12) +- echo '#define GLIBC_MINOR 12' >> $OUTFILE +- SUBVERSION='glibc-2.12' ;; +- 13) +- echo '#define GLIBC_MINOR 13' >> $OUTFILE +- SUBVERSION='glibc-2.13' ;; +- *) +- echo 'Treated as glibc >= 2.13 (finger crossed)' +- echo '#define GLIBC_MINOR 13' >> $OUTFILE +- SUBVERSION='glibc-2.13' ;; +- esac +- ;; +- esac + fi + + echo >> $OUTFILE +diff --git a/installwatch/installwatch.c b/installwatch/installwatch.c +index e13c9d8..8e6c616 100644 +--- a/installwatch/installwatch.c ++++ b/installwatch/installwatch.c +@@ -351,7 +351,7 @@ static void initialize(void) { + + #ifdef BROKEN_RTLD_NEXT + // printf ("RTLD_LAZY"); +- libc_handle = dlopen(LIBC_VERSION, RTLD_LAZY); ++ libc_handle = dlopen(LIBC_FILE, RTLD_LAZY); + #else + // printf ("RTLD_NEXT"); + libc_handle = RTLD_NEXT; +diff --git a/installwatch/libcfiletest.c b/installwatch/libcfiletest.c +new file mode 100644 +index 0000000..f6697cc +--- /dev/null ++++ b/installwatch/libcfiletest.c +@@ -0,0 +1,4 @@ ++int main(void) { ++ return 0; ++} ++ +diff --git a/installwatch/libctest.c b/installwatch/libctest.c +index 5fc92b5..c7ecac0 100644 +--- a/installwatch/libctest.c ++++ b/installwatch/libctest.c +@@ -1,6 +1,10 @@ + /* Dummy program to check your libc version */ + +-int main(void) { +- return 0; ++#include <stdio.h> ++#include <gnu/libc-version.h> ++ ++int main (void) { ++ puts (gnu_get_libc_version ()); ++ return 0; + } + +-- +2.30.0 + diff --git a/0012-add-debian-cflags.patch b/0012-add-debian-cflags.patch new file mode 100644 index 000000000000..c065cc89b3e7 --- /dev/null +++ b/0012-add-debian-cflags.patch @@ -0,0 +1,21 @@ +From: Stephen Gelman <ssgelm@debian.org> +Date: Tue, 9 Jul 2019 20:31:52 -0500 +Subject: Build with dh CLAGS + +This allows proper hardening to be done +--- +--- a/installwatch/Makefile ++++ b/installwatch/Makefile +@@ -16,10 +16,10 @@ + all: installwatch.so + + installwatch.so: installwatch.o +- ld -shared -o installwatch.so installwatch.o -ldl -lc ++ ld -znow -shared -o installwatch.so installwatch.o -ldl -lc + + installwatch.o: installwatch.c localdecls.h +- gcc -Wall -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c ++ gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -c -g -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c + + localdecls.h: create-localdecls + ./create-localdecls diff --git a/0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch b/0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch new file mode 100644 index 000000000000..a64bf756af4f --- /dev/null +++ b/0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch @@ -0,0 +1,26 @@ +From 692d3f0b8b3c98ccbd1f5a70970489ca6e60b086 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 29 Dec 2014 17:03:38 -0600 +Subject: [PATCH 13/20] Fixed bug #23. We remove empty fields from the Debian + control file when creating Debian packages + +--- + checkinstall.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/checkinstall.in b/checkinstall.in +index fe8c77e..ea31c68 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -2572,7 +2572,7 @@ cd "$DIRECTORIO_FUENTE" + + mkdir $BUILD_DIR/DEBIAN + +-cat << EOF >> $BUILD_DIR/DEBIAN/control ++cat << EOF | sed "s/ $//" | egrep ": " >> $BUILD_DIR/DEBIAN/control + Package: $PKG_BASENAME + Priority: extra + Section: $PKG_GROUP +-- +2.30.0 + diff --git a/0014-Fixed-typo-in-create-localdecls.patch b/0014-Fixed-typo-in-create-localdecls.patch new file mode 100644 index 000000000000..2fbed57ad9e0 --- /dev/null +++ b/0014-Fixed-typo-in-create-localdecls.patch @@ -0,0 +1,25 @@ +From 89bda5c8307ca09eca67d78ae65a52c7fae94f2d Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 29 Dec 2014 17:06:21 -0600 +Subject: [PATCH 14/20] Fixed typo in create-localdecls + +--- + installwatch/create-localdecls | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/installwatch/create-localdecls b/installwatch/create-localdecls +index 533a378..72c725c 100755 +--- a/installwatch/create-localdecls ++++ b/installwatch/create-localdecls +@@ -43,7 +43,7 @@ fi + ### + ### + +-echo -n 'Checking which libc whe are using... ' ++echo -n 'Checking which libc we are using... ' + gcc -Wall -o libcfiletest libcfiletest.c + LIBC_FILE=`ldd libcfiletest | grep libc\\.so | awk '{print $1}'` + echo $LIBC_FILE +-- +2.30.0 + diff --git a/0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch b/0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch new file mode 100644 index 000000000000..ccc886e17909 --- /dev/null +++ b/0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch @@ -0,0 +1,26 @@ +From fe1f03d650120531368893b12e68133a71e5c392 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 29 Dec 2014 17:27:54 -0600 +Subject: [PATCH 15/20] Fixed bug #30. Newlines are converted to underscores in + $PKG_GROUP + +--- + checkinstall.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/checkinstall.in b/checkinstall.in +index ea31c68..826bcf1 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -2575,7 +2575,7 @@ mkdir $BUILD_DIR/DEBIAN + cat << EOF | sed "s/ $//" | egrep ": " >> $BUILD_DIR/DEBIAN/control + Package: $PKG_BASENAME + Priority: extra +-Section: $PKG_GROUP ++Section: $(echo $PKG_GROUP | tr '\n' ' ') + Installed-Size: `du -s $BUILD_DIR | awk '{print $1}'` + Maintainer: $MAINTAINER + Architecture: $ARCHITECTURE +-- +2.30.0 + diff --git a/0016-Fixed-bug-38.-.spec-file-macro-processing.patch b/0016-Fixed-bug-38.-.spec-file-macro-processing.patch new file mode 100644 index 000000000000..d7300c37d3ff --- /dev/null +++ b/0016-Fixed-bug-38.-.spec-file-macro-processing.patch @@ -0,0 +1,31 @@ +From 2826cbb5fe12c025b8136938113fc24719fdd505 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Mon, 29 Dec 2014 17:42:17 -0600 +Subject: [PATCH 16/20] Fixed bug #38. .spec file macro processing. + +Added patch from Santtu Lakkala for expanding .spec file macro definitions. +--- + checkinstall.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/checkinstall.in b/checkinstall.in +index 826bcf1..21ad259 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -400,6 +400,13 @@ function getparameter () { + RES=`egrep "$1" < ${SPEC_PATH} \ + | cut -f2 -d: | sed 's/^ *//g' | sed 's/ *$//g' ` + shift ++ while echo "$RES" | egrep -q '(^|[^%])%[a-zA-Z0-9]'; do ++ VAR=`echo "$RES" | sed 's/\(^\|^.*[^%]\)%\([a-zA-Z0-9]*\).*$/\2/'` ++ egrep -q "^%define\s+$VAR\s" < ${SPEC_PATH} || break ++ VAL=`egrep "^%define\s+$VAR\s" < ${SPEC_PATH} \ ++ | awk '{ print $3 }'` ++ RES=`echo "$RES" | sed 's/\(^\|[^%]\)%'"$VAR/"'\1'"$VAL/g"` ++ done + echo "$RES" | sed 's/^ *//g' | sed 's/ *$//g' + + } +-- +2.30.0 + diff --git a/0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch b/0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch new file mode 100644 index 000000000000..125af324ff77 --- /dev/null +++ b/0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch @@ -0,0 +1,41 @@ +From 20d5a6c9c4670d73c45483e5529c7f0078d3ac30 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Sat, 21 Feb 2015 16:38:10 -0600 +Subject: [PATCH 17/20] Fixed bug #112: make install fails on Fedora 21. + +Also made minor improvements to the Makefile. +--- + Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 18e260d..71e4da3 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,18 +27,19 @@ install: all + $(MAKE) -C installwatch install + + mkdir -p $(BINDIR) ++ mkdir -p $(LCDIR) + install -m 0755 -o root -g root checkinstall makepak $(BINDIR) + for file in locale/*.mo ; do \ +- LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \ ++ CKLNG=`echo $$file | sed -e 's|locale/checkinstall-||' \ + -e 's|\.mo||'` && \ +- mkdir -p $(LCDIR)/$${LANG}/LC_MESSAGES && \ +- cp $$file $(LCDIR)/$${LANG}/LC_MESSAGES/checkinstall.mo || \ ++ mkdir -p $(LCDIR)/$${CKLNG}/LC_MESSAGES && \ ++ cp $$file $(LCDIR)/$${CKLNG}/LC_MESSAGES/checkinstall.mo || \ + exit 1 ; \ + done + + mkdir -p $(CONFDIR) + install -m644 checkinstallrc-dist $(CONFDIR) +- if ! [ -f $(CONFDIR)/checkinstallrc ]; then \ ++ @if ! [ -f $(CONFDIR)/checkinstallrc ]; then \ + cp $(CONFDIR)/checkinstallrc-dist $(CONFDIR)/checkinstallrc; \ + else \ + echo; \ +-- +2.30.0 + diff --git a/0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch b/0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch new file mode 100644 index 000000000000..5532e021820e --- /dev/null +++ b/0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch @@ -0,0 +1,28 @@ +From 476db492c607e067313b8e8ad2817bd987e34964 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Tue, 28 Jul 2015 15:49:55 -0500 +Subject: [PATCH 18/20] Fixed bug #137 - Missing $ in copy_dir_hierarchy + +There was a "$" missing in copy_dir_hierarchy. + +Reported by greenrover33. +--- + checkinstall.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/checkinstall.in b/checkinstall.in +index 21ad259..3c34431 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -472,7 +472,7 @@ function copy_dir_hierarchy { + # Only use tar if there are parents + echo "${files}" | egrep '[^[:space:]]' >/dev/null + if [ $? -eq 0 ]; then +- if [ deref_parents -eq 1 ]; then ++ if [ $deref_parents -eq 1 ]; then + # Add the -h option to the tar command for dereferencing + $TAR --no-recursion -C "${root}" -cphf - $files | $TAR -f - -xvpC \ + "${dest}" +-- +2.30.0 + diff --git a/0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch b/0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch new file mode 100644 index 000000000000..93f3f609237c --- /dev/null +++ b/0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch @@ -0,0 +1,30 @@ +From 78adcec9b0dfdcf3462d72f3070974c8e5ca005c Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Fri, 30 Dec 2016 14:42:18 -0600 +Subject: [PATCH 19/20] Fixed bug #35: Directories in /etc are incorrectly + included in debian/conffiles + +First reported and fixed by muzso@muzso.hu, a bug in the fix was +later spotted and fixed by Brian Morton. +--- + checkinstall.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/checkinstall.in b/checkinstall.in +index 3c34431..1771522 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -2625,8 +2625,8 @@ if [ -f postremove-pak ]; then + fi + + # Tag files in /etc to be conffiles +-find $BUILD_DIR/etc -type f 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ +- grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles ++find -L $BUILD_DIR/etc -type f 2> /dev/null | sed -e "s,$BUILD_DIR,," \ ++ > $BUILD_DIR/DEBIAN/conffiles + + # The package will be saved here (ignores <epoch>: prefix): + DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb" +-- +2.30.0 + diff --git a/0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch b/0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch new file mode 100644 index 000000000000..527bd5e20405 --- /dev/null +++ b/0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch @@ -0,0 +1,141 @@ +From d24a630501a9aba5d53de2dcb3d9aa66edd3fe06 Mon Sep 17 00:00:00 2001 +From: Felipe Eduardo Sanchez Diaz Duran <izto@asic-linux.com.mx> +Date: Wed, 26 Apr 2017 17:37:50 -0500 +Subject: [PATCH 20/20] add support for --recommends and --suggests (AKA weak + dependencies) + +Patch submitted by Tobias Bengfort <tobias.bengfort@posteo.de> +--- + checkinstall.in | 48 ++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 42 insertions(+), 6 deletions(-) + +diff --git a/checkinstall.in b/checkinstall.in +index 1771522..66c9cd0 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -151,6 +151,8 @@ function usage() { + echog "--maintainer=<email addr> The package maintainer (.deb)" + echog "--provides=<list> Features provided by this package" + echog "--requires=<list> Features required by this package" ++ echog "--recommends=<list> Features recommended by this package" ++ echog "--suggests=<list> Features suggested by this package" + echog "--conflicts=<list> Packages that this package cannot be installed with (.deb)" + echog "--replaces=<list> Packages that this package replaces (.deb)" + echog "--rpmflags=<flags> Pass this flags to the rpm installer" +@@ -512,7 +514,7 @@ fi + # Arguments parsing + + CKNAME=`basename "$0"` +-PARAMS=`getopt -a -n $CKNAME -o +d:DA:t:RShHy -l arch:,type:,si,showinstall::,ss,showslack::,deldoc::,delspec::,deldesc::,strip::,addso::,install::,stripso::,gzman::,bk,backup::,autodoinst::,reset-uids::,fstrans::,spec:,exclude:,include:,pkgname:,pkgversion:,pkgrelease:,pkglicense:,pkggroup:,pkgsource:,pkgaltsource:,pakdir:,docdir:,requires:,provides:,conflicts:,replaces:,maintainer:,dpkgflags:,rpmflags:,pkgarch:,umask:,with-tar:,summary:,inspect,review-spec,review-control,newslack,help,nodoc,rpmi,rpmu,version,copyright,default -- "$@"` ++PARAMS=`getopt -a -n $CKNAME -o +d:DA:t:RShHy -l arch:,type:,si,showinstall::,ss,showslack::,deldoc::,delspec::,deldesc::,strip::,addso::,install::,stripso::,gzman::,bk,backup::,autodoinst::,reset-uids::,fstrans::,spec:,exclude:,include:,pkgname:,pkgversion:,pkgrelease:,pkglicense:,pkggroup:,pkgsource:,pkgaltsource:,pakdir:,docdir:,requires:,recommends:,suggests:,provides:,conflicts:,replaces:,maintainer:,dpkgflags:,rpmflags:,pkgarch:,umask:,with-tar:,summary:,inspect,review-spec,review-control,newslack,help,nodoc,rpmi,rpmu,version,copyright,default -- "$@"` + + [ $? -gt 0 ] && help_notice + +@@ -603,6 +605,14 @@ while [ "$1" != "--" ]; do + shift + REQUIRES=`eval echo $1` + ;; ++ --recommends) ++ shift ++ RECOMMENDS=`eval echo $1` ++ ;; ++ --suggests) ++ shift ++ SUGGESTS=`eval echo $1` ++ ;; + --maintainer) + shift + MAINTAINER=`eval echo $1` +@@ -1272,6 +1282,8 @@ if [ -f "$SPEC_PATH" ]; then + PKG_GROUP=`getparameter "^[Gg]roup"` + PROVIDES=`getparameter "^[Pp]rovides"` + REQUIRES=`getparameter "^[Rr]equires"` ++ RECOMMENDS=`getparameter "^[Rr]commends"` ++ SUGGESTS=`getparameter "^[Ss]uggests"` + fi + + OPTION=junk +@@ -1370,6 +1382,8 @@ fi + ! [ "$ALTSOURCE" ] && ALTSOURCE="" + ! [ "$PROVIDES" ] && PROVIDES="$NAME" + ! [ "$REQUIRES" ] && REQUIRES="" ++ ! [ "$RECOMMENDS" ] && RECOMMENDS="" ++ ! [ "$SUGGESTS" ] && SUGGESTS="" + # bond: added this so it is easy to change the Maintainer: field + # just by setting the MAINTAINER environment variable + +@@ -1406,9 +1420,13 @@ fi + [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && + echog "10 - Requires: [ %s ]" "$REQUIRES" + [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && +- echog "11 - Provides: [ %s ]" "$PROVIDES" +- [ "$CK_DEBIAN" ] && echog "12 - Conflicts: [ %s ]" "$CONFLICTS" +- [ "$CK_DEBIAN" ] && echog "13 - Replaces: [ %s ]" "$REPLACES" ++ echog "11 - Recommends: [ %s ]" "$RECOMMENDS" ++ [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && ++ echog "12 - Suggests: [ %s ]" "$SUGGESTS" ++ [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && ++ echog "13 - Provides: [ %s ]" "$PROVIDES" ++ [ "$CK_DEBIAN" ] && echog "14 - Conflicts: [ %s ]" "$CONFLICTS" ++ [ "$CK_DEBIAN" ] && echog "15 - Replaces: [ %s ]" "$REPLACES" + + echo + echogn "Enter a number to change any of them or press ENTER to continue: " +@@ -1480,6 +1498,20 @@ fi + } + ;; + 11) ++ [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && { ++ echog "Enter the additional recommendations: " ++ echo -n ">> " ++ read RECOMMENDS ++ } ++ ;; ++ 12) ++ [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && { ++ echog "Enter the additional suggestions: " ++ echo -n ">> " ++ read SUGGESTS ++ } ++ ;; ++ 13) + # 01-12-06 UKo: new feature + [ "$CK_REDHAT" -o "$CK_DEBIAN" ] && { + echog "Enter the provided features: " +@@ -1487,13 +1519,13 @@ fi + read PROVIDES + } + ;; +- 12) ++ 14) + [ "$CK_DEBIAN" ] && { echog "Enter the conflicting packages: " + echo -n ">> " + read CONFLICTS + } + ;; +- 13) ++ 15) + [ "$CK_DEBIAN" ] && { echog "Enter the replaced packages: " + echo -n ">> " + read REPLACES +@@ -2396,6 +2428,8 @@ Group: $PKG_GROUP + BuildRoot: $BROOTPATH + Provides: $PROVIDES + Requires: $REQUIRES,/bin/sh ++Recommends: $RECOMMENDS ++Suggests: $SUGGESTS + + %description + EOF +@@ -2588,6 +2622,8 @@ Maintainer: $MAINTAINER + Architecture: $ARCHITECTURE + Version: ${VERSION}-${RELEASE} + Depends: $REQUIRES ++Recommends: $RECOMMENDS ++Suggests: $SUGGESTS + Provides: $PROVIDES + Conflicts: $CONFLICTS + Replaces: $REPLACES +-- +2.30.0 + diff --git a/0021-Load-checkinstallrc-from-etc.patch b/0021-Load-checkinstallrc-from-etc.patch new file mode 100644 index 000000000000..d31e858b7957 --- /dev/null +++ b/0021-Load-checkinstallrc-from-etc.patch @@ -0,0 +1,22 @@ +From: Felipe Sateler <fsateler@gmail.com> +Date: Thu, 15 Apr 2010 14:47:45 -0400 +Subject: [PATCH] Load checkinstallrc from /etc + +--- + checkinstall | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/checkinstall.in b/checkinstall.in +index d2ba87e..aeae91e 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -500,7 +500,7 @@ function copy_dir_hierarchy { + ckversion + echo + +-CHECKINSTALLRC=${CHECKINSTALLRC:-${INSTALLDIR}/lib/checkinstall/checkinstallrc} ++CHECKINSTALLRC=${CHECKINSTALLRC:-/etc/checkinstallrc} + if ! [ -f $CHECKINSTALLRC ]; then + echog "The checkinstallrc file was not found at:\n$CHECKINSTALLRC" + echo +-- diff --git a/0022-Drop-cases-for-glibc-2.4.patch b/0022-Drop-cases-for-glibc-2.4.patch new file mode 100644 index 000000000000..bd1de9264f14 --- /dev/null +++ b/0022-Drop-cases-for-glibc-2.4.patch @@ -0,0 +1,174 @@ +From: Felipe Sateler <fsateler@gmail.com> +Date: Thu, 15 Apr 2010 15:00:23 -0400 +Subject: [PATCH] Drop cases for glibc < 2.4 + +Some functions definitions were dependent on the glibc version. Since +2.7 is in stable, drop everything for < 2.4. +--- + installwatch/installwatch.c | 31 ------------------------------- + 1 files changed, 0 insertions(+), 31 deletions(-) + +--- a/installwatch/installwatch.c ++++ b/installwatch/installwatch.c +@@ -88,11 +88,7 @@ + static int (*true_open)(const char *, int, ...); + static DIR *(*true_opendir)(const char *); + static struct dirent *(*true_readdir)(DIR *dir); +-#if (GLIBC_MINOR <= 4) +-static int (*true_readlink)(const char*,char *,size_t); +-#else + static ssize_t (*true_readlink)(const char*,char *,size_t); +-#endif + static char *(*true_realpath)(const char *,char *); + static int (*true_rename)(const char *, const char *); + static int (*true_rmdir)(const char *); +@@ -122,8 +118,6 @@ + size_t, int); + static int (*true_removexattr)(const char *,const char *); + +-#if(GLIBC_MINOR >= 1) +- + static int (*true_creat64)(const char *, __mode_t); + static FILE *(*true_fopen64)(const char *,const char *); + static int (*true_ftruncate64)(int, __off64_t); +@@ -143,9 +137,7 @@ + static int (*true_lxstat64)(int,const char *, struct stat64 *); + static int (*true_truncate64)(const char *, __off64_t); + +-#endif + +-#if (GLIBC_MINOR >= 4) + static int (*true_openat)(int, const char *, int, ...); + static int (*true_fchmodat)(int, const char *, mode_t, int); + static int (*true_fchownat)(int, const char *, uid_t, gid_t, int); +@@ -158,7 +150,6 @@ + static int (*true_renameat)(int, const char *, int, const char *); + static int (*true_symlinkat)(const char *, int, const char *); + static int (*true_unlinkat)(int, const char *, int); +-#endif + + #if defined __GNUC__ && __GNUC__>=2 + #define inline inline +@@ -178,7 +169,6 @@ + return true_lxstat(_STAT_VER,pathname,info); + } + +-#if (GLIBC_MINOR >= 4) + static inline int true_fstatat(int dirfd, const char *pathname, struct stat *info, int flags) { + return true_fxstatat(_STAT_VER, dirfd, pathname, info, flags); + } +@@ -191,7 +181,6 @@ + return true_xmknodat(_MKNOD_VER, dirfd, pathname, mode, &dev); + } + +-#endif + + /* A few defines to fix things a little */ + #define INSTW_OK 0 +@@ -285,10 +274,8 @@ + + #if DEBUG + static int __instw_printdirent(struct dirent*); +-#if(GLIBC_MINOR >= 1) + static int __instw_printdirent64(struct dirent64*); + #endif +-#endif + + #ifdef DEBUG + static int instw_print(instw_t *); +@@ -303,9 +290,7 @@ + static int instw_setmetatransl(instw_t *); + + static int instw_setpath(instw_t *,const char *); +-#if (GLIBC_MINOR >= 4) + static int instw_setpathrel(instw_t *, int, const char *); +-#endif + static int instw_getstatus(instw_t *,int *); + static int instw_apply(instw_t *); + static int instw_filldirls(instw_t *); +@@ -392,7 +377,6 @@ + + + +-#if(GLIBC_MINOR >= 1) + true_creat64 = dlsym(libc_handle, "creat64"); + true_fopen64 = dlsym(libc_handle, "fopen64"); + true_ftruncate64 = dlsym(libc_handle, "ftruncate64"); +@@ -403,9 +387,7 @@ + true_lxstat64 = dlsym(libc_handle, "__lxstat64"); + true_truncate64 = dlsym(libc_handle, "truncate64"); + true_removexattr = dlsym(libc_handle, "removexattr"); +-#endif + +-#if (GLIBC_MINOR >= 4) + + true_openat = dlsym(libc_handle, "openat"); + true_fchmodat = dlsym(libc_handle, "fchmodat"); +@@ -420,7 +402,6 @@ + true_symlinkat = dlsym(libc_handle, "symlinkat"); + true_unlinkat = dlsym(libc_handle, "unlinkat"); + +-#endif + + if(instw_init()) exit(-1); + } +@@ -1687,7 +1668,6 @@ + * returns = / 0 ok. path set + * -1 failed. cf errno / + */ +-#if (GLIBC_MINOR >= 4) + static int instw_setpathrel(instw_t *instw, int dirfd, const char *relpath) { + + /* This constant should be large enough to make a string that holds +@@ -1727,7 +1707,6 @@ + + #undef PROC_PATH_LEN + } +-#endif + + /* + * procedure = / rc:=instw_getstatus(instw,status) / +@@ -2958,13 +2937,8 @@ + return result; + } + +-#if (GLIBC_MINOR <= 4) +-int readlink(const char *path,char *buf,size_t bufsiz) { +- int result; +-#else + ssize_t readlink(const char *path,char *buf,size_t bufsiz) { + ssize_t result; +-#endif + instw_t instw; + int status; + +@@ -3518,7 +3492,6 @@ + return result; + } + +-#if(GLIBC_MINOR >= 1) + + int creat64(const char *pathname, __mode_t mode) { + /* Is it a system call? */ +@@ -3862,7 +3835,6 @@ + return result; + } + +-#endif /* GLIBC_MINOR >= 1 */ + + + /*********************************************** +@@ -3882,7 +3854,6 @@ + * Thanks to Gilbert Ashley for his work on this! + */ + +-#if (GLIBC_MINOR >= 4) + + int openat (int dirfd, const char *path, int flags, ...) { + mode_t mode = 0; +@@ -4547,5 +4518,3 @@ + + } + +- +-#endif /* GLIBC_MINOR >= 4 */ diff --git a/0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch b/0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch new file mode 100644 index 000000000000..2aca47f143ba --- /dev/null +++ b/0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch @@ -0,0 +1,53 @@ +From cc3457e8b2f1bbdc9d59da5f3cdb6df5ebf13c77 Mon Sep 17 00:00:00 2001 +From: Coelacanthus <coelacanthus@outlook.com> +Date: Sun, 31 Jan 2021 21:21:30 +0800 +Subject: [PATCH 1/2] fix: /usr/sbin merge to /usr/bin in Arch + +--- + Makefile | 2 +- + checkinstall.in | 2 +- + checkinstallrc-dist | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 71e4da3..b8fd5f2 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + + # Where to install. + PREFIX=/usr/local +-BINDIR=$(PREFIX)/sbin ++BINDIR=$(PREFIX)/bin + LCDIR=$(PREFIX)/lib/checkinstall/locale + CONFDIR=$(PREFIX)/lib/checkinstall + +diff --git a/checkinstall.in b/checkinstall.in +index 66c9cd0..178e418 100755 +--- a/checkinstall.in ++++ b/checkinstall.in +@@ -902,7 +902,7 @@ shift + ! [ "$INSTALLWATCH" ] && INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch + + # Which makepkg to use +-! [ "$MAKEPKG" ] && MAKEPKG=/sbin/makepkg ++! [ "$MAKEPKG" ] && MAKEPKG=/bin/makepkg + + # Default MAKEPKG flags + ! [ "$MAKEPKG_FLAGS" ] && MAKEPKG_FLAGS="-l y -c n" +diff --git a/checkinstallrc-dist b/checkinstallrc-dist +index d4feb4e..8b0e32a 100644 +--- a/checkinstallrc-dist ++++ b/checkinstallrc-dist +@@ -23,7 +23,7 @@ INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch + # included with checkinstall. If you want to use Slackware's native "makepkg" + # then set this to "makepkg" + +-MAKEPKG=/sbin/makepkg ++MAKEPKG=/bin/makepkg + + # makepkg optional flags. These are recommended if running a newer Slackware + # version: "-l y -c n" +-- +2.30.0 + diff --git a/0024-using-custom-cflag-and-ldflag.patch b/0024-using-custom-cflag-and-ldflag.patch new file mode 100644 index 000000000000..a216a12652c4 --- /dev/null +++ b/0024-using-custom-cflag-and-ldflag.patch @@ -0,0 +1,29 @@ +From 6beb3a86c459a9fc2d27a4c538286b199965a267 Mon Sep 17 00:00:00 2001 +From: Coelacanthus <coelacanthus@outlook.com> +Date: Sun, 31 Jan 2021 21:24:01 +0800 +Subject: [PATCH 2/2] using custom cflag and ldflag + +--- + installwatch/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/installwatch/Makefile b/installwatch/Makefile +index 4c7eb36..cf1be2f 100644 +--- a/installwatch/Makefile ++++ b/installwatch/Makefile +@@ -16,10 +16,10 @@ LIBDIR=$(PREFIX)/lib + all: installwatch.so + + installwatch.so: installwatch.o +- ld -shared -o installwatch.so installwatch.o -ldl -lc ++ ld -znow -shared -o installwatch.so installwatch.o -ldl -lc + + installwatch.o: installwatch.c localdecls.h +- gcc -Wall -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c ++ gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -c -g -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c + + localdecls.h: create-localdecls + ./create-localdecls +-- +2.30.0 + @@ -1,28 +1,104 @@ -# Maintainer: Nils Steinger (voidptr.de) +# Maintainer: Coelacanthus <coelacanthus@outlook.com> pkgname=checkinstall pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Track files modified by an installation script and create a Slackware, RPM or Debian package" arch=('i686' 'x86_64') url="http://checkinstall.izto.org" license=('GPL') depends=('bash' 'glibc') -optdepends=('dpkg: to create deb packages') +optdepends=('dpkg: to create deb packages' + 'rpm-tools: to create RPM packages' + ) makedepends=() provides=('installwatch') source=("http://checkinstall.izto.org/files/source/$pkgname-$pkgver.tar.gz" - "installwatch.patch" - "makefile.patch") + '0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch' + '0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch' + '0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch' + '0004-Fixed-bug-1-Source-directory-package-name-with-space.patch' + '0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch' + '0006-Added-Norwegian-translation-update-from-Andreas-Note.patch' + '0007-Added-summary-command-line-option.patch' + '0008-Fixed-glibc-minor-version-handling.patch' + '0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch' + '0010-Support-for-the-Makefile-PREFIX-variable.patch' + '0011-We-now-create-Slackware-packages-in-TMP_DIR.patch' + '0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch' + '0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch' + '0014-Fixed-typo-in-create-localdecls.patch' + '0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch' + '0016-Fixed-bug-38.-.spec-file-macro-processing.patch' + '0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch' + '0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch' + '0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch' + '0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch' + # Above is from git + '0021-Load-checkinstallrc-from-etc.patch' + '0022-Drop-cases-for-glibc-2.4.patch' + '0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch' + '0024-using-custom-cflag-and-ldflag.patch' + ) noextract=() -sha256sums=('dc61192cf7b8286d42c44abae6cf594ee52eafc08bfad0bea9d434b73dd593f4' - '91f99f594953c3fa1d4f6a41a7d3fa3b4a86c5187b325145336608ab49e10d32' - '46e60ae1c0b199051ac10e70dcad7dfc94508960e98885882b5d71a11fed7f0a') - +b2sums=('3faaebe60c0dc40f36de0ed1854817ecc2d11467e63611d79e2300af17af0708c67491fd0c0a947ded89fd6e53bb15faebf9a85445cabb97be6d21e24cdd70a9' + '994ee7e7664ce400c6cf4338cb348079064cf985278231485f0434b884278ce60dfa25b3e63377331871f95be2a608fda32409a19db4044c1cd2eb48c789a24b' + '9d94e308ae7534dc27c51516eb930abb99112180f493aacef786d3de6ee397c077876ff690558a4f742a2d4c5d97579f6a9582d90b2bab915f5c025f3a4a1782' + 'b113f336bbc9f555d52170e7745373067ac1bc21f12b99197eef091b08be6114ad2f6a61fa0f52a1eef246846245d64629beabc018ac8f7e1753c945720ebd28' + '9000e4e6de09ced649e5d8fb8e0f419232f0cab0cb6a489da1d4bb86039d66ee728ac9b0bb2c8d766c80841a1322038b1015c9be343a80b72e90038067759ceb' + '6112a545109e7838adc2495bf3287f6cf5a4365a08240562961acfec60a022cb5a90b4fe3d40c29639f82923c0f484efcc8797a3512b68d5c568b7334b1abff6' + 'd2d00dc4cc4ecd19c8f18397d084d2e1d12ccfdea797e787dcc32f6784411104f9716c2a49121f6e8291e3b46c41808b80ca4dada38dda63ac6d4a85e71dcb4b' + 'a7ae461f2848c4b2642b56ae8cf82a6706af86b4ed534f68ae4852c764e1d032daa141a5bec66d1c9685a2a4f468eacaee4dbe1f49da516932e8f970cb431d1b' + 'ea1146405145ae31114ebef8e69547fbe14965b01462cd75b378a4997896519c684a62c4a5f4b4972016d09d59fe2cf89e268164e5894728b0dbb151b000bd1f' + 'b33c580e6c4fb52831d6252c77342e6095bd2c323b1167bebe7d8486a0a4ccb3802df790b8208f2f054098fa904d553eab501853fe1a72e0307b7d571f8bd65d' + '13e7c097a10e5532cff125044b15a81fa8766bd4ebb26acf0fb7549fd5305e7b1c6b07d8b6ff29b025064fd6c0779cfeca58deaa74366be352cbe81d2372da2a' + '3b05766fc1754de8535de64eefd1b6719630cf825a3621734e848cdba2d1de7acd5a9598edf3e1862dbb4b2d9860660515a8e7528ddd9fcaba26362f3a2b9f97' + '4a88981a8bcbaae8a2cbeb3652601b9d17b9523b87f96e6c9228c2aca57e36e37b270a6e9862dab3ad3f9f2a7f60bf0e75f0b7376592930f36960818f72e5977' + 'a638683f5d2812424ba82b7e2f237d26c7b0d833d7c670cba984301c97eb97c26bdb347c458b809256a4303e343a7d12ed9912c8a76b1fc21f0fabe6cf880670' + '07f2569a9e0f94b832476303bf487c431b35301a63c711ed1104f2a88e27a7c52ab8e40011ccdebdde92f5f32ba1a7e1c5acc03f6e9afd6588703718ee4b623b' + 'd324ac1360699a99d9ad8aceb6b7201c06752bc62e55ee254508ea00dffbe0fb8fb6c9b2aaa54f73db876f8fbe90494d0048ab9c243b029f4e8bf1a7839c3f67' + '4a58e51416f4f18504c82b526725e21d1ad7c7bd7ee896b7e27f7ce0c68990db8a1db23670b0d8678e2800cb995ca24ebd29388254037dcf4ba5548d00bdc878' + '4ad781d59d911b36316bcbea2ce489f8a91fb26a0253fafa7cae6f1dcd8331995aba2faa16d693e6cbf03561d4f58d246ddb31da1fe99df14b62535914537d88' + 'f6e401290b06afaa5a22b37a7ca36ee6399af3c6565afc711a05e21b8150925cfb655b740330a236a46884b5d3098d272841dd08a95ba5ae165c790ee59fa620' + 'a947109b5010bbb349f608c6139d291daff6538af9e8fdf827f3c3184d1b47268a1b889d4870f80217b06e7594b1dbe59a917729f266bde676e8c1abb6ea4a7f' + '94bc1a97619f15617687f2fb65e15991bc6fcaabd09e866f1047cdaddbdf0e6e61cf9d91fdc7489fe76291c8539f4dad169dd8a68690188e3916b25cb37419f7' + '882d01f77fc57d977f2e63440c2b0a9f967a119fad0276bded5b43072880f8a29d163589b16270dcdd383d998973876d96eff4757b50d494a85eb8d292b28e4a' + 'fd919f347978a8ffcdefa3ca11000c80e341e72495d020238cc3dcf00f06f9e0fd77677bc4dee51ea7ffa596a7c305d547a91d63426c8386f6c353ffe07b05f5' + '8dde83a0cf2d490cc30e2787dd20dbc2d92b764b370002560309296b9592a7329e2b424e973a12b00d92ea89de42e2517bd3a95e6befe6c5f88a29e9793eba8b' + '414261dd6eb8112f26e93ea80faba698ea2b42ada99f0c10bceb0e8c1ff0636717b1c922fc9696f59bcb403af0e0ce1863d3e7b9c33643c3db5553379fb8597d') prepare() { cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/installwatch.patch" - patch -p1 -i "$srcdir/makefile.patch" + patch -p1 -t -i "$srcdir/0001-Felipe-Sateler-Tag-only-regular-files-as-conffiles.patch" + patch -p1 -t -i "$srcdir/0002-Backtick-patch-from-Andrey-Schmachev-Copyright-year-.patch" + patch -p1 -t -i "$srcdir/0003-Fixed-bug-3-Removed-extra-okfail-and-fixed-spanish-t.patch" + patch -p1 -t -i "$srcdir/0004-Fixed-bug-1-Source-directory-package-name-with-space.patch" + patch -p1 -t -i "$srcdir/0005-Applied-patch-from-Ladislav-Hagara-for-compiling-ins.patch" + patch -p1 -t -i "$srcdir/0006-Added-Norwegian-translation-update-from-Andreas-Note.patch" + patch -p1 -t -i "$srcdir/0007-Added-summary-command-line-option.patch" + patch -p1 -t -i "$srcdir/0008-Fixed-glibc-minor-version-handling.patch" + patch -p1 -t -i "$srcdir/0009-Fixed-warning-about-uninitialized-variable-in-fopen-.patch" + patch -p1 -t -i "$srcdir/0010-Support-for-the-Makefile-PREFIX-variable.patch" + patch -p1 -t -i "$srcdir/0011-We-now-create-Slackware-packages-in-TMP_DIR.patch" + patch -p1 -t -i "$srcdir/0012-Fixed-bug-110.-create-localdecls-correctly-identifie.patch" + patch -p1 -t -i "$srcdir/0013-Fixed-bug-23.-We-remove-empty-fields-from-the-Debian.patch" + patch -p1 -t -i "$srcdir/0014-Fixed-typo-in-create-localdecls.patch" + patch -p1 -t -i "$srcdir/0015-Fixed-bug-30.-Newlines-are-converted-to-underscores-.patch" + patch -p1 -t -i "$srcdir/0016-Fixed-bug-38.-.spec-file-macro-processing.patch" + patch -p1 -t -i "$srcdir/0017-Fixed-bug-112-make-install-fails-on-Fedora-21.patch" + patch -p1 -t -i "$srcdir/0018-Fixed-bug-137-Missing-in-copy_dir_hierarchy.patch" + patch -p1 -t -i "$srcdir/0019-Fixed-bug-35-Directories-in-etc-are-incorrectly-incl.patch" + patch -p1 -t -i "$srcdir/0020-add-support-for-recommends-and-suggests-AKA-weak-dep.patch" + patch -p1 -t -i "$srcdir/0021-Load-checkinstallrc-from-etc.patch" + patch -p1 -t -i "$srcdir/0022-Drop-cases-for-glibc-2.4.patch" + + # fix /usr/sbin merge to /usr/bin in Arch + # sed 's/sbin/bin/g' -i Makefile checkinstall.in checkinstallrc-dist + patch -p1 -t -i "$srcdir/0023-fix-usr-sbin-merge-to-usr-bin-in-Arch.patch" + + patch -p1 -t -i "$srcdir/0024-using-custom-cflag-and-ldflag.patch" + + # with 0021-Load-checkinstallrc-from-etc.patch + sed "s|CONFDIR=\$(PREFIX)/lib/checkinstall|CONFDIR=$pkgdir/etc|g" -i Makefile } build() { diff --git a/installwatch.patch b/installwatch.patch deleted file mode 100644 index c039f223ab70..000000000000 --- a/installwatch.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- checkinstall-1.6.2/installwatch/installwatch.c 2008-11-16 17:20:53.000000000 +0100 -+++ checkinstall-1.6.2.new/installwatch/installwatch.c 2017-09-07 14:42:30.193725688 +0200 -@@ -2939,10 +2939,10 @@ - } - - #if (GLIBC_MINOR <= 4) --int readlink(const char *path,char *buf,size_t bufsiz) { -+int iw_readlink(const char *path,char *buf,size_t bufsiz) { - int result; - #else --ssize_t readlink(const char *path,char *buf,size_t bufsiz) { -+ssize_t iw_readlink(const char *path,char *buf,size_t bufsiz) { - ssize_t result; - #endif - instw_t instw; -@@ -2952,7 +2952,7 @@ - initialize(); - - #if DEBUG -- debug(2,"readlink(\"%s\",%p,%ld)\n",path,buf,(long int)bufsiz); -+ debug(2,"iw_readlink(\"%s\",%p,%ld)\n",path,buf,(long int)bufsiz); - #endif - - /* We were asked to work in "real" mode */ -@@ -3077,7 +3077,7 @@ - return result; - } - --int scandir( const char *dir,struct dirent ***namelist, -+int iw_scandir( const char *dir,struct dirent ***namelist, - int (*select)(const struct dirent *), - int (*compar)(const void *,const void *) ) { - int result; -@@ -3086,7 +3086,7 @@ - initialize(); - - #if DEBUG -- debug(2,"scandir(%s,%p,%p,%p)\n",dir,namelist,select,compar); -+ debug(2,"iw_scandir(%s,%p,%p,%p)\n",dir,namelist,select,compar); - #endif - - /* We were asked to work in "real" mode */ -@@ -3689,7 +3689,7 @@ - return result; - } - --int scandir64( const char *dir,struct dirent64 ***namelist, -+int iw_scandir64( const char *dir,struct dirent64 ***namelist, - int (*select)(const struct dirent64 *), - int (*compar)(const void *,const void *) ) { - int result; -@@ -3698,7 +3698,7 @@ - initialize(); - - #if DEBUG -- debug(2,"scandir64(%s,%p,%p,%p)\n",dir,namelist,select,compar); -+ debug(2,"iw_scandir64(%s,%p,%p,%p)\n",dir,namelist,select,compar); - #endif - - /* We were asked to work in "real" mode */ diff --git a/makefile.patch b/makefile.patch deleted file mode 100644 index 40fe144fdcd5..000000000000 --- a/makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- checkinstall-1.6.2/Makefile 2008-11-12 03:43:53.000000000 +0100 -+++ checkinstall-1.6.2.patched/Makefile 2017-09-07 16:15:17.717595289 +0200 -@@ -2,7 +2,7 @@ - - # Where to install. - PREFIX=/usr/local --BINDIR=$(PREFIX)/sbin -+BINDIR=$(PREFIX)/bin - LCDIR=$(PREFIX)/lib/checkinstall/locale - CONFDIR=$(PREFIX)/lib/checkinstall - -@@ -22,17 +22,14 @@ - $(MAKE) -C installwatch - - install: all -- export -- $(MAKE) -C installwatch install -+ $(MAKE) -C installwatch PREFIX=$(PREFIX) install - - mkdir -p $(BINDIR) - install checkinstall makepak $(BINDIR) - for file in locale/*.mo ; do \ -- LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \ -- -e 's|\.mo||'` && \ -- mkdir -p $(LCDIR)/$${LANG}/LC_MESSAGES && \ -- cp $$file $(LCDIR)/$${LANG}/LC_MESSAGES/checkinstall.mo || \ -- exit 1 ; \ -+ LANG=`echo $$file | sed -e 's|locale/checkinstall-||' -e 's|\.mo||'`; \ -+ mkdir -v -p $(LCDIR)/$${LANG}/LC_MESSAGES; \ -+ cp -v $$file $(LCDIR)/$${LANG}/LC_MESSAGES/checkinstall.mo; \ - done - - mkdir -p $(CONFDIR) |