commit git for openSUSE:Factory
Hello community,
here is the log from the commit of package git for openSUSE:Factory
checked in at Thu Jan 8 18:10:07 CET 2009.
--------
--- git/git.changes 2008-11-19 08:55:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/git/git.changes 2009-01-08 16:33:31.590954000 +0100
@@ -1,0 +2,23 @@
+Thu Jan 8 15:55:42 CET 2009 - tiwai@suse.de
+
+- updated to 1.6.1:
+ * handle properly the exit code when pager is used
+ * various git-gui updates including translations
+ * gitweb updates
+ * many other improvements / fixes. See release notes
+ http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt
+
+-------------------------------------------------------------------
+Fri Dec 19 14:04:40 CET 2008 - lnussel@suse.de
+
+- add apparmor profile for git-web
+- don't use %jobs for generating docu
+- change gitexecdir to /usr/lib instead of %_libdir
+
+-------------------------------------------------------------------
+Wed Dec 17 09:35:17 CET 2008 - tiwai@suse.de
+
+- Fix VUL-0 Possible gitweb vulnerability: calling "git diff"
+ [bnc#459664]
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
git-1.6.0.2.tar.bz2
git-install-git-shell.diff
New:
----
git-1.6.1.tar.bz2
git-nohardlink.diff
usr.share.git-web.gitweb.cgi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.iU1931/_old 2009-01-08 18:09:53.000000000 +0100
+++ /var/tmp/diff_new_pack.iU1931/_new 2009-01-08 18:09:53.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package git (Version 1.6.0.2)
+# spec file for package git (Version 1.6.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
+%define gitexecdir %{_exec_prefix}/lib/git
Name: git
%if 0%{?suse_version} < 1030
@@ -35,8 +36,8 @@
%endif
BuildRequires: sgml-skel
BuildRequires: xmlto
-Version: 1.6.0.2
-Release: 6
+Version: 1.6.1
+Release: 1
Summary: Fast, scalable, distributed revision control system
License: GPL v2 or later
Group: Development/Tools/Version Control
@@ -46,8 +47,9 @@
Source2: sysconfig.git-daemon
Source3: git-daemon.init
Source4: git.xinetd
+Source5: usr.share.git-web.gitweb.cgi
Patch: asciidoc.diff
-Patch1: git-install-git-shell.diff
+Patch3: git-nohardlink.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: git-core = %{version}
Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web
@@ -243,23 +245,28 @@
%prep
%setup -q
%patch -p1
-%patch1
+%patch3 -p1
%build
+cat > .make <<'EOF'
+#!/bin/bash
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
GITWEB_CONFIG="/etc/gitweb.conf" \
GITWEB_PROJECTROOT="/srv/git" \
WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \
+ DESTDIR=$RPM_BUILD_ROOT \
V=1 \
prefix=%{_prefix} mandir=%{_mandir} \
- gitexecdir=%{_libdir}/git \
- all %{!?_without_docs: doc} %{?jobs:-j %jobs}
+ gitexecdir=%{gitexecdir} \
+ "$@"
+EOF
+#
+chmod 755 .make
+./.make all %{?jobs:-j %jobs}
+%{!?_without_docs: ./.make doc}
%install
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \
- prefix=%{_prefix} mandir=%{_mandir} \
- gitexecdir=%{_libdir}/git \
- install %{!?_without_docs: install-doc}
+./.make install %{!?_without_docs: install-doc}
### git-web
cp gitweb/INSTALL INSTALL.gitweb
cp gitweb/README README.gitweb
@@ -282,7 +289,7 @@
install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
###
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{_libdir}/git -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
( pushd perl
perl Makefile.PL
@@ -292,7 +299,22 @@
%perl_process_packlist
find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644
install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh
+#
+# apparmor profile for git-web
+#
+install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d
+#
%if %{dist_has_fdupes}
+# create predictable symlinks to make apparmor profile work
+for i in git git-upload-archive; do
+ rm $RPM_BUILD_ROOT%{_bindir}/$i
+ ln -s %{gitexecdir}/git-add $RPM_BUILD_ROOT%{_bindir}/$i
+done
+if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then
+ echo "git-add is not a regular file, apparmor profile won't work!" >&2
+ exit 1
+fi
# use symlinks instead of hardlinks in sub-commands
%fdupes -s $RPM_BUILD_ROOT
%endif
@@ -320,7 +342,7 @@
%files svn
%defattr(-,root,root)
-%{_libdir}/git/*svn*
+%{gitexecdir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }
@@ -329,28 +351,28 @@
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/git-cvs*
-%{_libdir}/git/*cvs*
+%{gitexecdir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }
%files arch
%defattr(-,root,root)
%doc Documentation/git-archimport.txt
-%{_libdir}/git/git-archimport
+%{gitexecdir}/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
-%{_libdir}/git/*email*
+%{gitexecdir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%files daemon
%defattr(-,root,root)
%doc Documentation/*daemon*.txt
-%{_libdir}/git/*daemon*
+%{gitexecdir}/*daemon*
/etc/init.d/git-daemon
%{_sbindir}/rcgit-daemon
%dir /srv/git
@@ -370,7 +392,7 @@
%files gui
%defattr(-,root,root)
%doc Documentation/*gui*.txt
-%{_libdir}/git/git-gui
+%{gitexecdir}/git-gui*
/usr/share/git-gui
%{!?_without_docs: %{_mandir}/man1/*gui*.1*}
%{!?_without_docs: %doc Documentation/*gui*.html }
@@ -382,11 +404,13 @@
%dir /etc/apache2/conf.d
%config(noreplace) /etc/apache2/conf.d/gitweb.conf
/usr/share/git-web
+/etc/apparmor.d
%files core -f bin-man-doc-files
%defattr(-,root,root)
+%{_bindir}/git
%{_datadir}/git-core/
-%dir %{_libdir}/git
+%dir %{gitexecdir}
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }
/var/adm/perl-modules/%{name}
@@ -396,6 +420,20 @@
/etc/bash_completion.d/git.sh
%changelog
+* Thu Jan 08 2009 tiwai@suse.de
+- updated to 1.6.1:
+ * handle properly the exit code when pager is used
+ * various git-gui updates including translations
+ * gitweb updates
+ * many other improvements / fixes. See release notes
+ http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt
+* Fri Dec 19 2008 lnussel@suse.de
+- add apparmor profile for git-web
+- don't use %%jobs for generating docu
+- change gitexecdir to /usr/lib instead of %%_libdir
+* Wed Dec 17 2008 tiwai@suse.de
+- Fix VUL-0 Possible gitweb vulnerability: calling "git diff"
+ [bnc#459664]
* Wed Nov 19 2008 tiwai@suse.de
- install git-shell and git-cvsserver as in the upstream
(bnc#446049)
++++++ asciidoc.diff ++++++
--- /var/tmp/diff_new_pack.iU1931/_old 2009-01-08 18:09:54.000000000 +0100
+++ /var/tmp/diff_new_pack.iU1931/_new 2009-01-08 18:09:54.000000000 +0100
@@ -1,8 +1,6 @@
-diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
-index 40d43b7..9fe70b2 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
-@@ -24,7 +24,7 @@ ifdef::backend-docbook[]
+@@ -24,7 +24,7 @@
endif::backend-docbook[]
ifdef::backend-docbook[]
@@ -11,12 +9,12 @@
# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
# v1.72 breaks with this because it replaces dots not in roff requests.
[listingblock]
-@@ -39,7 +39,7 @@ ifdef::doctype-manpage[]
+@@ -39,7 +39,7 @@
endif::doctype-manpage[]
</literallayout>
{title#}</example>
-endif::docbook-xsl-172[]
+endif::docbook-xsl-168[]
- endif::backend-docbook[]
+ ifdef::docbook-xsl-172[]
ifdef::doctype-manpage[]
++++++ git-1.6.0.2.tar.bz2 -> git-1.6.1.tar.bz2 ++++++
++++ 75538 lines of diff (skipped)
++++++ git-nohardlink.diff ++++++
don't use hardlinks as our .spec calls fdupes which converts the
hardlinks to symlinks again in an unpredicatable way
Index: git-1.6.0.2/Makefile
===================================================================
--- git-1.6.0.2.orig/Makefile
+++ git-1.6.0.2/Makefile
@@ -1371,7 +1371,6 @@ endif
ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \
cp git-add$X "$$execdir/git-add$X"; } && \
{ $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
- ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \
ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \
cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
++++++ usr.share.git-web.gitweb.cgi ++++++
# Last Modified: Fri Dec 19 11:03:49 2008
#include
participants (1)
-
root@Hilbert.suse.de