wok-next rev 21099

Update doxygen (1.8.15), git (2.20.1); add db5 (5.3.28)
TODO: switch to using /etc/daemons.conf.d/ in other packages too.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Jan 01 22:49:19 2019 +0200 (2019-01-01)
parents 6f5739796e82
children c88baf7ab6c5
files db5/description.txt db5/receipt doxygen/receipt git/receipt git/stuff/git-daemon git/stuff/git-daemon.conf
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/db5/description.txt	Tue Jan 01 22:49:19 2019 +0200
     1.3 @@ -0,0 +1,6 @@
     1.4 +Berkeley DB enables the development of custom data management solutions, without
     1.5 +the overhead traditionally associated with such custom projects. Berkeley DB 
     1.6 +provides a collection of well-proven building-block technologies that can be 
     1.7 +configured to address any application need from the hand-held device to the 
     1.8 +datacenter, from a local storage solution to a world-wide distributed one, from 
     1.9 +kilobytes to petabytes.
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/db5/receipt	Tue Jan 01 22:49:19 2019 +0200
     2.3 @@ -0,0 +1,50 @@
     2.4 +# SliTaz package receipt v2.
     2.5 +
     2.6 +PACKAGE="db5"
     2.7 +VERSION="5.3.28"
     2.8 +CATEGORY="misc"
     2.9 +SHORT_DESC="Berkeley database system"
    2.10 +MAINTAINER="pascal.bellard@slitaz.org"
    2.11 +LICENSE="BSD"
    2.12 +WEB_SITE="https://www.oracle.com/database/berkeley-db/db.html"
    2.13 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/server/db.html"
    2.14 +
    2.15 +TARBALL="db-$VERSION.tar.gz"
    2.16 +WGET_URL="https://download.oracle.com/berkeley-db/$TARBALL"
    2.17 +TARBALL_SHA1="fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9"
    2.18 +
    2.19 +COOKOPTS="force-arch" # different .h
    2.20 +
    2.21 +SPLIT="$PACKAGE-dev lib$PACKAGE lib$PACKAGE-cxx $PACKAGE"
    2.22 +
    2.23 +COPY_dev="@dev libdb.so libdb_cxx.so" # put unversioned symlinks here to avoid confision with db6
    2.24 +COPY_libdb5="libdb-*so"
    2.25 +COPY_libdb5_cxx="libdb_cxx-*so"
    2.26 +
    2.27 +DEPENDS_std="lib$PACKAGE"
    2.28 +DEPENDS_libdb5=" "
    2.29 +DEPENDS_libdb5_cxx=" "
    2.30 +
    2.31 +CAT_libdb5="libs|libraries"
    2.32 +CAT_libdb5_cxx="libs|libraries for C++ support"
    2.33 +
    2.34 +TAGS_std="database"
    2.35 +
    2.36 +compile_rules() {
    2.37 +	# fix for compilation with current versions of g++
    2.38 +	sed -i 's/\(__atomic_compare_exchange\)/\1_db/' src/dbinc/atomic.h
    2.39 +
    2.40 +	cd $src/build_unix
    2.41 +	../dist/configure \
    2.42 +		--enable-cxx \
    2.43 +		--enable-compat185 \
    2.44 +		--enable-dbm \
    2.45 +		--disable-static \
    2.46 +		$CONFIGURE_ARGS &&
    2.47 +	make &&
    2.48 +	make docdir=/usr/share/doc/$PACKAGE-$VERSION install || return 1
    2.49 +
    2.50 +	find $install -type f -exec chmod u+w '{}' \; # 444->644, 555->755
    2.51 +	find $install -type d -exec chmod g-w '{}' \; # 775->755
    2.52 +	chown -R 0:0 $install
    2.53 +}
     3.1 --- a/doxygen/receipt	Tue Jan 01 15:48:26 2019 +0200
     3.2 +++ b/doxygen/receipt	Tue Jan 01 22:49:19 2019 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="doxygen"
     3.7 -VERSION="1.8.14"
     3.8 +VERSION="1.8.15"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="Source code documentation generator tool"
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12 @@ -11,7 +11,7 @@
    3.13  
    3.14  TARBALL="$PACKAGE-$VERSION.src.tar.gz"
    3.15  WGET_URL="http://doxygen.nl/files/$TARBALL"
    3.16 -TARBALL_SHA1="8f999c95d1e42d725b7cd55bef0ed2a841eb0b34"
    3.17 +TARBALL_SHA1="bb5d7456a7ff63768e8755762860d64debd3a4ff"
    3.18  
    3.19  BUILD_DEPENDS="cmake python" # graphviz
    3.20  
     4.1 --- a/git/receipt	Tue Jan 01 15:48:26 2019 +0200
     4.2 +++ b/git/receipt	Tue Jan 01 22:49:19 2019 +0200
     4.3 @@ -1,46 +1,37 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="git"
     4.7 -VERSION="2.17.1"
     4.8 +VERSION="2.20.1"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="Fast version control system"
    4.11  MAINTAINER="devel@slitaz.org"
    4.12  LICENSE="GPL2"
    4.13  WEB_SITE="https://git-scm.com/"
    4.14 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/git.html"
    4.15  
    4.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    4.17  WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
    4.18 +TARBALL_SHA1="58dca49db21f4bebf56f8861f15800f1c57c5ee3"
    4.19  
    4.20 -BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
    4.21 -tar bzip2 gettext"
    4.22 +BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev tar \
    4.23 +bzip2 gettext"
    4.24 +DEPENDS="zlib openssl curl expat"
    4.25 +
    4.26 +CONFIG_FILES="/etc/gitconfig /etc/daemons.conf.d/git-daemon.conf"
    4.27  
    4.28  compile_rules() {
    4.29  	./configure \
    4.30  		--prefix=/usr \
    4.31  		--with-gitconfig=/etc/gitconfig \
    4.32 -		--libexecdir=/usr/lib \
    4.33  		--without-tcltk \
    4.34  		$CONFIGURE_ARGS &&
    4.35  	make THREADED_DELTA_SEARCH=1 &&
    4.36 -	make THREADED_DELTA_SEARCH=1 DESTDIR=$install install || return 1
    4.37 +	make \
    4.38 +		THREADED_DELTA_SEARCH=1 \
    4.39 +		INSTALL_SYMLINKS=1 \
    4.40 +		DESTDIR=$install install || return 1
    4.41  
    4.42 -	install -Dm755 $stuff/git-daemon $install/etc/init.d/git-daemon
    4.43 +	install -Dm755 $stuff/git-daemon      $install/etc/init.d/git-daemon
    4.44 +	install -Dm644 $stuff/git-daemon.conf $install/etc/daemons.conf.d/git-daemon.conf
    4.45 +	mkdir -p $install/var/www/git/
    4.46  }
    4.47 -
    4.48 -genpkg_rules() {
    4.49 -	copy @std
    4.50 -	DEPENDS="zlib openssl curl expat"
    4.51 -}
    4.52 -
    4.53 -# edit daemons.conf.
    4.54 -post_install() {
    4.55 -	if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then
    4.56 -		mkdir -p "$1/var/www/git"
    4.57 -		cat >> "$1/etc/daemons.conf" <<EOT
    4.58 -# Git daemon options.
    4.59 -GIT_REPO="/var/www/git/"
    4.60 -GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
    4.61 -
    4.62 -EOT
    4.63 -	fi
    4.64 -}
     5.1 --- a/git/stuff/git-daemon	Tue Jan 01 15:48:26 2019 +0200
     5.2 +++ b/git/stuff/git-daemon	Tue Jan 01 22:49:19 2019 +0200
     5.3 @@ -1,54 +1,54 @@
     5.4  #!/bin/sh
     5.5 -# /etc/init.d/git-daemon: Start, stop and restart git-daemon daemon on SliTaz, at boot
     5.6 -# time or with the command line.
     5.7 +# /etc/init.d/git-daemon: Start, stop and restart git-daemon daemon on SliTaz,
     5.8 +# at boot time or with the command line.
     5.9  #
    5.10 -# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
    5.11 -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
    5.12 +# To start daemon at boot time, just put the 'git-daemon' in the $RUN_DAEMONS
    5.13 +# variable of /etc/rcS.conf and configure options with
    5.14 +# /etc/daemons.conf.d/git-daemon.conf
    5.15  #
    5.16  . /etc/init.d/rc.functions
    5.17 -. /etc/daemons.conf
    5.18 +. /etc/daemons.conf.d/git-daemon.conf
    5.19  
    5.20  NAME=git-daemon
    5.21  DESC="$(_ '%s daemon' Git)"
    5.22  DAEMON=/usr/lib/git-core/git-daemon
    5.23 -OPTIONS=$GIT_OPTIONS
    5.24  PIDFILE=/var/run/git-daemon.pid
    5.25  
    5.26  case "$1" in
    5.27 -  start)
    5.28 -    if active_pidfile $PIDFILE git-daemon ; then
    5.29 -      _ '%s is already running.' $NAME
    5.30 -      exit 1
    5.31 -    fi
    5.32 -    action 'Starting %s: %s...' "$DESC" $NAME
    5.33 -    $DAEMON --pid-file=$PIDFILE $OPTIONS
    5.34 -    status
    5.35 -    ;;
    5.36 -  stop)
    5.37 -    if ! active_pidfile $PIDFILE git-daemon ; then
    5.38 -      _ '%s is not running.' $NAME
    5.39 -      exit 1
    5.40 -    fi
    5.41 -    action 'Stopping %s: %s...' "$DESC" $NAME
    5.42 -    kill $(cat $PIDFILE)
    5.43 -    status
    5.44 -    ;;
    5.45 -  restart)
    5.46 -    if ! active_pidfile $PIDFILE git-daemon ; then
    5.47 -      _ '%s is not running.' $NAME
    5.48 -      exit 1
    5.49 -    fi
    5.50 -    action 'Restarting %s: %s...' "$DESC" $NAME
    5.51 -    kill $(cat $PIDFILE)
    5.52 -    sleep 2
    5.53 -    $DAEMON $OPTIONS
    5.54 -    status
    5.55 -    ;;
    5.56 -  *)
    5.57 -    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    5.58 -    newline
    5.59 -    exit 1
    5.60 -    ;;
    5.61 +	start)
    5.62 +		if active_pidfile $PIDFILE $NAME; then
    5.63 +			_ '%s is already running.' $NAME
    5.64 +			exit 1
    5.65 +		fi
    5.66 +		action 'Starting %s: %s...' "$DESC" $NAME
    5.67 +		$DAEMON --pid-file=$PIDFILE $OPTIONS
    5.68 +		status
    5.69 +		;;
    5.70 +	stop)
    5.71 +		if ! active_pidfile $PIDFILE $NAME; then
    5.72 +			_ '%s is not running.' $NAME
    5.73 +			exit 1
    5.74 +		fi
    5.75 +		action 'Stopping %s: %s...' "$DESC" $NAME
    5.76 +		kill $(cat $PIDFILE)
    5.77 +		status
    5.78 +		;;
    5.79 +	restart)
    5.80 +		if ! active_pidfile $PIDFILE $NAME; then
    5.81 +			_ '%s is not running.' $NAME
    5.82 +			exit 1
    5.83 +		fi
    5.84 +		action 'Restarting %s: %s...' "$DESC" $NAME
    5.85 +		kill $(cat $PIDFILE)
    5.86 +		sleep 2
    5.87 +		$DAEMON $OPTIONS
    5.88 +		status
    5.89 +		;;
    5.90 +	*)
    5.91 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    5.92 +		newline
    5.93 +		exit 1
    5.94 +		;;
    5.95  esac
    5.96  
    5.97  exit 0
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/git/stuff/git-daemon.conf	Tue Jan 01 22:49:19 2019 +0200
     6.3 @@ -0,0 +1,3 @@
     6.4 +# Git daemon options.
     6.5 +GIT_REPO="/var/www/git/"
     6.6 +OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"