From 37fcce65bd5c97cfc83dab0bc34fdbdcbc03cb52 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 1 Mar 2022 12:58:26 -0500 Subject: network/jigdo: Updated for version 0.8.1. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- network/jigdo/fix_man_page_build.diff | 29 +++++++++++++++++ network/jigdo/jigdo-0.7.3-gcc7.patch | 39 ----------------------- network/jigdo/jigdo.SlackBuild | 57 +++++++++++++++++++--------------- network/jigdo/jigdo.info | 10 +++--- network/jigdo/jigdo_0.7.3-3.diff.gz | Bin 14151 -> 0 bytes 5 files changed, 67 insertions(+), 68 deletions(-) create mode 100644 network/jigdo/fix_man_page_build.diff delete mode 100644 network/jigdo/jigdo-0.7.3-gcc7.patch delete mode 100644 network/jigdo/jigdo_0.7.3-3.diff.gz diff --git a/network/jigdo/fix_man_page_build.diff b/network/jigdo/fix_man_page_build.diff new file mode 100644 index 0000000000..2a23ee8cff --- /dev/null +++ b/network/jigdo/fix_man_page_build.diff @@ -0,0 +1,29 @@ +diff -Naur jigdo-0.8.1/doc/Makefile.in jigdo-0.8.1.patched/doc/Makefile.in +--- jigdo-0.8.1/doc/Makefile.in 2021-10-31 14:09:53.000000000 -0400 ++++ jigdo-0.8.1.patched/doc/Makefile.in 2022-03-01 12:34:10.348574996 -0500 +@@ -15,12 +15,9 @@ + .SUFFIXES: .1 .sgml .html + + .sgml.1: +- mkdir -p tmp && cp "$<" tmp \ +- && cd tmp && $(DOCBOOK2MAN) "`echo $< | sed 's%.*/%%'`" +- sed -e 's/ */ /g' <"`ls tmp/*.1`" >"$@" +- rm -rf tmp +-# sed -e 's%\\%\\\\%g;' <"$<" | tr -s '[:space:]' ' ' \ +-# | $(DOCBOOKTOMAN) - >"$@" ++ $(DOCBOOK2MAN) $< ++ mv $(subst .1,.en.1,$@) $@ ++ + .sgml.html: + rm -f "$@" + $(DOCBOOK2HTML) "$<" --nochunks +@@ -32,8 +29,7 @@ + .PHONY: all clean distclean mostlyclean maintainer-clean \ + dep depend doc check + all: jigdo-file.1 jigdo-file.html jigdo-lite.1 jigdo-lite.html \ +- jigdo-mirror.1 jigdo-mirror.html \ +- debian-jigdo-mini-howto.html ++ jigdo-mirror.1 jigdo-mirror.html + doc mostlyclean dep depend check: ; + + clean: Makefile diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch deleted file mode 100644 index d5f0c8a4d0..0000000000 --- a/network/jigdo/jigdo-0.7.3-gcc7.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc ---- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200 -+++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +0100 -@@ -285,27 +285,27 @@ - //______________________________________________________________________ - - namespace { -- const int SIZE_WIDTH = 12; -+ const int size_width = 12; - } - - ostream& JigdoDesc::ImageInfo::put(ostream& s) const { -- s << "image-info " << setw(SIZE_WIDTH) << size() << " " -+ s << "image-info " << setw(size_width) << size() << " " - << md5() << ' ' << blockLength() << '\n'; - return s; - } - ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { -- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << '\n'; -+ s << "in-template " << setw(size_width) << offset() << ' ' -+ << setw(size_width) << size() << '\n'; - return s; - } - ostream& JigdoDesc::MatchedFile::put(ostream& s) const { -- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "need-file " << setw(size_width) << offset() << ' ' -+ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - ostream& JigdoDesc::WrittenFile::put(ostream& s) const { -- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "have-file " << setw(size_width) << offset() << ' ' -+ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild index 68572c5ee7..c5939333f0 100644 --- a/network/jigdo/jigdo.SlackBuild +++ b/network/jigdo/jigdo.SlackBuild @@ -21,25 +21,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0. +# - update for v0.8.1, which was released in 2021. the old version +# was from 2009... + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jigdo -VERSION=${VERSION:-0.7.3} +VERSION=${VERSION:-0.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -49,8 +50,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -63,7 +64,6 @@ else LIBDIRSUFFIX="" fi -DOCS="README THANKS changelog doc/TechDetails.txt doc/Hacking.txt" set -e @@ -71,20 +71,24 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# apply some patches from debian -zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1 - -# Fic for gcc-7.x, thanks fedora! -patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch + -exec chmod 644 {} \+ + +# 20220301 bkw: doc/Makefile.in has some confusing looking stuff that +# didn't work properly. It would work with some version of docbook2man +# (one that doesn't print "Working on " on stdout, and does +# print whatever the sed stuff was expecting to see). There's a much +# cleaner way to do it, using make's $(subst) macro. Also, don't try +# to build debian-jigdo-mini-howto.html because it's for some other +# version of docbook2man. I took the built HTML file from a Debian +# package and made it a separate download. +patch -p1 < $CWD/fix_man_page_build.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -97,17 +101,20 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +strip $PKG/usr/bin/$PRGNAM-file -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# 20220301 bkw: man pages get installed +x, sigh. +chmod 644 $PKG/usr/man/man*/* +gzip -9 $PKG/usr/man/man*/* -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +DOCS="COPYING README THANKS changelog doc/TechDetails.txt doc/Hacking.txt" +HOWTO="debian-jigdo-mini-howto.html" -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mv $PKG/usr/share/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a $DOCS $PKGDOC +zcat $CWD/$HOWTO.gz > $PKGDOC/$HOWTO +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/jigdo/jigdo.info b/network/jigdo/jigdo.info index 6e7167895b..c5236d8e67 100644 --- a/network/jigdo/jigdo.info +++ b/network/jigdo/jigdo.info @@ -1,8 +1,10 @@ PRGNAM="jigdo" -VERSION="0.7.3" -HOMEPAGE="http://atterer.org/jigdo/" -DOWNLOAD="http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2" -MD5SUM="bbc1d9ac750bb34e0748f0b57157cc72" +VERSION="0.8.1" +HOMEPAGE="https://www.einval.com/~steve/software/jigdo/" +DOWNLOAD="https://www.einval.com/~steve/software/jigdo/download/jigdo-0.8.1.tar.xz \ + https://slackware.uk/~urchlay/src/debian-jigdo-mini-howto.html.gz" +MD5SUM="de08a463f3b2c52089bfd582fed3cdff \ + bfd371e320fa9b48bb86383e3b66341d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/jigdo/jigdo_0.7.3-3.diff.gz b/network/jigdo/jigdo_0.7.3-3.diff.gz deleted file mode 100644 index 43a8349d7d..0000000000 Binary files a/network/jigdo/jigdo_0.7.3-3.diff.gz and /dev/null differ -- cgit v1.2.3-80-g2a13