wok-current rev 24602
updated git (2.26.2 -> 2.35.1)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Wed Mar 02 09:04:56 2022 +0100 (2022-03-02) |
| parents | 0a4466bbdeb0 |
| children | 048ed88bf832 |
| files | git-lang/receipt git/description.txt git/receipt git/stuff/git-daemon |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/git-lang/receipt Wed Mar 02 09:04:56 2022 +0100 1.3 @@ -0,0 +1,17 @@ 1.4 +# SliTaz package receipt. 1.5 + 1.6 +PACKAGE="git-lang" 1.7 +VERSION="2.35.1" 1.8 +CATEGORY="localization" 1.9 +SHORT_DESC="Fast version control system - localised messages." 1.10 +MAINTAINER="maintainer@slitaz.org" 1.11 +LICENSE="GPL2" 1.12 +WEB_SITE="https://git-scm.com/" 1.13 + 1.14 +WANTED="git" 1.15 + 1.16 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.17 +genpkg_rules() 1.18 +{ 1.19 + cook_copy_folders locale 1.20 +}
2.1 --- a/git/description.txt Wed Mar 02 07:52:09 2022 +0100 2.2 +++ b/git/description.txt Wed Mar 02 09:04:56 2022 +0100 2.3 @@ -1,2 +1,2 @@ 2.4 -Git is a free & open source, distributed version control system designed to 2.5 +Git is a free and open source, distributed version control system designed to 2.6 handle everything from small to very large projects with speed and efficiency.
3.1 --- a/git/receipt Wed Mar 02 07:52:09 2022 +0100 3.2 +++ b/git/receipt Wed Mar 02 09:04:56 2022 +0100 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="git" 3.7 -VERSION="2.26.2" 3.8 +VERSION="2.35.1" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Fast version control system." 3.11 MAINTAINER="b1+slitaz@nagel.org" 3.12 @@ -11,6 +11,7 @@ 3.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 3.14 WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL" 3.15 3.16 +SUGGESTED="git-lang" 3.17 DEPENDS="cacerts curl expat openssl zlib" 3.18 BUILD_DEPENDS="curl-dev expat-dev openssl-dev perl python-dev zlib-dev" 3.19 3.20 @@ -33,8 +34,8 @@ 3.21 --libexecdir=/usr/lib \ 3.22 --without-tcltk \ 3.23 $CONFIGURE_ARGS && 3.24 - make -j 1 THREADED_DELTA_SEARCH=1 && 3.25 - make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install 3.26 + make THREADED_DELTA_SEARCH=1 && 3.27 + make install THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR 3.28 } 3.29 3.30 # Rules to gen a SliTaz package suitable for Tazpkg. 3.31 @@ -43,7 +44,10 @@ 3.32 mkdir -p $fs/etc/init.d 3.33 3.34 cp -a $stuff/git-daemon $fs/etc/init.d 3.35 - cp -a $install/usr $fs/ 3.36 + cp -a $install/usr $fs 3.37 + 3.38 + # moved to package git-lang 3.39 + rm -rf $fs/usr/share/locale 3.40 3.41 strip -s $fs/usr/lib/git-core/* 2>/dev/null || true 3.42 } 3.43 @@ -51,11 +55,12 @@ 3.44 # edit daemons.conf. 3.45 post_install() 3.46 { 3.47 - if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then 3.48 + if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf" 3.49 + then 3.50 mkdir -p "$1/var/www/git" 3.51 - echo '# Git daemon options.' >> "$1/etc/daemons.conf" 3.52 - echo 'GIT_REPO="/var/www/git/"' >> "$1/etc/daemons.conf" 3.53 - echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> "$1/etc/daemons.conf" 3.54 - echo '' >> "$1/etc/daemons.conf" 3.55 + echo '# Git daemon options. 3.56 +GIT_REPO="/var/www/git/" 3.57 +GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" 3.58 +' >> "$1/etc/daemons.conf" 3.59 fi 3.60 }
4.1 --- a/git/stuff/git-daemon Wed Mar 02 07:52:09 2022 +0100 4.2 +++ b/git/stuff/git-daemon Wed Mar 02 09:04:56 2022 +0100 4.3 @@ -1,8 +1,8 @@ 4.4 #!/bin/sh 4.5 -# /etc/init.d/git-daemon: Start, stop and restart git-daemon daemon on SliTaz, at boot 4.6 -# time or with the command line. 4.7 +# /etc/init.d/git-daemon: Start, stop and restart git daemon on SliTaz, 4.8 +# at boot time or with the command line. 4.9 # 4.10 -# To start daemon at boot time, just put the right name in the $RUN_DAEMONS 4.11 +# To start git daemon at boot time, just put git-daemon in the $RUN_DAEMONS 4.12 # variable of /etc/rcS.conf and configure options with /etc/daemons.conf. 4.13 # 4.14 . /etc/init.d/rc.functions 4.15 @@ -15,40 +15,43 @@ 4.16 PIDFILE=/var/run/git-daemon.pid 4.17 4.18 case "$1" in 4.19 - start) 4.20 - if active_pidfile $PIDFILE git-daemon ; then 4.21 - _ '%s is already running.' $NAME 4.22 - exit 1 4.23 - fi 4.24 - action 'Starting %s: %s...' "$DESC" $NAME 4.25 - $DAEMON --pid-file=$PIDFILE $OPTIONS 4.26 - status 4.27 - ;; 4.28 - stop) 4.29 - if ! active_pidfile $PIDFILE git-daemon ; then 4.30 - _ '%s is not running.' $NAME 4.31 - exit 1 4.32 - fi 4.33 - action 'Stopping %s: %s...' "$DESC" $NAME 4.34 - kill $(cat $PIDFILE) 4.35 - status 4.36 - ;; 4.37 - restart) 4.38 - if ! active_pidfile $PIDFILE git-daemon ; then 4.39 - _ '%s is not running.' $NAME 4.40 - exit 1 4.41 - fi 4.42 - action 'Restarting %s: %s...' "$DESC" $NAME 4.43 - kill $(cat $PIDFILE) 4.44 - sleep 2 4.45 - $DAEMON $OPTIONS 4.46 - status 4.47 - ;; 4.48 - *) 4.49 - emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 4.50 - newline 4.51 - exit 1 4.52 - ;; 4.53 + (start) 4.54 + if active_pidfile $PIDFILE $NAME 4.55 + then 4.56 + _ '%s is already running.' $NAME 4.57 + exit 1 4.58 + fi 4.59 + action 'Starting %s: %s...' "$DESC" $NAME 4.60 + $DAEMON --pid-file=$PIDFILE $OPTIONS 4.61 + status 4.62 + ;; 4.63 + (stop) 4.64 + if ! active_pidfile $PIDFILE $NAME 4.65 + then 4.66 + _ '%s is not running.' $NAME 4.67 + exit 1 4.68 + fi 4.69 + action 'Stopping %s: %s...' "$DESC" $NAME 4.70 + kill $(cat $PIDFILE) 4.71 + status 4.72 + ;; 4.73 + (restart) 4.74 + if ! active_pidfile $PIDFILE $NAME 4.75 + then 4.76 + _ '%s is not running.' $NAME 4.77 + exit 1 4.78 + fi 4.79 + action 'Restarting %s: %s...' "$DESC" $NAME 4.80 + kill $(cat $PIDFILE) 4.81 + sleep 2 4.82 + $DAEMON --pid-file=$PIDFILE $OPTIONS 4.83 + status 4.84 + ;; 4.85 + (*) 4.86 + emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 4.87 + newline 4.88 + exit 1 4.89 + ;; 4.90 esac 4.91 4.92 exit 0