July 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Make strip paths configurable
by Allan McRae 29 Jul '08

29 Jul '08

This patch introduces a new STRIP_DIRS makepkg.conf option to change makepkg's search path when stripping binaries. Original work by: Thomas Bächler <thomas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 7 +++++++ etc/makepkg.conf.in | 2 ++ scripts/makepkg.sh.in | 9 ++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b5a49ba..8b39c46 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -134,6 +134,13 @@ Options that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. +**STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**:: + If "strip" is specified in the OPTIONS array, this variable will + instruct makepkg where to look to for files to strip. If you build + packages that are located in opt/, you may need to add the directory + to this array. *NOTE:* Do not add the leading slash to the directory + name. + **PKGDEST=**"/path/to/folder":: If this value is not set, packages will by default be placed in the current directory (location of the linkman:PKGBUILD[5]). Many people diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index bb2018f..0241a8e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -73,6 +73,8 @@ OPTIONS=(strip docs libtool emptydirs zipman) INTEGRITY_CHECK=(md5) #-- Info and doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) +#-- Directories to be searched for the strip option (if option set correctly above) +STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) ######################################################################### # PACKAGE OUTPUT diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2777102..ae19983 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -731,9 +731,12 @@ tidy_install() { if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" - local binary bindirs - bindirs="bin lib sbin usr/bin usr/lib usr/sbin usr/local/bin usr/local/lib usr/local/sbin opt/*/bin opt/*/lib opt/*/sbin" - find ${bindirs} -type f 2>/dev/null | while read binary ; do + local binary + if [ -z "${STRIP_DIRS[@]}" ]; then + # fall back to default value + STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) + fi + find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip --strip-debug "$binary";; -- 1.5.6.3

6 15

[pacman-dev] [Translation] Small fix to ptBR translation
by Robson Roberto Souza Peixoto 28 Jul '08

28 Jul '08

Some small fix for pacman 3.2.0 Thanks!!! -- Robson Roberto Souza Peixoto Robinho robsonpeixoto(a)gmail.com Obs.: Novo Tel: (071) 8782-0206

2 1

[pacman-dev] [PATCH] pacman.conf (manual) changes
by Nagy Gabor 28 Jul '08

28 Jul '08

From 6f83f47c8545674b7c8e1c3178ac40b2ace44f3a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 26 Jul 2008 12:46:22 +0200 Subject: [PATCH] pacman.conf (manual) changes Document ILoveCandy, and set the default CleanMethod value. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.conf.5.txt | 3 +++ etc/pacman.conf.in | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 20a9067..0eee3f0 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -149,6 +149,9 @@ Options and completed percentage of the entire download list rather than the percent of each individual download target. The progress bar is still based solely on the current file download. + +*ILoveCandy*:: + Enables pacman game inspired progressbar. Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 199626d..2101e3b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -17,6 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -31,6 +32,7 @@ SyncFirst = pacman #ShowSize #UseDelta #TotalDownload +#ILoveCandy # # REPOSITORIES -- 1.5.6.4

4 7

[pacman-dev] Update for the README file
by Xavier 28 Jul '08

28 Jul '08

Dan complained several times that the README file was long outdated, so I tried to improve that. I hope I did not make it worse :/ As always, help/feedback is appreciated.

2 2

[pacman-dev] [PATCH] links problem in bacman
by Carlo Bersani 28 Jul '08

28 Jul '08

I just discovered test -e tries to resolve the link before testing, so if the link is copied before the actual file, the script exits. Here's the simple fix to this bug: --- bacman 2008-06-16 17:42:45.000000000 +0200 +++ bacman.new 2008-06-16 17:52:17.000000000 +0200 @@ -136,7 +136,7 @@ bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - # Workaround to bsdtar not reporting a missing file as an error - if [ ! -e "$work_dir"/"$i" ]; then + if [ ! -e "$work_dir"/"$i" ] && [ ! -L "$work_dir"/"$i" ]; then echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then"

5 14

[pacman-dev] Final steps before 3.2 release
by Dan McGee 27 Jul '08

27 Jul '08

I think this is the only outstanding blocker: http://archlinux.org/pipermail/pacman-dev/2008-July/012465.html Thanks again for the quick translation updates and the NEWS updates you guys contributed. I will send a few patches from my working branch here for review, but does anyone have objections to anything I've included on it? If not, this will all go to master with a 3.2.0 tag soon to follow. http://code.toofishes.net/gitweb.cgi?p=pacman.git;a=shortlog;h=refs/heads/w… -Dan

5 14

[pacman-dev] [PATCH] Remove UseColor from front-end
by Nagy Gabor 27 Jul '08

27 Jul '08

From 0605fcacee9da726dabf9e86b68a3bb3d3a44904 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 26 Jul 2008 12:28:49 +0200 Subject: [PATCH] Remove UseColor from front-end This option wasn't used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/conf.h | 1 - src/pacman/pacman.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 874ce70..9d2318d 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -63,7 +63,6 @@ typedef struct __config_t { /* conf file options */ unsigned short chomp; /* I Love Candy! */ - unsigned short usecolor; /* enable colorful output */ unsigned short showsize; /* show individual package sizes */ /* When downloading, display the amount downloaded, rate, ETA, and percent * downloaded of the total download list */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 813a728..445365e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -643,9 +643,6 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(PM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "UseColor") == 0) { - config->usecolor = 1; - pm_printf(PM_LOG_DEBUG, "config: usecolor\n"); } else if(strcmp(key, "ShowSize") == 0) { config->showsize = 1; pm_printf(PM_LOG_DEBUG, "config: showsize\n"); -- 1.5.6.4

2 1

[pacman-dev] [Translation] Small fix to Italian translation
by Giovanni Scafora 27 Jul '08

27 Jul '08

Hi Dan, could you apply this patch before releasing new version 3.2.0 of pacman? Thanks a lot. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 2

[pacman-dev] /etc/makepkg.local
by Mark Constable 26 Jul '08

26 Jul '08

Just a suggestion. If this was the last line in /etc/makepkg.conf then it would allow anyone to append functions that could be used inside a PKGBUILD. Potentionally good bang for buck for one extra line added to the official makepkg package. [ -f /etc/makepkg.local ] && source /etc/makepkg.local --markc

5 5

[pacman-dev] [PATCH] New fileconflict005.py pactest
by Nagy Gabor 25 Jul '08

25 Jul '08

From 13c0673aa16f71c58ec5665c5832bb44717d08d7 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 25 Jul 2008 14:35:54 +0200 Subject: [PATCH] New fileconflict005.py pactest This makes the fileconflict004.py test complete. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/fileconflict005.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/fileconflict005.py diff --git a/pactest/tests/fileconflict005.py b/pactest/tests/fileconflict005.py new file mode 100644 index 0000000..b9c0fa9 --- /dev/null +++ b/pactest/tests/fileconflict005.py @@ -0,0 +1,23 @@ +self.description = "dir->symlink change during package upgrade (conflict)" + +p1 = pmpkg("pkg1", "1.0-1") +p1.files = ["test/", + "test/file1"] +self.addpkg2db("local", p1) + +p2 = pmpkg("pkg2") +p2.files = ["test/file2"] +self.addpkg2db("local", p2) + +p3 = pmpkg("pkg1", "2.0-1") +p3.files = ["test2/", + "test2/file3", + "test -> test2"] +self.addpkg2db("sync", p3) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg1|1.0-1") + -- 1.5.6.4

1 0