Accepting request 547590 from devel:tools:scm
git 2.15.1 (bsc#1069803) OBS-URL: https://build.opensuse.org/request/show/547590 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=210
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
9769591655
commit
6426de801e
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a
|
||||
size 4892056
|
||||
BIN
git-2.15.1.tar.sign
Normal file
BIN
git-2.15.1.tar.sign
Normal file
Binary file not shown.
3
git-2.15.1.tar.xz
Normal file
3
git-2.15.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
|
||||
size 4894768
|
||||
134
git-daemon.init
134
git-daemon.init
@ -1,134 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# SUSE system startup script for git-daemon
|
||||
# Copyright (C) 1995-2008 SUSE / Novell Inc.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or (at
|
||||
# your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
|
||||
# USA.
|
||||
#
|
||||
# /etc/init.d/git-daemon
|
||||
# and its symbolic link
|
||||
# /usr/sbin/rcgit-daemon
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: git-daemon
|
||||
# Required-Start: $syslog $remote_fs $network
|
||||
# Required-Stop: $syslog $remote_fs
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: server for git repositories
|
||||
# Description: server for git repositories
|
||||
### END INIT INFO
|
||||
|
||||
if test -x /usr/lib64/git/git-daemon; then
|
||||
git_daemon=/usr/lib64/git/git-daemon
|
||||
elif test -x /usr/lib/git/git-daemon; then
|
||||
git_daemon=/usr/lib/git/git-daemon
|
||||
else
|
||||
echo "git-daemon not installed"
|
||||
if [ "$1" = "stop" ]; then
|
||||
exit 0
|
||||
else
|
||||
exit 5
|
||||
fi
|
||||
fi
|
||||
|
||||
pidfile=/var/run/git-daemon.pid
|
||||
|
||||
# Check for existence of needed config file and read it
|
||||
git_daemon_config=/etc/sysconfig/git-daemon
|
||||
test -r $git_daemon_config || { echo "$git_daemon_config not existing";
|
||||
if [ "$1" = "stop" ]; then exit 0;
|
||||
else exit 6; fi; }
|
||||
|
||||
# Read config
|
||||
. $git_daemon_config
|
||||
|
||||
: ${GIT_DAEMON_BASE_PATH:=/srv/git}
|
||||
|
||||
: ${GIT_DAEMON_USER:=git-daemon}
|
||||
: ${GIT_DAEMON_GROUP:=nogroup}
|
||||
|
||||
. /etc/rc.status
|
||||
|
||||
# Reset status of this service
|
||||
rc_reset
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting git-daemon "
|
||||
export HOME="$GIT_DAEMON_BASE_PATH"
|
||||
/sbin/startproc -p $pidfile $git_daemon \
|
||||
--syslog \
|
||||
--detach \
|
||||
--reuseaddr \
|
||||
--user=${GIT_DAEMON_USER} \
|
||||
--group=${GIT_DAEMON_GROUP} \
|
||||
--pid-file=$pidfile \
|
||||
--base-path="$GIT_DAEMON_BASE_PATH" \
|
||||
$GIT_DAEMON_ARGS
|
||||
|
||||
rc_status -v
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down git-daemon "
|
||||
/sbin/killproc -p $pidfile $git_daemon -TERM
|
||||
rc_status -v
|
||||
;;
|
||||
try-restart|condrestart)
|
||||
if test "$1" = "condrestart"; then
|
||||
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
|
||||
fi
|
||||
$0 status
|
||||
if test $? = 0; then
|
||||
$0 restart
|
||||
else
|
||||
rc_reset # Not running is not a failure.
|
||||
fi
|
||||
rc_status
|
||||
;;
|
||||
restart)
|
||||
## Stop the service and regardless of whether it was
|
||||
## running or not, start it again.
|
||||
$0 stop
|
||||
$0 start
|
||||
|
||||
# Remember status and be quiet
|
||||
rc_status
|
||||
;;
|
||||
force-reload)
|
||||
$0 try-restart
|
||||
rc_status
|
||||
;;
|
||||
reload)
|
||||
echo -n "Reload service git-daemon "
|
||||
## does not support reload
|
||||
rc_failed 3
|
||||
rc_status -v
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for service git-daemon "
|
||||
/sbin/checkproc -p $pidfile $git_daemon
|
||||
rc_status -v
|
||||
;;
|
||||
probe)
|
||||
test $git_daemon_config -nt $pidfile && echo reload
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
rc_exit
|
||||
16
git-daemon.service
Normal file
16
git-daemon.service
Normal file
@ -0,0 +1,16 @@
|
||||
[Unit]
|
||||
Description=Start Git Daemon
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/git-daemon
|
||||
ExecStart=/bin/sh -c 'exec git daemon --reuseaddr --base-path=${GIT_DAEMON_BASE_PATH:-/srv/git/} --user=${GIT_DAEMON_USER:-git-daemon} --group=${GIT_DAEMON_GROUP:-nogroup} $GIT_DAEMON_ARGS'
|
||||
|
||||
Restart=always
|
||||
RestartSec=500ms
|
||||
|
||||
StandardOutput=syslog
|
||||
StandardError=syslog
|
||||
SyslogIdentifier=git-daemon
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
17
git.changes
17
git.changes
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 1 01:48:24 UTC 2017 - aavindraa@gmail.com
|
||||
|
||||
- git 2.15.1:
|
||||
* fix "auto" column output
|
||||
* fixes to moved lines diffing
|
||||
* documentation updates
|
||||
* fix use of repositories immediately under the root directory
|
||||
* improve usage of libsecret
|
||||
* fixes to various error conditions in git commands
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 28 15:14:59 CET 2017 - tiwai@suse.de
|
||||
|
||||
- Rewrite from sysv init to systemd unit file for git-daemon
|
||||
(bsc#1069803)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 13:50:00 UTC 2017 - rbrown@suse.com
|
||||
|
||||
|
||||
29
git.spec
29
git.spec
@ -33,7 +33,7 @@
|
||||
%bcond_without docs
|
||||
|
||||
Name: git
|
||||
Version: 2.15.0
|
||||
Version: 2.15.1
|
||||
Release: 0
|
||||
Summary: Fast, scalable, distributed revision control system
|
||||
License: GPL-2.0
|
||||
@ -44,7 +44,7 @@ Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.t
|
||||
Source7: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign
|
||||
Source1: apache2-gitweb.conf
|
||||
Source2: sysconfig.git-daemon
|
||||
Source3: git-daemon.init
|
||||
Source3: git-daemon.service
|
||||
Source4: git.xinetd
|
||||
Source5: usr.share.git-web.gitweb.cgi
|
||||
Source6: susefirewall-git-daemon
|
||||
@ -83,10 +83,12 @@ BuildRequires: pcre2-devel
|
||||
BuildRequires: perl-Error
|
||||
BuildRequires: python3
|
||||
BuildRequires: sgml-skel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: tcsh
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: xz
|
||||
%{?systemd_requires}
|
||||
Requires: git-core = %{version}
|
||||
Recommends: git-svn git-cvs git-email gitk git-gui
|
||||
Suggests: git-daemon git-web
|
||||
@ -210,7 +212,7 @@ Email interface for the GIT version control system.
|
||||
Summary: Simple Server for Git Repositories
|
||||
Group: Development/Tools/Version Control
|
||||
Requires: git-core = %{version}
|
||||
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq
|
||||
PreReq: /usr/sbin/useradd %fillup_prereq
|
||||
|
||||
%description daemon
|
||||
A really simple TCP git daemon. In the default configuration it allows
|
||||
@ -311,10 +313,10 @@ install -d %{buildroot}/usr/share/git-web
|
||||
install -d %{buildroot}/etc/apache2/conf.d
|
||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf
|
||||
### git-daemon
|
||||
install -d -m 755 $RPM_BUILD_ROOT/etc/init.d
|
||||
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_unitdir}
|
||||
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/git-daemon.service
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
|
||||
ln -s ../../etc/init.d/git-daemon $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
|
||||
ln -s /usr/sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_fillupdir}
|
||||
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.git-daemon
|
||||
install -d -m 755 $RPM_BUILD_ROOT/srv/git
|
||||
@ -393,16 +395,17 @@ cat %{name}.lang >>bin-man-doc-files
|
||||
if ! /usr/bin/getent passwd git-daemon >/dev/null; then
|
||||
/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "git daemon" -g nogroup git-daemon || :
|
||||
fi
|
||||
%service_add_pre git-daemon.service
|
||||
|
||||
%post daemon
|
||||
%{fillup_and_insserv -n git-daemon}
|
||||
|
||||
%postun daemon
|
||||
%{restart_on_update git-daemon}
|
||||
%{insserv_cleanup}
|
||||
%{fillup_only -n git-daemon}
|
||||
%service_add_post git-daemon.service
|
||||
|
||||
%preun daemon
|
||||
%{stop_on_removal git-daemon}
|
||||
%service_del_preun git-daemon.service
|
||||
|
||||
%postun daemon
|
||||
%service_del_postun git-daemon.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -451,7 +454,7 @@ fi
|
||||
%files daemon
|
||||
%defattr(-,root,root)
|
||||
%{gitexecdir}/git-daemon
|
||||
/etc/init.d/git-daemon
|
||||
%{_unitdir}/git-daemon.service
|
||||
%{_sbindir}/rcgit-daemon
|
||||
%dir /srv/git
|
||||
%{_fillupdir}/sysconfig.git-daemon
|
||||
|
||||
Loading…
Reference in New Issue
Block a user