|
|
@@ -4,7 +4,7 @@
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
Version: 1.7.1
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
License: GPLv2
|
|
|
@@ -19,6 +19,9 @@ Source11: %{name}-remove.sh
|
|
|
Patch0: git-1.5-gitweb-home-link.patch
|
|
|
# Patch10: git-1.6_git-daemon-fix.patch
|
|
|
|
|
|
+# Security
|
|
|
+Patch100: git-1.7.x-CVE-2010-2542.patch
|
|
|
+
|
|
|
BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel,
|
|
|
BuildRequires: expat-devel, gettext, asciidoc
|
|
|
BuildRequires: xmlto
|
|
|
@@ -29,6 +32,10 @@ Requires: zlib
|
|
|
Provides: git-core = %{version}-%{release}
|
|
|
Obsoletes: git-core <= 1.5.4.3
|
|
|
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+# Packager:
|
|
|
+
|
|
|
%description
|
|
|
Git is a fast, scalable, distributed revision control system with an
|
|
|
unusually rich command set that provides both high-level operations
|
|
|
@@ -169,6 +176,8 @@ Header files for git-core.
|
|
|
|
|
|
# %patch10 -p1 -b .git-daemon-fix
|
|
|
|
|
|
+%patch100 -p1 -b .CVE-2010-2542
|
|
|
+
|
|
|
%build
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
@@ -361,6 +370,9 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 28 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.7.1-2
|
|
|
+- add Patch100 for fix CVE-2010-2542 (BOF in is_git_directory)
|
|
|
+
|
|
|
* Wed Jun 9 2010 IWAI, Masaharu <iwai@alib.jp> 1.7.1-1
|
|
|
- new upstream release
|
|
|
- fix git-daemon path in git.xinetd: <BTS:VineLinux:919>
|
iwaim