[Frugalware-darcs] frugalware-current: pacman-2.9.6-18-i686
VMiklos
vmiklos at frugalware.org
Fri Aug 26 13:49:06 CEST 2005
Fri Aug 26 01:05:12 CEST 2005 VMiklos <vmiklos at frugalware.org>
* pacman-2.9.6-18-i686
added -dependsonly.diff, new option: -Se
removed obsolete convertdb and its entry from .install
(a more proper fix would be to even not compile it)
removed an obsolete comment from pacman.conf (there is no stable repo available)
(as not rebuilt yet till now: manpage update, pacman -Qe and makepkg -u fixes)
diff -rN -u old-frugalware-current/source/base/pacman/FrugalBuild new-frugalware-current/source/base/pacman/FrugalBuild
--- old-frugalware-current/source/base/pacman/FrugalBuild 2005-08-26 13:48:17.000000000 +0200
+++ new-frugalware-current/source/base/pacman/FrugalBuild 2005-08-26 13:07:22.000000000 +0200
@@ -1,10 +1,10 @@
-# Last Modified: Thu, 25 Aug 2005 23:45:47 +0200
+# Last Modified: Fri, 26 Aug 2005 01:01:30 +0200
# Compiling Time: 0.10 SBU
# Maintainer: VMiklos <vmiklos at frugalware.org>
pkgname=pacman
pkgver=2.9.6
-pkgrel=17
+pkgrel=18
pkgdesc="A .tar.gz based package manager with dependency support"
url="http://www.archlinux.org/pacman"
backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current,extra,extra-current})
@@ -40,9 +40,10 @@
$pkgname-$pkgver-libarchive.diff \
$pkgname-$pkgver-regexp.diff \
$pkgname-$pkgver-sha1sum-in-fdb.patch \
- $pkgname-$pkgver-provides_search.patch)
+ $pkgname-$pkgver-provides_search.patch \
+ $pkgname-$pkgver-dependsonly.diff)
sha1sums=('93d9ec990ab84fb75cd8eb335c8ac17108a9db25' \
- 'ce129ca8b1e9f658e3314e11205c7d992eb13e00' \
+ '5037ed30cc765cdb8c2dbc85f344e6c299e23fff' \
'69473f1684b9316cd98a8fcd89046c97e3099501' \
'33027bf7672a0f8c5689056acdefcf62cf944166' \
'47b76dc685622209e83a816eca013fc2e2c9174c' \
@@ -67,7 +68,8 @@
'00263645e4972bb09a9e2276da474d1a94c3d887' \
'd5c4921a023e3325e3824f621ec5e7a2d4ac6a60' \
'0d982a46ebe9ca49b83f71668a5e0567de00c9cd' \
- 'b10b4f729f45cb253b33f3e0a8a825d3637e6dcb')
+ 'b10b4f729f45cb253b33f3e0a8a825d3637e6dcb' \
+ '1e677e3c246444f6f443274271e833c55c4298cd')
GZIP=1
@@ -110,6 +112,7 @@
Fmake
Fmakeinstall
+ Frm /usr/bin/convertdb
Ffile pacman.conf /etc/pacman.conf
Ffile ../conf/* /etc/pacman.d/
diff -rN -u old-frugalware-current/source/base/pacman/pacman-2.9.6-dependsonly.diff new-frugalware-current/source/base/pacman/pacman-2.9.6-dependsonly.diff
--- old-frugalware-current/source/base/pacman/pacman-2.9.6-dependsonly.diff 1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/source/base/pacman/pacman-2.9.6-dependsonly.diff 2005-08-26 13:07:22.000000000 +0200
@@ -0,0 +1,99 @@
+Date: 2005-08-26
+Initial Package Version: 2.9.6
+Upstream Status: Not yet submitted.
+Origin: Miklos Vajna <vmiklos at frugalware.org>
+Description: Adds the ability to install only the dependencies of packages,
+but not the packages themselves.
+ doc/pacman.8.in | 5 +++++
+ src/pacman.c | 33 +++++++++++++++++++++++++++++++--
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+diff -Naur pacman-2.9.6.orig/doc/pacman.8.in pacman-2.9.6/doc/pacman.8.in
+--- pacman-2.9.6.orig/doc/pacman.8.in 2005-08-25 23:55:39.000000000 +0200
++++ pacman-2.9.6/doc/pacman.8.in 2005-08-26 00:52:56.000000000 +0200
+@@ -92,6 +92,11 @@
+ Using one --clean (or -c) switch will only remove \fIold\fP packages.
+ Use it twice to remove \fIall\fP packages from the cache.
+ .TP
++.B "\-e, \-\-dependsonly"
++Don't install the packages itself, only their dependencies. This can be
++handy if you want to install the packages themselves with different
++options or from source.
++.TP
+ .B "\-g, \-\-groups"
+ Display all the members for each package group specified. If no group
+ names are provided, all groups will be listed.
+diff -Naur pacman-2.9.6.orig/src/pacman.c pacman-2.9.6/src/pacman.c
+--- pacman-2.9.6.orig/src/pacman.c 2005-08-25 23:55:39.000000000 +0200
++++ pacman-2.9.6/src/pacman.c 2005-08-26 00:46:39.000000000 +0200
+@@ -79,6 +79,7 @@
+ unsigned short pmo_r_dbonly = 0;
+ unsigned short pmo_r_recurse = 0;
+ unsigned short pmo_s_clean = 0;
++unsigned short pmo_s_dependsonly = 0;
+ unsigned short pmo_s_downloadonly = 0;
+ PMList *pmo_s_ignore = NULL;
+ unsigned short pmo_s_info = 0;
+@@ -1054,6 +1055,32 @@
+ FREELIST(list);
+ }
+
++ /* remove original targets from final if requested */
++ if (pmo_s_dependsonly)
++ {
++ k = NULL;
++ for(i = final; i; i = i->next)
++ {
++ syncpkg_t *s = (syncpkg_t*)i->data;
++ int keepit = 1;
++ for(j = targets; j; j = j->next)
++ {
++ if(!strcmp(j->data, s->pkg->name))
++ {
++ FREE(i->data);
++ keepit = 0;
++ }
++ }
++ if(keepit)
++ {
++ k = list_add(k, s);
++ }
++ i->data = NULL;
++ }
++ FREELIST(final);
++ final = k;
++ }
++
+ /* any packages in rmtargs need to be removed from final. */
+ /* rather than ripping out nodes from final, we just copy over */
+ /* our "good" nodes to a new list and reassign. */
+@@ -3543,6 +3570,7 @@
+ {"cascade", no_argument, 0, 'c'},
+ {"changelog", no_argument, 0, 'c'},
+ {"nodeps", no_argument, 0, 'd'},
++ {"dependsonly",no_argument, 0, 'e'},
+ {"orphans", no_argument, 0, 'e'},
+ {"force", no_argument, 0, 'f'},
+ {"groups", no_argument, 0, 'g'},
+@@ -3590,7 +3618,7 @@
+ case 'b': strcpy(pmo_dbpath, optarg); break;
+ case 'c': pmo_s_clean++; pmo_r_cascade = 1; pmo_q_changelog = 1; break;
+ case 'd': pmo_nodeps = 1; break;
+- case 'e': pmo_q_orphans = 1; break;
++ case 'e': pmo_q_orphans = 1; pmo_s_dependsonly = 1; break;
+ case 'f': pmo_force = 1; break;
+ case 'g': pmo_group = 1; break;
+ case 'i': pmo_q_info++; pmo_s_info++; break;
+@@ -3928,6 +3956,7 @@
+ printf("options:\n");
+ printf(" -c, --clean remove old packages from cache directory (use -cc for all)\n");
+ printf(" -d, --nodeps skip dependency checks\n");
++ printf(" -e, --dependsonly install dependencies only\n");
+ printf(" -f, --force force install, overwrite conflicting files\n");
+ printf(" -g, --groups view all members of a package group\n");
+ printf(" -i, --info view package information\n");
+@@ -4109,4 +4138,4 @@
+ }
+
+
+-/* vim: set ts=2 sw=2 noet: */
++/* vim: set ts=8 sw=2 noet: */
diff -rN -u old-frugalware-current/source/base/pacman/pacman.conf new-frugalware-current/source/base/pacman/pacman.conf
--- old-frugalware-current/source/base/pacman/pacman.conf 2005-08-26 13:48:17.000000000 +0200
+++ new-frugalware-current/source/base/pacman/pacman.conf 2005-08-26 13:07:22.000000000 +0200
@@ -26,7 +26,6 @@
Include = /etc/pacman.d/extra-current
# -stable
-# Currently NO stable repo available
#Include = /etc/pacman.d/frugalware
#Include = /etc/pacman.d/extra
diff -rN -u old-frugalware-current/source/base/pacman/pacman.install new-frugalware-current/source/base/pacman/pacman.install
--- old-frugalware-current/source/base/pacman/pacman.install 2005-08-26 13:48:17.000000000 +0200
+++ new-frugalware-current/source/base/pacman/pacman.install 2005-08-26 13:07:22.000000000 +0200
@@ -1,11 +1,5 @@
post_upgrade()
{
- if [ ! -d var/lib/pacman/local ]; then
- echo -n "converting database... " >&2
- mkdir -p var/lib/pacman/local && \
- usr/bin/convertdb var/lib/pacman/local
- echo "done." >&2
- fi
if [ `vercmp $2 2.9.5-9` -le -1 ]; then
echo -n "updating package cache... "
for i in `ls /var/cache/pacman/pkg/*.fpm`
More information about the Frugalware-darcs
mailing list