From: Michael Tremer Date: Mon, 25 Aug 2008 19:05:03 +0000 (+0000) Subject: Updated git to 1.6.0. X-Git-Tag: v2.3-beta4~59 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c3c377e9a0e6d7cccd116f31d402b8cf4dd044a4 Updated git to 1.6.0. --- diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 646e55ac51..a555c3f8ff 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -1,162 +1,165 @@ usr/bin/git -usr/bin/git-add -usr/bin/git-add--interactive -usr/bin/git-am -usr/bin/git-annotate -usr/bin/git-apply -usr/bin/git-archimport -usr/bin/git-archive -usr/bin/git-bisect -usr/bin/git-blame -usr/bin/git-branch -usr/bin/git-bundle -usr/bin/git-cat-file -usr/bin/git-check-attr -usr/bin/git-check-ref-format -usr/bin/git-checkout -usr/bin/git-checkout-index -usr/bin/git-cherry -usr/bin/git-cherry-pick -usr/bin/git-citool -usr/bin/git-clean -usr/bin/git-clone -usr/bin/git-commit -usr/bin/git-commit-tree -usr/bin/git-config -usr/bin/git-count-objects -usr/bin/git-cvsexportcommit -usr/bin/git-cvsimport -usr/bin/git-cvsserver -usr/bin/git-daemon -usr/bin/git-describe -usr/bin/git-diff -usr/bin/git-diff-files -usr/bin/git-diff-index -usr/bin/git-diff-tree -usr/bin/git-fast-export -usr/bin/git-fast-import -usr/bin/git-fetch -usr/bin/git-fetch--tool -usr/bin/git-fetch-pack -usr/bin/git-filter-branch -usr/bin/git-fmt-merge-msg -usr/bin/git-for-each-ref -usr/bin/git-format-patch -usr/bin/git-fsck -usr/bin/git-fsck-objects -usr/bin/git-gc -usr/bin/git-get-tar-commit-id -usr/bin/git-grep -usr/bin/git-gui -usr/bin/git-hash-object -usr/bin/git-http-fetch -usr/bin/git-http-push -usr/bin/git-imap-send -usr/bin/git-index-pack -usr/bin/git-init -usr/bin/git-init-db -usr/bin/git-instaweb -usr/bin/git-log -usr/bin/git-lost-found -usr/bin/git-ls-files -usr/bin/git-ls-remote -usr/bin/git-ls-tree -usr/bin/git-mailinfo -usr/bin/git-mailsplit -usr/bin/git-merge -usr/bin/git-merge-base -usr/bin/git-merge-file -usr/bin/git-merge-index -usr/bin/git-merge-octopus -usr/bin/git-merge-one-file -usr/bin/git-merge-ours -usr/bin/git-merge-recursive -usr/bin/git-merge-resolve -usr/bin/git-merge-stupid -usr/bin/git-merge-subtree -usr/bin/git-merge-tree -usr/bin/git-mergetool -usr/bin/git-mktag -usr/bin/git-mktree -usr/bin/git-mv -usr/bin/git-name-rev -usr/bin/git-pack-objects -usr/bin/git-pack-redundant -usr/bin/git-pack-refs -usr/bin/git-parse-remote -usr/bin/git-patch-id -usr/bin/git-peek-remote -usr/bin/git-prune -usr/bin/git-prune-packed -usr/bin/git-pull -usr/bin/git-push -usr/bin/git-quiltimport -usr/bin/git-read-tree -usr/bin/git-rebase -usr/bin/git-rebase--interactive usr/bin/git-receive-pack -usr/bin/git-reflog -usr/bin/git-relink -usr/bin/git-remote -usr/bin/git-repack -usr/bin/git-repo-config -usr/bin/git-request-pull -usr/bin/git-rerere -usr/bin/git-reset -usr/bin/git-rev-list -usr/bin/git-rev-parse -usr/bin/git-revert -usr/bin/git-rm -usr/bin/git-send-email -usr/bin/git-send-pack -usr/bin/git-sh-setup -usr/bin/git-shell -usr/bin/git-shortlog -usr/bin/git-show -usr/bin/git-show-branch -usr/bin/git-show-index -usr/bin/git-show-ref -usr/bin/git-stash -usr/bin/git-status -usr/bin/git-stripspace -usr/bin/git-submodule -usr/bin/git-svn -usr/bin/git-symbolic-ref -usr/bin/git-tag -usr/bin/git-tar-tree -usr/bin/git-unpack-file -usr/bin/git-unpack-objects -usr/bin/git-update-index -usr/bin/git-update-ref -usr/bin/git-update-server-info usr/bin/git-upload-archive usr/bin/git-upload-pack -usr/bin/git-var -usr/bin/git-verify-pack -usr/bin/git-verify-tag -usr/bin/git-web--browse -usr/bin/git-whatchanged -usr/bin/git-write-tree #usr/bin/gitk usr/lib/perl5/site_perl/5.8.8/Error.pm usr/lib/perl5/site_perl/5.8.8/Git.pm #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git/.packlist +usr/libexec/git-core +usr/libexec/git-core/git-add +usr/libexec/git-core/git-add--interactive +usr/libexec/git-core/git-am +usr/libexec/git-core/git-annotate +usr/libexec/git-core/git-apply +usr/libexec/git-core/git-archimport +usr/libexec/git-core/git-archive +usr/libexec/git-core/git-bisect +usr/libexec/git-core/git-blame +usr/libexec/git-core/git-branch +usr/libexec/git-core/git-bundle +usr/libexec/git-core/git-cat-file +usr/libexec/git-core/git-check-attr +usr/libexec/git-core/git-check-ref-format +usr/libexec/git-core/git-checkout +usr/libexec/git-core/git-checkout-index +usr/libexec/git-core/git-cherry +usr/libexec/git-core/git-cherry-pick +usr/libexec/git-core/git-citool +usr/libexec/git-core/git-clean +usr/libexec/git-core/git-clone +usr/libexec/git-core/git-commit +usr/libexec/git-core/git-commit-tree +usr/libexec/git-core/git-config +usr/libexec/git-core/git-count-objects +usr/libexec/git-core/git-cvsexportcommit +usr/libexec/git-core/git-cvsimport +usr/libexec/git-core/git-cvsserver +usr/libexec/git-core/git-daemon +usr/libexec/git-core/git-describe +usr/libexec/git-core/git-diff +usr/libexec/git-core/git-diff-files +usr/libexec/git-core/git-diff-index +usr/libexec/git-core/git-diff-tree +usr/libexec/git-core/git-fast-export +usr/libexec/git-core/git-fast-import +usr/libexec/git-core/git-fetch +usr/libexec/git-core/git-fetch--tool +usr/libexec/git-core/git-fetch-pack +usr/libexec/git-core/git-filter-branch +usr/libexec/git-core/git-fmt-merge-msg +usr/libexec/git-core/git-for-each-ref +usr/libexec/git-core/git-format-patch +usr/libexec/git-core/git-fsck +usr/libexec/git-core/git-fsck-objects +usr/libexec/git-core/git-gc +usr/libexec/git-core/git-get-tar-commit-id +usr/libexec/git-core/git-grep +usr/libexec/git-core/git-gui +usr/libexec/git-core/git-hash-object +usr/libexec/git-core/git-http-fetch +usr/libexec/git-core/git-http-push +usr/libexec/git-core/git-imap-send +usr/libexec/git-core/git-index-pack +usr/libexec/git-core/git-init +usr/libexec/git-core/git-init-db +usr/libexec/git-core/git-instaweb +usr/libexec/git-core/git-log +usr/libexec/git-core/git-lost-found +usr/libexec/git-core/git-ls-files +usr/libexec/git-core/git-ls-remote +usr/libexec/git-core/git-ls-tree +usr/libexec/git-core/git-mailinfo +usr/libexec/git-core/git-mailsplit +usr/libexec/git-core/git-merge +usr/libexec/git-core/git-merge-base +usr/libexec/git-core/git-merge-file +usr/libexec/git-core/git-merge-index +usr/libexec/git-core/git-merge-octopus +usr/libexec/git-core/git-merge-one-file +usr/libexec/git-core/git-merge-ours +usr/libexec/git-core/git-merge-recursive +usr/libexec/git-core/git-merge-resolve +usr/libexec/git-core/git-merge-subtree +usr/libexec/git-core/git-merge-tree +usr/libexec/git-core/git-mergetool +usr/libexec/git-core/git-mktag +usr/libexec/git-core/git-mktree +usr/libexec/git-core/git-mv +usr/libexec/git-core/git-name-rev +usr/libexec/git-core/git-pack-objects +usr/libexec/git-core/git-pack-redundant +usr/libexec/git-core/git-pack-refs +usr/libexec/git-core/git-parse-remote +usr/libexec/git-core/git-patch-id +usr/libexec/git-core/git-peek-remote +usr/libexec/git-core/git-prune +usr/libexec/git-core/git-prune-packed +usr/libexec/git-core/git-pull +usr/libexec/git-core/git-push +usr/libexec/git-core/git-quiltimport +usr/libexec/git-core/git-read-tree +usr/libexec/git-core/git-rebase +usr/libexec/git-core/git-rebase--interactive +usr/libexec/git-core/git-receive-pack +usr/libexec/git-core/git-reflog +usr/libexec/git-core/git-relink +usr/libexec/git-core/git-remote +usr/libexec/git-core/git-repack +usr/libexec/git-core/git-repo-config +usr/libexec/git-core/git-request-pull +usr/libexec/git-core/git-rerere +usr/libexec/git-core/git-reset +usr/libexec/git-core/git-rev-list +usr/libexec/git-core/git-rev-parse +usr/libexec/git-core/git-revert +usr/libexec/git-core/git-rm +usr/libexec/git-core/git-send-email +usr/libexec/git-core/git-send-pack +usr/libexec/git-core/git-sh-setup +usr/libexec/git-core/git-shell +usr/libexec/git-core/git-shortlog +usr/libexec/git-core/git-show +usr/libexec/git-core/git-show-branch +usr/libexec/git-core/git-show-index +usr/libexec/git-core/git-show-ref +usr/libexec/git-core/git-stash +usr/libexec/git-core/git-status +usr/libexec/git-core/git-stripspace +usr/libexec/git-core/git-submodule +usr/libexec/git-core/git-svn +usr/libexec/git-core/git-symbolic-ref +usr/libexec/git-core/git-tag +usr/libexec/git-core/git-tar-tree +usr/libexec/git-core/git-unpack-file +usr/libexec/git-core/git-unpack-objects +usr/libexec/git-core/git-update-index +usr/libexec/git-core/git-update-ref +usr/libexec/git-core/git-update-server-info +usr/libexec/git-core/git-upload-archive +usr/libexec/git-core/git-upload-pack +usr/libexec/git-core/git-var +usr/libexec/git-core/git-verify-pack +usr/libexec/git-core/git-verify-tag +usr/libexec/git-core/git-web--browse +usr/libexec/git-core/git-whatchanged +usr/libexec/git-core/git-write-tree usr/share/git-core usr/share/git-core/templates usr/share/git-core/templates/branches usr/share/git-core/templates/description usr/share/git-core/templates/hooks -usr/share/git-core/templates/hooks/applypatch-msg -usr/share/git-core/templates/hooks/commit-msg -usr/share/git-core/templates/hooks/post-commit -usr/share/git-core/templates/hooks/post-receive -usr/share/git-core/templates/hooks/post-update -usr/share/git-core/templates/hooks/pre-applypatch -usr/share/git-core/templates/hooks/pre-commit -usr/share/git-core/templates/hooks/pre-rebase -usr/share/git-core/templates/hooks/prepare-commit-msg -usr/share/git-core/templates/hooks/update +usr/share/git-core/templates/hooks/applypatch-msg.sample +usr/share/git-core/templates/hooks/commit-msg.sample +usr/share/git-core/templates/hooks/post-commit.sample +usr/share/git-core/templates/hooks/post-receive.sample +usr/share/git-core/templates/hooks/post-update.sample +usr/share/git-core/templates/hooks/pre-applypatch.sample +usr/share/git-core/templates/hooks/pre-commit.sample +usr/share/git-core/templates/hooks/pre-rebase.sample +usr/share/git-core/templates/hooks/prepare-commit-msg.sample +usr/share/git-core/templates/hooks/update.sample usr/share/git-core/templates/info usr/share/git-core/templates/info/exclude #usr/share/git-gui @@ -208,6 +211,8 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib #usr/share/gitk/lib/msgs #usr/share/gitk/lib/msgs/de.msg +#usr/share/gitk/lib/msgs/es.msg #usr/share/gitk/lib/msgs/it.msg +#usr/share/gitk/lib/msgs/sv.msg #usr/share/man/man3/Git.3 #usr/share/man/man3/private-Error.3 diff --git a/lfs/git b/lfs/git index 2b1511018b..e7da76e07a 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 1.5.6 +VER = 1.6.0 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 76c4efaaa5470a5385e22d99349a97b3 +$(DL_FILE)_MD5 = 3d37e1f1e93c7828236e2af04ea0d071 install : $(TARGET) diff --git a/src/paks/git/install.sh b/src/paks/git/install.sh new file mode 100644 index 0000000000..2df1ecdc8e --- /dev/null +++ b/src/paks/git/install.sh @@ -0,0 +1,25 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files diff --git a/src/paks/git/uninstall.sh b/src/paks/git/uninstall.sh new file mode 100644 index 0000000000..7846631d2a --- /dev/null +++ b/src/paks/git/uninstall.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +remove_files +rm -rf /usr/bin/git-* || true diff --git a/src/paks/git/update.sh b/src/paks/git/update.sh new file mode 100644 index 0000000000..83f56797ee --- /dev/null +++ b/src/paks/git/update.sh @@ -0,0 +1,25 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +rm -rf /usr/bin/git-* || true