- Pacman-dev - lists.archlinux.org

[pacman-dev] Updated pacman hu.po file
by Nagy Gabor 04 Jun '07

04 Jun '07

Here is the patch, enjoy:-) ngaba ------------------------- diff -Naur pacman/src/pacman/po/hu.po pacman.new/src/pacman/po/hu.po --- pacman/src/pacman/po/hu.po 2007-06-02 23:30:00.000000000 +0200 +++ pacman.new/src/pacman/po/hu.po 2007-06-02 23:33:52.000000000 +0200 @@ -293,27 +293,24 @@ msgstr "Nem áll rendelkezésre változási napló a(z) '%s' csomaghoz.\n" #: src/pacman/pacman.c:94 -#, fuzzy msgid "options" -msgstr "opciók:\n" +msgstr "opciók" #: src/pacman/pacman.c:95 -#, fuzzy msgid "file" -msgstr "sikertelen.\n" +msgstr "fájl" #: src/pacman/pacman.c:96 msgid "package" -msgstr "" +msgstr "csomag" #: src/pacman/pacman.c:97 msgid "usage" -msgstr "" +msgstr "használat" #: src/pacman/pacman.c:98 -#, fuzzy msgid "operation" -msgstr "opciók:\n" +msgstr "művelet" #: src/pacman/pacman.c:111 #, c-format @@ -374,7 +371,7 @@ msgstr " -c, --changelog a változások naplójának megtekintése\n" #: src/pacman/pacman.c:140 -#, fuzzy, c-format +#, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " "longer\n" @@ -382,6 +379,7 @@ msgstr "" " -e, --orphans azon csomagok listázása, amelyek függőségként " "kerültek\n" +" telepítésre, de most már nem igényli őket más csomag\n" #: src/pacman/pacman.c:142 src/pacman/pacman.c:157 #, c-format @@ -515,7 +513,7 @@ " --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n" #: src/pacman/pacman.c:171 -#, fuzzy, c-format +#, c-format msgid "" " --noscriptlet do not execute the install scriptlet if one exists\n" msgstr "" @@ -544,12 +542,13 @@ " --cachedir <kvt> alternatív csomaggyorsítótár-könyvtár beállítása\n" #: src/pacman/pacman.c:189 -#, fuzzy, c-format +#, c-format msgid "" " This program may be freely redistributed under\n" " the terms of the GNU General Public License\n" msgstr "" " Ezt a programot bárki a General Public License-ben\n" +" foglaltak alapján szabadon terjesztheti\n" #: src/pacman/pacman.c:340 #, c-format @@ -1011,55 +1010,3 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Teljes telepített méret: %.2f MB\n" -#~ msgid "requires: %s" -#~ msgstr "igényli a következőt: %s" - -#~ msgid "usage: %s {-h --help}\n" -#~ msgstr "használat: %s {-h --help}\n" - -#~ msgid " %s {-V --version}\n" -#~ msgstr " %s {-V --version}\n" - -#~ msgid " %s {-A --add} [options] <file>\n" -#~ msgstr " %s {-A --add} [opciók] <fájl>\n" - -#~ msgid " %s {-F --freshen} [options] <file>\n" -#~ msgstr " %s {-F --freshen} [opciók] <fájl>\n" - -#~ msgid " %s {-Q --query} [options] [package]\n" -#~ msgstr " %s {-Q --query} [opciók] [csomag]\n" - -#~ msgid " %s {-R --remove} [options] <package>\n" -#~ msgstr " %s {-R --remove} [opciók] <csomag>\n" - -#~ msgid " %s {-S --sync} [options] [package]\n" -#~ msgstr " %s {-S --sync} [opciók] [csomag]\n" - -#~ msgid " %s {-U --upgrade} [options] <file>\n" -#~ msgstr " %s {-U --upgrade} [opciók] <fájl>\n" - -#~ msgid "usage: %s {-A --add} [options] <file>\n" -#~ msgstr "használat: %s {-A --add} [opciók] <fájl>\n" - -#~ msgid "usage: %s {-F --freshen} [options] <file>\n" -#~ msgstr "használat: %s {-F --freshen} [opciók] <fájl>\n" - -#~ msgid "usage: %s {-U --upgrade} [options] <file>\n" -#~ msgstr "használat: %s {-U --upgrade} [opciók] <fájl>\n" - -#~ msgid "usage: %s {-Q --query} [options] [package]\n" -#~ msgstr "használat: %s {-Q --query} [opciók] [csomag]\n" - -#~ msgid " required by any package\n" -#~ msgstr "" -#~ " telepítésre, de most már nem igényli őket más " -#~ "csomag\n" - -#~ msgid "usage: %s {-S --sync} [options] [package]\n" -#~ msgstr "használat: %s {-S --sync} [opciók] [csomag]\n" - -#~ msgid " the terms of the GNU General Public License\n" -#~ msgstr " foglaltak alapján szabadon terjesztheti\n" - -#~ msgid "'%s': %s\n" -#~ msgstr "'%s': %s\n"

2 4

[pacman-dev] xdelta patches
by Dale Ogilvie 04 Jun '07

04 Jun '07

Hello, I've made a few alterations to the recently comitted xdelta mods for makepkg & wget-xdelta.sh. Please check these out in my forum post: http://bbs.archlinux.org/viewtopic.php?pid=255563#p255563 In short, I fixed a couple of bugs, although oldversion detection is still not bullet-proof due to difficulties parsing out the package name. The main problem is that package names can include hyphens... My best effort looks like this, the first 0-9 is meant to be the start of the pkg version, and the last being the release number: ls {"$cache_dir","$PKGDEST"}/${pkgname}-[0-9]*-[0-9]*${PKGEXT} This will fail if there happens to be a sub-package of foo such as: foo-1st-sub-1.0-1.i686.pkg.tar.gz ...or a package that happens to be: foo-A0-1.i686.pkg.tar.gz Regards Dale P.S. Sorry for not posting patches, hopefully you can obtain the necessary from the forum.

5 4

[pacman-dev] TODO ;-)
by Nagy Gabor 04 Jun '07

04 Jun '07

Hi! I attached 5 pactest files, where pacman fails. These were submitted to here earlier by me, this is just a summary to keep them in mind ;-P. I'd be happy if these were committed to git-tree as a bug-reminder ;-) Bye, ngaba

2 1

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-177-gc6c60bc
by Dan McGee 04 Jun '07

04 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via c6c60bcc80959ce5ad54bbd690612e19202520a1 (commit) via b69edc1c3532816576198995675dd6ad53df74df (commit) via 76fd85450e2c6efca8e423f63d4740552e33544e (commit) via 2fb2613ec1106f055776b3173a4e65a3b73a6ae6 (commit) via 3b1e67628ec963b4336620699509e706524c3948 (commit) via 508d5cb3a366105bc87eb55a4f04eaad78a96caa (commit) from 214f264bd06afc0d1cc479c75e46b05cc0e85200 (commit) - Log ----------------------------------------------------------------- commit c6c60bcc80959ce5ad54bbd690612e19202520a1 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sun Jun 3 03:33:17 2007 +0100 scripts/makepkg.in: More clean up. * Add ChangeLog to source package. * Quote references to $BUILDSCRIPT. * Check $srcdir isn't empty when running --noextract. * Check $pkgdir isn't empty when running --repackage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b69edc1c3532816576198995675dd6ad53df74df Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sun Jun 3 01:59:54 2007 +0100 scripts/makepkg.in: Improve error handling and clean up on exit. * makepkg now runs with errexit (exit on syntax error) enabled for the whole script. * Removed unneeded setting of errexit around build(). * Added bash traps to catch TERM HUP INT signals. * Added trap to catch unhandled/unknown errors. * Added trap to call clean_up() when the script exits. * Moved call to remove_deps() into clean_up(). * Moved -c/--clean code into clean_up(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 76fd85450e2c6efca8e423f63d4740552e33544e Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sat Jun 2 18:39:48 2007 +0100 Clean up output messages for translation. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 2fb2613ec1106f055776b3173a4e65a3b73a6ae6 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sat Jun 2 18:04:41 2007 +0100 scripts/makepkg.in: Rewrite check_{options,buildenv} to tidy them up. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 3b1e67628ec963b4336620699509e706524c3948 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sat Jun 2 17:41:15 2007 +0100 scripts/makepkg.in: Clean up. * Move create_xdelta() outside of fakeroot run. * Clean up dep check functions. * Clean up extract_sources(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 508d5cb3a366105bc87eb55a4f04eaad78a96caa Author: Roman Kyrylych <roman(a)archlinux.org> Date: Sun Jun 3 21:45:06 2007 -0400 Correct descriptions of configure options Signed-off-by: Roman Kyrylych <roman(a)archlinux.org> Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> ----------------------------------------------------------------------- Diffstat: configure.ac | 14 +- scripts/makepkg.in | 400 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 245 insertions(+), 169 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 214f264bd06afc0d1cc479c75e46b05cc0e85200 \ c6c60bcc80959ce5ad54bbd690612e19202520a1

1 0

[pacman-dev] cut down PKGBUILD for non-intrusive pacman-git installation
by Roman Kyrylych 03 Jun '07

03 Jun '07

This is a PKGBUILD I cooked today while playing with pacman and git. What it builds: * pacman.static-git * makepkg-git which uses pacman.static-git * nothing more This is enought for pacman-git testing while keeping the official release version. Note that it builds everything that full version does - this is done for build testing. You need to replace cp -R with your own instruction(s) for getting git source code. In my case it builds my own working branch. # Contributor: Roman Kyrylych <roman(a)archlinux.org> pkgname=pacman-git pkgver=`date +%Y%m%d` pkgrel=1 pkgdesc="git version of pacman.static and makepkg" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') makedepends=(doxygen libarchive libdownload) depends=(fakeroot) options=(!libtool) build() { mkdir -p $startdir/src/$pkgname-$pkgver cd $startdir/src/$pkgname-$pkgver cp -R /home/roman/scm-repos/git/pacman/* . ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc make || return 1 install -D src/pacman/pacman.static $startdir/pkg/usr/bin/pacman.static-git install -D scripts/makepkg $startdir/pkg/usr/bin/makepkg-git sed -i "s/pacman /pacman.static-git /g" $startdir/pkg/usr/bin/makepkg-git } -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH] ./configure --help corrections
by Roman Kyrylych 03 Jun '07

03 Jun '07

From edbc50650ac22764842b154da891fdc89c05532e Mon Sep 17 00:00:00 2001 From: Roman Kyrylych <roman(a)archlinux.org> Date: Sun, 3 Jun 2007 20:10:44 +0300 Subject: [PATCH] ./configure --help corrections Signed-off-by: Roman Kyrylych <roman(a)archlinux.org> corrected descriptions of configure options --- configure.ac | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 86df997..74d7911 100644 --- a/configure.ac +++ b/configure.ac @@ -30,37 +30,37 @@ AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number]) # Help line for root directory AC_ARG_WITH(root-dir, - AC_HELP_STRING([--with-root-dir=path], [Set the location of pacman's root operating directory]), + AC_HELP_STRING([--with-root-dir=path], [set the location of pacman's root operating directory]), [ROOTDIR=$withval], [ROOTDIR=/]) # Help line for package extension AC_ARG_WITH(pkg-ext, - AC_HELP_STRING([--with-pkg-ext=ext], [Set the file extension used by packages]), + AC_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]), [PKGEXT=$withval], [PKGEXT=.pkg.tar.gz]) # Help line for source package directory AC_ARG_WITH(src-ext, - AC_HELP_STRING([--with-src-ext=ext], [Set the file extension used by source packages]), + AC_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]), [SRCEXT=$withval], [SRCEXT=.src.tar.gz]) # Help line for database extension AC_ARG_WITH(db-ext, - AC_HELP_STRING([--with-db-ext=ext], [Set the file extension used by the database]), + AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) # Help line for doxygen AC_ARG_ENABLE(doxygen, - AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]), + AC_HELP_STRING([--disable-doxygen], [do not build API docs via Doxygen]), [wantdoxygen=$enableval], [wantdoxygen=yes]) # Help line for debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], [Enable debugging support]), + AC_HELP_STRING([--enable-debug], [enable debugging support]), [debug=$enableval], [debug=no]) # Help line for abs AC_ARG_ENABLE(abs, - AC_HELP_STRING([--disable-abs], [Include Arch Linux Build System script]), + AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]), [includeabs=$enableval], [includeabs=yes]) # Checks for programs. -- 1.5.2 -- Roman Kyrylych (Роман Кирилич)

1 1

[pacman-dev] pacman.static error
by Nagy Gabor 03 Jun '07

03 Jun '07

Hi! I simply do "./configure --prefix && make" and I get the following error: '/usr/bin/ld: attempted static link of dynamic object `../../lib/libalpm/.libs/libalpm.so' ngaba PS.: Why is pacman.static included in the arch package?

3 4

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-171-g214f264
by Dan McGee 02 Jun '07

02 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 214f264bd06afc0d1cc479c75e46b05cc0e85200 (commit) via 111c0f71c3d4154d2b6694c855f11f0d4b07cb9d (commit) via 40af40da4cd9c35b469b7076de5a7c6a3f553327 (commit) via 9883c157f94de4fe1b45ab13b3779e12bf105392 (commit) via e19d7da4f9e77c58c662329d62414bf0cab54918 (commit) via afd2adf1f3b4a37798fccb26f92f711c4b545151 (commit) via ed13ac2cc8dd15d8a19d769cc77941ad18ac1a7c (commit) via fe2c58fc9211dfc1d50c145397b947325abd1bdc (commit) from fb10e0c797b649dc036bc0432dc77cffaabbc56d (commit) - Log ----------------------------------------------------------------- commit 214f264bd06afc0d1cc479c75e46b05cc0e85200 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 2 13:39:47 2007 -0400 Rename functions in makepkg for consistency Add a hyphen to any function name that needs it so we are consistent across the board. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 111c0f71c3d4154d2b6694c855f11f0d4b07cb9d Author: Ash Milsted <thatistosayiseenem(a)gawab.com> Date: Sat Jun 2 12:42:36 2007 -0400 makepkg: fix create_xdelta() and add warning Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 40af40da4cd9c35b469b7076de5a7c6a3f553327 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jun 1 22:21:31 2007 +0100 scripts/makepkg.in: Some more clean ups. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 9883c157f94de4fe1b45ab13b3779e12bf105392 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 2 11:45:17 2007 -0400 makepkg: code cleanup * Collapse some if statements (Andrew Fyfe) * Add some E_ exit designations Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e19d7da4f9e77c58c662329d62414bf0cab54918 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jun 1 22:10:27 2007 +0100 scripts/makepkg.in: Move the remaining stages into functions. * Move download code to download_sources() * Move checksum generation code to generate_checksums() * Move checksum check code to check_checksums() * Move extract source code to extract_sources() Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afd2adf1f3b4a37798fccb26f92f711c4b545151 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jun 1 19:55:53 2007 +0100 scripts/makepkg.in: All calls to eval_gettext have been remove, gettext.sh is no longer needed. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit ed13ac2cc8dd15d8a19d769cc77941ad18ac1a7c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 2 13:17:26 2007 -0400 Remove freespace checking code This code depends on /etc/mtab existance, which is not very reliable in all cases, especially in a chroot or non-Linux environment. Dump it for now until we can find a better way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe2c58fc9211dfc1d50c145397b947325abd1bdc Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jun 2 12:34:01 2007 -0400 Move parts of pacman_query into subfunctions (query_search, query_group, query_isfile) Clean up pacman_query so functionality is actually in functions, similar to how sync.c is organized. After doing this, it is easy to see similarity in the code between sync.c and query.c, so we should be able to consolidate some of this. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: lib/libalpm/add.c | 7 - lib/libalpm/sync.c | 11 -- lib/libalpm/trans.c | 79 --------- lib/libalpm/trans.h | 3 - scripts/makepkg.in | 454 ++++++++++++++++++++++++++------------------------ src/pacman/query.c | 414 ++++++++++++++++++++++++++-------------------- src/pacman/sync.c | 27 ++-- 7 files changed, 484 insertions(+), 511 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ fb10e0c797b649dc036bc0432dc77cffaabbc56d \ 214f264bd06afc0d1cc479c75e46b05cc0e85200

1 0

[pacman-dev] [PATCH] Fix makepkg create_xdelta() and add warning
by Ash Milsted 02 Jun '07

02 Jun '07

Hi, This fixes a trivial bug that prevents create_xdelta() from finding any old package versions, cleans up its use of messages, and adds a warning stressing the importance of distributing the deltas with the tarball from the same makepkg run. There are no functionality changes. Please apply. Ash (aka thikasabrik) --- scripts/makepkg.in 2007-06-02 16:28:47.000000000 +0100 +++ scripts/makepkg.in.1 2007-06-02 16:46:47.000000000 +0100 @@ -608,12 +608,12 @@ local pkg_file=$1 local cache_dir="/var/cache/pacman/pkg" # TODO: autoconf me - local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}.${PKGEXT} 2>/dev/null) ) + local old_versions=( $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-${CARCH}${PKGEXT} 2>/dev/null) ) # Check to see if we have any old versions to create deltas with local old_file old_version latest_version base_file for old_file in "${old_versions[@]}"; do - old_version=$(basename "${old_file%-$CARCH.$PKGEXT}") + old_version=$(basename "${old_file%-$CARCH$PKGEXT}") old_version=${old_version#$pkgname-} # old_version may include the target package, only use the old versions @@ -624,7 +624,7 @@ done if [ "$base_file" != "" ]; then - msg "Making delta from version $latest_version" + msg "$(gettext "Making delta from version $latest_version")" local delta_file="$PKGDEST/$pkgname-${old_version}_to_$pkgver-$pkgrel-$CARCH.delta" # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if TMP_DIR is unset) @@ -636,9 +636,11 @@ # # makepkg and pacman must use the same compression algorithm or the delta generated # package may not match, producing md5 checksum errors. + msg2 "$(gettext "Recreating package tarball from delta to match up md5 signatures")" + msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" xdelta patch "$delta_file" "$base_file" "$pkg_file" else - msg "No previous version found, skipping xdelta" + warning "$(gettext "No previous version found, skipping xdelta")" fi } -

2 1

[pacman-dev] pacman -Q broken
by Xavier 02 Jun '07

02 Jun '07

Hello, this commit broke pacman -Q : http://projects.archlinux.org/git/gitweb.cgi?p=pacman.git;a=commit;h=722db4… If the list of targets is empty, then it doesn't enter the loop, and no code is executed. Handling the case where there are no targets inside the loop visiting the targets is pretty funny in my opinion. So I tried to handle this case separately, but I find the whole function still very messy. Because this case is handled differently depending on the type of query. So what about making new function for each different query ? And not trying to handle all the cases in the same big for loop, but having a separate loop for each. Maybe it could be better that way.

2 2