- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-423-g1ce7f39
by dan＠archlinux.org 03 Jul '11

03 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 1ce7f39ad73c5c96870c6036014afad3d49a8edf (commit) via c839415e3fb4bcde11de3cb7595cec93501bed13 (commit) via 26195f8da1c860a9f79f2d20ab576b06dad55e00 (commit) via 6a6fc3107f477e579b0dd21553d48e073e3efdf4 (commit) via a2995f586e492e0d2cb85e7e9ebb5f3857891465 (commit) via 06840f14b465d9db53646ab0cbc2d4b3526bd255 (commit) via a7b02d07f49927b11ab2d3bec41013c3a9e90283 (commit) via ab79b13079ea6c0c7b66e4c5d14686f06ba759ae (commit) via f612e5ede7f76458911b78adca3323c61a669dd0 (commit) via 925d74f38d21121440edad3f7917c4326e2bd1db (commit) via de8b9a85a571716926e6b0f1a680fbb1d1cc8e94 (commit) via afc96f2ab3d05f14a73e81f871164f01423b5572 (commit) via bd88a8d5511c24db55dd2a5c04161918571dbfbd (commit) via 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 (commit) via 3189d3bc4a7b5f3e92db14256e307e9a58071b2a (commit) via 39262acab6b956bbc4491d3b90e967a09828e732 (commit) via ca43fdd92f06a6997c53e45bfed6fb27f3044de5 (commit) via d796d1cdda15889fc0793eae50582d75f07d55d5 (commit) via f818f570c555668314fa9ca657fba2fe3ffd8bd4 (commit) via eb39a9482b711d58a6c12840800f2372dee0c120 (commit) from cf1401a04d5179c89af6460b812e171cc2da19f0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1ce7f39ad73c5c96870c6036014afad3d49a8edf Merge: c839415 afc96f2 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 14:44:57 2011 -0500 Merge remote-tracking branch 'allan/ALPM' Conflicts: lib/libalpm/be_local.c lib/libalpm/be_package.c lib/libalpm/conflict.c lib/libalpm/diskspace.c lib/libalpm/dload.c lib/libalpm/remove.c commit c839415e3fb4bcde11de3cb7595cec93501bed13 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 15:40:02 2011 -0500 conflict code tweaks and cleanups We can take advantage of a few things on our new and improved filelist in this code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 26195f8da1c860a9f79f2d20ab576b06dad55e00 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 14:51:04 2011 -0500 diskspace: remove all libarchive usage Now that the filelists capture mode and size information, we can read the data from there and prevent having to loop through and uncompress every archive to check required diskspace usage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a6fc3107f477e579b0dd21553d48e073e3efdf4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:16:49 2011 -0500 Move alpm filelists to a struct object This allows us to capture size and mode data when building filelists from package files. Future patches will take advantage of this newly available information, and frontends can use it as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2995f586e492e0d2cb85e7e9ebb5f3857891465 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 15:38:02 2011 -0500 pactest: add a few more checks to fileconflict checks Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06840f14b465d9db53646ab0cbc2d4b3526bd255 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 10:31:03 2011 -0500 Fix debug logger without a newline Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7b02d07f49927b11ab2d3bec41013c3a9e90283 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 3 10:18:00 2011 +1000 Do not replicate files list when removing packages This saves replicating the potentially large list of files in a package that is being removed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab79b13079ea6c0c7b66e4c5d14686f06ba759ae Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 3 10:10:36 2011 +1000 Add alpm_list_previous method Helper function to get the previous item in a list Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f612e5ede7f76458911b78adca3323c61a669dd0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:39:13 2011 -0500 checkdeps: remove unnecessary list join and copy We can just perform the same search operation on both lists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 925d74f38d21121440edad3f7917c4326e2bd1db Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:37:04 2011 -0500 be_local: use macros in database loading similar to be_sync This removes some of the repetition in the code for reading and parsing database file lines. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de8b9a85a571716926e6b0f1a680fbb1d1cc8e94 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:07:19 2011 -0500 be_sync: make READ_NEXT() a no-arg macro We passed in 'line', but not 'buf.line'. In addition, the macros building off of READ_NEXT() assume variable names anyway. Since we only use these macros in one function, might as well simplify them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afc96f2ab3d05f14a73e81f871164f01423b5572 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix _alpm_errno_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd88a8d5511c24db55dd2a5c04161918571dbfbd Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transprog_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transconv_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3189d3bc4a7b5f3e92db14256e307e9a58071b2a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transevt_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 39262acab6b956bbc4491d3b90e967a09828e732 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transflag_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ca43fdd92f06a6997c53e45bfed6fb27f3044de5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_loglevel_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d796d1cdda15889fc0793eae50582d75f07d55d5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_fileconflicttype_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f818f570c555668314fa9ca657fba2fe3ffd8bd4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_depmod_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb39a9482b711d58a6c12840800f2372dee0c120 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_pkgreason_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 166 +++++++++++----------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 255 +++++++++++++++++---------------- lib/libalpm/alpm_list.c | 18 +++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_local.c | 193 +++++++++++--------------- lib/libalpm/be_package.c | 72 ++++++----- lib/libalpm/be_sync.c | 90 ++++++------ lib/libalpm/conflict.c | 131 ++++++++++-------- lib/libalpm/conflict.h | 3 + lib/libalpm/db.c | 70 +++++----- lib/libalpm/delta.c | 4 +- lib/libalpm/deps.c | 100 +++++++------- lib/libalpm/diskspace.c | 87 ++++-------- lib/libalpm/dload.c | 30 ++-- lib/libalpm/error.c | 102 +++++++------- lib/libalpm/handle.c | 30 ++-- lib/libalpm/log.c | 6 +- lib/libalpm/package.c | 42 +++++- lib/libalpm/package.h | 4 + lib/libalpm/remove.c | 161 +++++++++++----------- lib/libalpm/signing.c | 56 ++++---- lib/libalpm/sync.c | 174 ++++++++++++------------ lib/libalpm/trans.c | 54 ++++---- lib/libalpm/util.c | 56 ++++---- lib/libalpm/util.h | 4 +- src/pacman/callback.c | 80 ++++++------ src/pacman/conf.c | 110 ++++++++-------- src/pacman/database.c | 16 +- src/pacman/package.c | 16 +- src/pacman/pacman.c | 66 +++++----- src/pacman/query.c | 38 +++--- src/pacman/remove.c | 18 ++-- src/pacman/sync.c | 70 +++++----- src/pacman/upgrade.c | 28 ++-- src/pacman/util.c | 28 ++-- src/util/cleanupdelta.c | 6 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 10 +- test/pacman/tests/fileconflict001.py | 3 + test/pacman/tests/fileconflict002.py | 9 +- 41 files changed, 1220 insertions(+), 1193 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] be_sync: make READ_NEXT() a no-arg macro
by Dan McGee 03 Jul '11

03 Jul '11

We passed in 'line', but not 'buf.line'. In addition, the macros building off of READ_NEXT() assume variable names anyway. Since we only use these macros in one function, might as well simplify them. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ce418d5..cf12ef7 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -433,19 +433,19 @@ static int sync_db_populate(alpm_db_t *db) return count; } -#define READ_NEXT(s) do { \ +#define READ_NEXT() do { \ if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \ - s = _alpm_strtrim(buf.line); \ + line = _alpm_strtrim(buf.line); \ } while(0) #define READ_AND_STORE(f) do { \ - READ_NEXT(line); \ + READ_NEXT(); \ STRDUP(f, line, goto error); \ } while(0) #define READ_AND_STORE_ALL(f) do { \ char *linedup; \ - READ_NEXT(line); \ + READ_NEXT(); \ if(strlen(line) == 0) break; \ STRDUP(linedup, line, goto error); \ f = alpm_list_add(f, linedup); \ @@ -488,13 +488,13 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, char *line = _alpm_strtrim(buf.line); if(strcmp(line, "%NAME%") == 0) { - READ_NEXT(line); + READ_NEXT(); if(strcmp(line, pkg->name) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: name " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%VERSION%") == 0) { - READ_NEXT(line); + READ_NEXT(); if(strcmp(line, pkg->version) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: version " "mismatch on package %s\n"), db->treename, pkg->name); @@ -512,7 +512,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%ARCH%") == 0) { READ_AND_STORE(pkg->arch); } else if(strcmp(line, "%BUILDDATE%") == 0) { - READ_NEXT(line); + READ_NEXT(); pkg->builddate = _alpm_parsedate(line); } else if(strcmp(line, "%PACKAGER%") == 0) { READ_AND_STORE(pkg->packager); @@ -521,20 +521,20 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, * pkginfo_t struct. This can be done b/c CSIZE is currently only used * in sync databases, and SIZE is only used in local databases. */ - READ_NEXT(line); + READ_NEXT(); pkg->size = atol(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { - READ_NEXT(line); + READ_NEXT(); pkg->isize = atol(line); } else if(strcmp(line, "%MD5SUM%") == 0) { READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%SHA256SUM%") == 0) { /* we don't do anything with this value right now */ - READ_NEXT(line); + READ_NEXT(); } else if(strcmp(line, "%PGPSIG%") == 0) { READ_AND_STORE(pkg->base64_sig); } else if(strcmp(line, "%REPLACES%") == 0) { @@ -542,7 +542,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%DEPENDS%") == 0) { /* Different than the rest because of the _alpm_splitdep call. */ while(1) { - READ_NEXT(line); + READ_NEXT(); if(strlen(line) == 0) break; pkg->depends = alpm_list_add(pkg->depends, _alpm_splitdep(line)); } @@ -555,7 +555,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%DELTAS%") == 0) { /* Different than the rest because of the _alpm_delta_parse call. */ while(1) { - READ_NEXT(line); + READ_NEXT(); if(strlen(line) == 0) break; pkg->deltas = alpm_list_add(pkg->deltas, _alpm_delta_parse(line)); } -- 1.7.6

1 1

[pacman-dev] [PATCH] checkdeps: remove unnecessary list join and copy
by Dan McGee 03 Jul '11

03 Jul '11

We can just perform the same search operation on both lists. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/deps.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6ca79c3..34f74a5 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -269,22 +269,20 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps) { alpm_list_t *i, *j; - alpm_list_t *targets, *dblist = NULL, *modified = NULL; + alpm_list_t *dblist = NULL, *modified = NULL; alpm_list_t *baddeps = NULL; int nodepversion; CHECK_HANDLE(handle, return NULL); - targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade)); for(i = pkglist; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkg_find(targets, pkg->name)) { + if(_alpm_pkg_find(remove, pkg->name) || _alpm_pkg_find(upgrade, pkg->name)) { modified = alpm_list_add(modified, pkg); } else { dblist = alpm_list_add(dblist, pkg); } } - alpm_list_free(targets); nodepversion = no_dep_version(handle); -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: Add UPX compression support
by Allan McRae 03 Jul '11

03 Jul '11

This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 3 +++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 13 ++++++++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 24e1a12..4d76121 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -231,6 +231,9 @@ version. Appending the version yourself disables auto detection. *zipman*;; Compress man and info pages with gzip. + *upx*;; + Compress binary executable files using UPX. + *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3ce4759..48f5ef5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -114,7 +114,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's `--key` option. -**OPTIONS=(**strip !docs libtool emptydirs zipman**)**:: +**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -146,6 +146,10 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. + *upx*;; + Compress binary executable files using UPX. Additional options + can be passed to UPX by specifying the `UPXFLAGS` variable. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9a790fc..42ae940 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -60,7 +60,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -69,8 +69,9 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 78cd4cf..b0247bd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,7 @@ startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -940,6 +940,17 @@ tidy_install() { msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi + + if [[ $(check_option upx) = "y" ]]; then + msg2 "$(gettext "Compressing binaries with %s...")" "UPX" + local binary + find . -type f -perm -u+w 2>/dev/null | while read binary ; do + if [[ $(file -bi "$binary") = *'application/x-executable'* ]]; then + upx $UPXFLAGS "$binary" &>/dev/null || + warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" + fi + done + fi } find_libdepends() { -- 1.7.5.4

3 15

[pacman-dev] [PATCH] Add alpm_list_previous method
by Allan McRae 03 Jul '11

03 Jul '11

Helper function to get the previous item in a list Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 18 ++++++++++++++++++ lib/libalpm/alpm_list.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index c2b30ad..1976e13 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -556,6 +556,24 @@ inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node) } /** + * @brief Get the previous element of a list. + * + * @param list the list head + * @param node the list node + * + * @return the previous element, or NULL when no previous element exist + */ +inline alpm_list_t SYMEXPORT *alpm_list_previous(const alpm_list_t *list, + const alpm_list_t *node) +{ + if(node && node != list) { + return node->prev; + } else { + return NULL; + } +} + +/** * @brief Get the last item in the list. * * @param list the list diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 1f6393a..27a76d1 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -70,6 +70,7 @@ alpm_list_t *alpm_list_reverse(alpm_list_t *list); alpm_list_t *alpm_list_first(const alpm_list_t *list); alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n); alpm_list_t *alpm_list_next(const alpm_list_t *list); +alpm_list_t *alpm_list_previous(const alpm_list_t *list, const alpm_list_t *node); alpm_list_t *alpm_list_last(const alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); -- 1.7.6

1 1

[pacman-dev] [PATCH 1/4] pactest: add a few more checks to fileconflict checks
by Dan McGee 02 Jul '11

02 Jul '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/fileconflict001.py | 3 +++ test/pacman/tests/fileconflict002.py | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index 8c13911..dec6151 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -2,6 +2,7 @@ lp = pmpkg("dummy") lp.files = ["dir/realdir/", + "dir/realdir/realfile", "dir/symdir -> realdir"] self.addpkg2db("local", lp) @@ -18,5 +19,7 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("FILE_EXIST=dir/realdir/realfile") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py index f70873b..e107cd2 100644 --- a/test/pacman/tests/fileconflict002.py +++ b/test/pacman/tests/fileconflict002.py @@ -1,12 +1,16 @@ self.description = "Fileconflict with symlinks (2)" p1 = pmpkg("pkg1") -p1.files = ["dir/realdir/file", +p1.files = ["dir/", + "dir/realdir/", + "dir/realdir/file", "dir/symdir -> realdir"] self.addpkg(p1) p2 = pmpkg("pkg2") -p2.files = ["dir/symdir/file"] +p2.files = ["dir/", + "dir/symdir/", + "dir/symdir/file"] self.addpkg(p2) self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) @@ -14,5 +18,6 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True -- 1.7.6

1 3

[pacman-dev] pyalpm transaction initialize
by Yaşar Arabacı 01 Jul '11

01 Jul '11

Hi, I am just trying to figure out the pyalpm. I have no prior knowledge of libalpm itself.(Since I don't know C). I guess I figured out the most parts of using it, but I was wondering if someone can give me example usage of pyalpm.transaction.init() method. Especially the part where I pass arguments to it. What kind of arguments should I pass to that method? (list, tuple, kwargs,str??) I also wonder if I should pass some arguments to pyalpm.transaction.prepare, or I just use it as it is. Thanks in advance Yaşar Arabacı

2 2

[pacman-dev] [PATCH 0/9] PM_* to ALPM_* conversion
by Allan McRae 01 Jul '11

01 Jul '11

After changing types and function names to all have the "alpm" prefix, I assume we also want to do that for the members of our enums. That appears to be the last big change needed for consistent prefixing throughout libalpm. These patches are all available on my ALPM branch. @Dan: Assuming this is fine, I can send you a script that generates this patchset to allow you to "merge" this branch whenever you deem suitable. That should save rebasing time. Allan McRae (9): Prefix alpm_pkgreason_t members with ALPM Prefix alpm_depmod_t members with ALPM Prefix alpm_fileconflicttype_t members with ALPM Prefix alpm_loglevel_t members with ALPM Prefix alpm_transflag_t members with ALPM Prefix alpm_transevt_t members with ALPM Prefix alpm_transconv_t members with ALPM Prefix alpm_transprog_t members with ALPM Prefix _alpm_errno_t members with ALPM lib/libalpm/add.c | 166 +++++++++++++++--------------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 248 +++++++++++++++++++++++----------------------- lib/libalpm/be_local.c | 60 ++++++------ lib/libalpm/be_package.c | 58 ++++++------ lib/libalpm/be_sync.c | 66 ++++++------ lib/libalpm/conflict.c | 42 ++++---- lib/libalpm/db.c | 70 +++++++------- lib/libalpm/delta.c | 4 +- lib/libalpm/deps.c | 94 +++++++++--------- lib/libalpm/diskspace.c | 40 ++++---- lib/libalpm/dload.c | 30 +++--- lib/libalpm/error.c | 102 ++++++++++---------- lib/libalpm/handle.c | 30 +++--- lib/libalpm/log.c | 6 +- lib/libalpm/package.c | 4 +- lib/libalpm/remove.c | 120 +++++++++++----------- lib/libalpm/signing.c | 56 +++++----- lib/libalpm/sync.c | 174 ++++++++++++++++---------------- lib/libalpm/trans.c | 54 +++++----- lib/libalpm/util.c | 56 +++++----- lib/libalpm/util.h | 4 +- src/pacman/callback.c | 80 ++++++++-------- src/pacman/conf.c | 110 ++++++++++---------- src/pacman/database.c | 16 ++-- src/pacman/package.c | 8 +- src/pacman/pacman.c | 66 ++++++------ src/pacman/query.c | 32 +++--- src/pacman/remove.c | 18 ++-- src/pacman/sync.c | 70 +++++++------- src/pacman/upgrade.c | 28 +++--- src/pacman/util.c | 28 +++--- src/util/cleanupdelta.c | 6 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 10 +- 35 files changed, 981 insertions(+), 981 deletions(-) -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-403-gcf1401a
by dan＠archlinux.org 30 Jun '11

30 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via cf1401a04d5179c89af6460b812e171cc2da19f0 (commit) via 23a2d2c16a87dc8744b8307bded9fabb503dde13 (commit) via 68284da0d72bf27ac3dc5cfc1cd02d16f824130c (commit) via 6633b8e5c290dbb1b0382f3f960e1f7134247a68 (commit) via 98a2fc8deba6be37729c26cf68e9927f6466c95e (commit) via 35ffe6af2d8d38849a7711a4c6add3d14490816c (commit) via 0ed848a9ea7a543192cef1ca78695a9046ee4e98 (commit) via 13235ba65ab55d852dbdc0acabdc047442e74e28 (commit) via b94e8ecd1fec4426baab8c90e7fc0d5583acdbef (commit) from 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cf1401a04d5179c89af6460b812e171cc2da19f0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 29 18:25:44 2011 -0500 signing: check validity of all available signatures Change the check into a loop over all signatures present and returned by GPGME. Also modify the return values and checks slightly now that I know a little bit more about what type of values are returned. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 23a2d2c16a87dc8744b8307bded9fabb503dde13 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 15:41:56 2011 -0500 Make alpm_db_get_sigverify_level() public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68284da0d72bf27ac3dc5cfc1cd02d16f824130c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:05:21 2011 -0500 Add an alpm_db_get_valid() public function This allows one to check if a database is valid or invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6633b8e5c290dbb1b0382f3f960e1f7134247a68 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jun 25 16:45:01 2011 -0400 move proto files to new subdirectory, proto/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98a2fc8deba6be37729c26cf68e9927f6466c95e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 10:49:55 2011 -0400 pacman: return with 128+signum on signaled exit This is a convention that is widely followed in *nix and posix-ish environments. We should follow it, too. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35ffe6af2d8d38849a7711a4c6add3d14490816c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 12:02:33 2011 -0500 pactest: remove no longer necessary newline hacks libalpm can now cope with this as of commit 719e0d3ddb300. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ed848a9ea7a543192cef1ca78695a9046ee4e98 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:35:32 2011 -0500 pactest: create packages in memory This is similar to what was just done for the sync databases. Move a few pieces around so we never need to actually write out the filesystem to create a package, and simply stream the tarfile out from the data we've collected. Once again, a few newline addition hacks and other things have to be left in place in order not to break everything; this time however most of the assumptions are in pactest and not libalpm. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13235ba65ab55d852dbdc0acabdc047442e74e28 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 22:02:58 2011 -0500 Make local_db_read() private to the local backend There is little need to expose the guts of this function even within the library. Make it static in be_local.c, and clean up a few other things since we know exactly where it is being called from: * Remove unnecessary origin checks in _cache_get_*() methods- if you are calling a cache method your package type will be correct. * Remove sanity checks within local_db_read() itself- packages will always have a name and version if they get this far, and the package object will never be NULL either. The one case calling this from outside the backend was in add.c, where we forced a full load of a package before we duplicated it. Move this concern elsewhere and have pkg_dup() always force a full package load via a new force_load() function on the operations callback struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b94e8ecd1fec4426baab8c90e7fc0d5583acdbef Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 17:46:04 2011 -0500 Fix a few warnings pointed out via clang scan-build Some of these are legit (the backup hash NULL checks), while others are either extemely unlikely or just impossible for the static code analysis to prove, but are worth adding anyway because they have little overhead. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 +- lib/libalpm/add.c | 26 +++---- lib/libalpm/alpm.h | 16 ++++ lib/libalpm/backup.c | 2 +- lib/libalpm/be_local.c | 46 +++++------- lib/libalpm/be_sync.c | 5 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 19 +++++ lib/libalpm/db.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/package.c | 8 ++ lib/libalpm/package.h | 2 + lib/libalpm/signing.c | 72 +++++++----------- lib/libalpm/signing.h | 1 - lib/libalpm/sync.c | 2 +- ChangeLog.proto => proto/ChangeLog.proto | 0 PKGBUILD-split.proto => proto/PKGBUILD-split.proto | 0 PKGBUILD.proto => proto/PKGBUILD.proto | 0 proto.install => proto/proto.install | 0 src/pacman/pacman.c | 9 ++- test/pacman/pmdb.py | 9 +- test/pacman/pmpkg.py | 56 +++++++++----- test/pacman/pmtest.py | 9 +-- test/pacman/util.py | 80 ++++++++++++-------- 24 files changed, 213 insertions(+), 161 deletions(-) rename ChangeLog.proto => proto/ChangeLog.proto (100%) rename PKGBUILD-split.proto => proto/PKGBUILD-split.proto (100%) rename PKGBUILD.proto => proto/PKGBUILD.proto (100%) rename proto.install => proto/proto.install (100%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] repo-add test harness
by Dave Reisner 30 Jun '11

30 Jun '11

The attached script is what I used for testing my repo-add changes, and worked out rather well. It's extremely primitive, but it does a bit of a smoke test again bash3 and bash4, which is important. I imagine that the next step might be to take a variety of .PKGINFO files and provide those as inputs for writing DB entries. This is hopefuly the next thing on my plate after I get some more work done on the download code. d

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-394-g9efd10c
by dan＠archlinux.org 30 Jun '11

30 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a (commit) via c2cce4f3f5e0381d107ced3fee3ab0d7240653d1 (commit) via ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 (commit) via 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 (commit) via 002d2fda7a4e7f85798684c15809d30d27dc7034 (commit) via 2860ade2f5f827c41d84bc7826444792433c8009 (commit) via 84974ed04c16218608312ccf6369cf728eada477 (commit) via c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 (commit) via 4c80f994c34a64f14c46befcf7dbc376276f53d4 (commit) via e92905a2c8c14c7855e2841f44d3c139aa40844c (commit) via fed3e09c94d204b4655656c703a178e6fa2144b3 (commit) via b1894ccf062059972d39fa855ee7941b666c5db0 (commit) via f1bb56cebfda9b11ea02754d325ff659014e2caa (commit) via 9a29888ba72694ed0a8cba620387b3ee1ee39baa (commit) via 5f6e8c92741939a098bc14371fcde904fc9ed613 (commit) via 452bf71cec7a1a62bbee9d106733ad9ed398c6ee (commit) via 3bb469d558b5ad778f87a1427a45ec4190ba4155 (commit) via 7633c14bd5d8461c28ab900d3ddbec5f649932ee (commit) via 028b965e1a71aa85ba3772e20146d40d9006d8c9 (commit) via 925f42e460c2a2dd23f84d4504a14540670d1bd6 (commit) via 71fa9f912d65ff9d23d05ca42aa494d1d3f596f2 (commit) via 57b9b19b103a5d48a7116adfd546a516e121329c (commit) via 08fc1db24c9d30f63c9ac858ab2cc50f64f8e38b (commit) via ddad400900fbf253f6e247f51ef4aeb9d89d8643 (commit) via 1059df7486054c621423436b801681775a2596c3 (commit) via 565e167356c1ec56803454b2b4c617f21296fb67 (commit) via 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 (commit) via 590a8fcb1e72707d83d04f639385de0d7f2a60c1 (commit) via 0aef91bc4fc5e872afe7da1692bf97c027eecf37 (commit) via cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e (commit) via bfe1771067e372420d857094befd6c6ea5b28495 (commit) via 1fdbe7902219c5ed3e56b921acae4f3a58b9e76e (commit) via 37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc (commit) via 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (commit) via 6d876f9b6be055d54e50d42a34c267aad64c0b21 (commit) via 9540dfc4d9cc70266a425cc334f78d7805b2340b (commit) via 6b62508c865feaa35d000fa0bcd0ccd8321cd742 (commit) via 8a04bc25a14df93c0ca207ac83d43cdb867346a1 (commit) via 939d5a9511b2dcbb07390ecfcd23528d8034709b (commit) via 64c1cf792184661a1d3dd73329f129172e688f17 (commit) via 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (commit) via 0a80cf31cfe960b2c62e734aef6e3c662469e917 (commit) via 7ce674491bd854610855fe83482eda6b18273fa0 (commit) from 9aab1440cacf143b62f05ccfac0e7917ef9d4c45 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Jun 30 17:07:54 2011 +0200 fix vim syntax highlighting of .sh files vim recognises what type of shell script it's dealing with by looking at the shebang. If detection fails it falls back to sh which doesn't support some bash features. Adding a normal, possibly broken, shebang which gets fixed by the Makefile allows vim to detect bash syntax. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2cce4f3f5e0381d107ced3fee3ab0d7240653d1 Merge: ad577b3 9a29888 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 10:41:49 2011 -0500 Merge remote-tracking branch 'dave/makepkg' commit ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 Merge: 0f4aaee fed3e09 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 30 10:37:08 2011 -0500 Merge remote-tracking branch 'allan/breakshit' commit 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 29 09:22:24 2011 -0400 lib/util: modify entry_prefix, not prefix Modifying prefix caused tmp directories to be left behind after running scriptlets, and the path '/' to be passed to _alpm_rmrf. Broken in f01c6f. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 002d2fda7a4e7f85798684c15809d30d27dc7034 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 00:22:53 2011 -0400 lib/alpm: unlock the handle before freeing it This avoids, probably among other things, leaving the lock file in place after a SIGINT'd sync DB update. Fixes regression introduced in 4f8ae2b. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2860ade2f5f827c41d84bc7826444792433c8009 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jun 28 21:32:40 2011 -0400 repo-add.sh.in: avoid being clever with repo repacking Revert to the old behavior that 6f5a90 attempted to simplify and go with the original proposed solution of using "ugly" bash to detect empty directories. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84974ed04c16218608312ccf6369cf728eada477 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 19:53:12 2011 -0500 repo-add: fix db creation one last time We fubar-ed this pretty good. 1. The whole old/new move shuffle was totally busted if you used a relative path to your database, as we would just build the database in place. 2. Our prior temp directory layout had the database files extracted directly into it. When we tried to create a xxx.db.tar.gz file in this same directory, due to the fact that we were no longer using a shell wildcard, we tried to include the db in ourself, which is a big failure. Fix all this by extracting to tree/ so we can have a clean top-level temp directory. 3. Fix the inclusion of the './' directory entry; ensure the regex prunes both leading paths of '.' as well as './'. Where is that test suite again? Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 28 21:35:48 2011 -0500 makepkg: only source user override if using default config file Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c80f994c34a64f14c46befcf7dbc376276f53d4 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Tue Jun 28 08:22:57 2011 +0200 makepkg: fix typo (missing quotes) Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e92905a2c8c14c7855e2841f44d3c139aa40844c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 22:47:35 2011 +1000 makepkg: fix removing symbolic link The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fed3e09c94d204b4655656c703a178e6fa2144b3 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:59:48 2011 +1000 Use ignoregroup rather than ignoregrp in the handle This matches the naming in pacman.conf. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1894ccf062059972d39fa855ee7941b666c5db0 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:52:33 2011 +1000 Rename internal functions with grp in their name The following function renames take place for the same reasoning as the previous commit: _alpm_grp_new -> _alpm_group_new _alpm_grp_free -> _alpm_group_free _alpm_db_free_grpcache -> _alpm_db_free_groupcache _alpm_db_get_grpfromcache -> _alpm_db_get_groupfromcache Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f1bb56cebfda9b11ea02754d325ff659014e2caa Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 29 15:46:49 2011 +1000 Rename public functions with grp in their name Using grp instead of group is a small saving at the cost of clarity. Rename the following functions: alpm_option_get_ignoregrps -> alpm_option_get_ignoregroups alpm_option_add_ignoregrp -> alpm_option_add_ignoregroup alpm_option_set_ignoregrps -> alpm_option_set_ignoregroups alpm_option_remove_ignoregrp -> alpm_option_remove_ignoregroup alpm_db_readgrp -> alpm_db_readgroup alpm_db_get_grpcache -> alpm_db_get_groupcache alpm_find_grp_pkgs -> alpm_find_group_pkgs Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a29888ba72694ed0a8cba620387b3ee1ee39baa Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:36:41 2011 -0400 makepkg: simplify SIGNPKG check Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5f6e8c92741939a098bc14371fcde904fc9ed613 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:35:44 2011 -0400 makepkg: fix vim syntax highlighting Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 452bf71cec7a1a62bbee9d106733ad9ed398c6ee Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 28 22:35:10 2011 -0400 makepkg: remove unneeded echo Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3bb469d558b5ad778f87a1427a45ec4190ba4155 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 15:31:21 2011 +1000 Update README with changes to struct names Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7633c14bd5d8461c28ab900d3ddbec5f649932ee Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 15:00:46 2011 +1000 Rename _pmdbstatus_t to _alpm_dbstatus_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 028b965e1a71aa85ba3772e20146d40d9006d8c9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:59:04 2011 +1000 Rename pmdbinfrq_t to alpm_dbinfrq_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 925f42e460c2a2dd23f84d4504a14540670d1bd6 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:57:47 2011 +1000 Rename pmtransstate_t to alpm_transstate_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71fa9f912d65ff9d23d05ca42aa494d1d3f596f2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:56:29 2011 +1000 Rename pmpkghash_t to alpm_pkghash_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 57b9b19b103a5d48a7116adfd546a516e121329c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:54:19 2011 +1000 Rename pmgraph_t to alpm_graph_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08fc1db24c9d30f63c9ac858ab2cc50f64f8e38b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:52:50 2011 +1000 Rename pmpkgfrom_t to alpm_pkgfrom_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ddad400900fbf253f6e247f51ef4aeb9d89d8643 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:50:48 2011 +1000 Rename pmerrno_t to alpm_errno_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1059df7486054c621423436b801681775a2596c3 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:48:50 2011 +1000 Rename pmtransprog_t to alpm_transprog_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 565e167356c1ec56803454b2b4c617f21296fb67 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:46:58 2011 +1000 Rename pmtransconv_t to alpm_transconv_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:43:48 2011 +1000 Rename pmtransevt_t to alpm_transevt_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 590a8fcb1e72707d83d04f639385de0d7f2a60c1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:42:24 2011 +1000 Rename pmtransflag_t to alpm_transflag_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0aef91bc4fc5e872afe7da1692bf97c027eecf37 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:41:07 2011 +1000 Rename pmloglevel_t to alpm_loglevel_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd1e39ba62ea564c1c29a918aa1a4d6aac9a351e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:39:43 2011 +1000 Rename pmbackup_t to alpm_backup_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bfe1771067e372420d857094befd6c6ea5b28495 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:38:38 2011 +1000 Rename pmdelta_t to alpm_delta_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1fdbe7902219c5ed3e56b921acae4f3a58b9e76e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:37:16 2011 +1000 Rename pmgrp_t to alpm_group_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:35:17 2011 +1000 Rename pmfileconflict_t to alpm_fileconflict_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:33:55 2011 +1000 Rename pmconflict_t to alpm_conflict_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6d876f9b6be055d54e50d42a34c267aad64c0b21 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:32:09 2011 +1000 Rename pmdepmissing_t to alpm_depmissing_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9540dfc4d9cc70266a425cc334f78d7805b2340b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:29:55 2011 +1000 Rename pmdepend_t to alpm_depend_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6b62508c865feaa35d000fa0bcd0ccd8321cd742 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 23:27:16 2011 +1000 Rename pmtrans_t to alpm_trans_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a04bc25a14df93c0ca207ac83d43cdb867346a1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 23:26:39 2011 +1000 Rename pmpkg_t to alpm_pkg_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 939d5a9511b2dcbb07390ecfcd23528d8034709b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:11:43 2011 +1000 Rename pmdb_t to alpm_db_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 64c1cf792184661a1d3dd73329f129172e688f17 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 14:04:00 2011 +1000 Rename pmhandle_t to alpm_handle_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:58:59 2011 +1000 Rename pmfileconflicttype_t to alpm_fileconflicttype_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0a80cf31cfe960b2c62e734aef6e3c662469e917 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:56:46 2011 +1000 Rename pmdepmod_t to alpm_depmod_t Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ce674491bd854610855fe83482eda6b18273fa0 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 28 13:54:04 2011 +1000 Rename pmpkgreason_t to alpm_pkgreason_t Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +- contrib/Makefile.am | 2 +- contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- lib/libalpm/add.c | 34 ++-- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 13 +- lib/libalpm/alpm.h | 356 +++++++++++++++++++------------------- lib/libalpm/backup.c | 16 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 82 +++++----- lib/libalpm/be_package.c | 30 ++-- lib/libalpm/be_sync.c | 34 ++-- lib/libalpm/conflict.c | 62 ++++---- lib/libalpm/conflict.h | 12 +- lib/libalpm/db.c | 110 ++++++------ lib/libalpm/db.h | 62 ++++---- lib/libalpm/delta.c | 68 ++++---- lib/libalpm/delta.h | 8 +- lib/libalpm/deps.c | 136 ++++++++-------- lib/libalpm/deps.h | 16 +- lib/libalpm/diskspace.c | 18 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 6 +- lib/libalpm/dload.h | 4 +- lib/libalpm/error.c | 4 +- lib/libalpm/graph.c | 8 +- lib/libalpm/graph.h | 8 +- lib/libalpm/group.c | 8 +- lib/libalpm/group.h | 4 +- lib/libalpm/handle.c | 120 +++++++------- lib/libalpm/handle.h | 22 ++-- lib/libalpm/log.c | 4 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 158 +++++++++--------- lib/libalpm/package.h | 86 +++++----- lib/libalpm/pkghash.c | 36 ++-- lib/libalpm/pkghash.h | 18 +- lib/libalpm/remove.c | 48 +++--- lib/libalpm/remove.h | 8 +- lib/libalpm/signing.c | 12 +- lib/libalpm/signing.h | 4 +- lib/libalpm/sync.c | 110 ++++++------ lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 38 ++-- lib/libalpm/trans.h | 20 +- lib/libalpm/util.c | 16 +- lib/libalpm/util.h | 18 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 21 +-- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 29 ++-- src/pacman/callback.c | 10 +- src/pacman/callback.h | 8 +- src/pacman/conf.c | 10 +- src/pacman/conf.h | 4 +- src/pacman/database.c | 4 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 14 +- src/pacman/package.h | 8 +- src/pacman/query.c | 40 +++--- src/pacman/remove.c | 14 +- src/pacman/sync.c | 84 +++++----- src/pacman/upgrade.c | 12 +- src/pacman/util.c | 40 +++--- src/pacman/util.h | 14 +- src/util/cleanupdelta.c | 10 +- src/util/pactree.c | 18 +- src/util/testdb.c | 14 +- src/util/testpkg.c | 8 +- 75 files changed, 1115 insertions(+), 1108 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] fix vim syntax highlighting of .sh files
by Florian Pritz 30 Jun '11

30 Jun '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- contrib/Makefile.am | 2 +- contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e9f7794..cba2085 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -27,7 +27,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @echo ' ' GEN $@; diff --git a/contrib/bacman.in b/contrib/bacman.in index ebcc386..fe13e5b 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index ac4ce89..3f26f38 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 8ad5173..37d3fea 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e34c300..8491b74 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \ + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..34c3b86 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index fa4cb2b..3e0d702 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 7cdb683..877cca2 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 0dc32bf..5ff302e 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index c8b8a1f..46c6f4f 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 64d5a73..a0ff6d5 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 17b32aa..158c0c1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -- 1.7.6

2 1

[pacman-dev] [PATCH] contrib/paclist: rewrite in bash
by Dave Reisner 30 Jun '11

30 Jun '11

The original concept for this script was a bash implementation, but turned out to be unreasonable at the time due to the efficiencies of the database format. Since those have been resolved, we can rewrite this in bash as a much simpler script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Restore this script it its original intended glory in beautiful bash. I opted for the gettext bindings to preserve pacman error messages. contrib/paclist.in | 83 +++++++++++---------------------------------------- 1 files changed, 18 insertions(+), 65 deletions(-) diff --git a/contrib/paclist.in b/contrib/paclist.in index 0379a4c..f6629e6 100755 --- a/contrib/paclist.in +++ b/contrib/paclist.in @@ -1,7 +1,8 @@ -#!/usr/bin/perl +#!@BASH_SHELL@ # paclist - List all packages installed from a given repo # # Copyright (C) 2008 Dan McGee <dpmcgee(a)gmail.com> +# Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,73 +17,25 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -use strict; -use warnings; +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' -my $progname = "paclist"; -my $version = "1.0"; - -if ($#ARGV != 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { - print "$progname - List all packages installed from a given repo\n"; - print "Usage: $progname <repo>\n"; - print "Example: $progname testing\n"; - if ($#ARGV != 0) { - exit 1; +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" } - exit 0; -} - -if ( $ARGV[0] eq "--version" || $ARGV[0] eq "-v") { - print "$progname version $version\n"; - print "Copyright (C) 2008 Dan McGee\n"; - exit 0; -} - -# This hash table will be used to store pairs of ('name version', count) from -# the return of both pacman -Sl <repo> and pacman -Q output. We then check to -# see if a value was added twice (count = 2)- if so, we will print that package -# as it is both in the repo we queried and installed on our local system. -my %packages = (); -my $output; +fi -$output = `pacman -Sl $ARGV[0]`; -if ($? != 0) { - exit 1; -} -my @sync = split(/\n/, $output); -# sample output from pacman -Sl: -# testing foobar 1.0-1 -foreach $_ (@sync) { - my @info = split(/ /); - # we only want to store 'foobar 1.0-1' in our hash table - my $pkg = $info[1] . " " . $info[2]; - $packages{$pkg}++; -} +if [[ -z $1 ]]; then + printf 'usage: %s <repo>\n' "${0##*/}" + exit 1 +fi -$output = `pacman -Q`; -if ($? != 0) { - exit 1; -} -# sample output from pacman -Q: -# foobar 1.0-1 -my @local = split(/\n/, $output); -foreach $_ (@local) { - # store 'foobar 1.0-1' in our hash table - $packages{$_}++; -} - -# run comparison check- if value was added twice, it was in the intersection -my @intersection; -foreach $_ (keys %packages) { - if ($packages{$_} == 2) { - push @{ \@intersection }, $_; - } -} +printf -v installed '[%s]' "$(gettext installed)" +pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2 }' -# print our intersection, and bask in the glory and speed of perl -@intersection = sort @intersection; -foreach $_ (@intersection) { - print $_ . "\n"; -} +# exit with pacman's return value, not awk's +exit ${PIPESTATUS[0]} -#vim: set noet: +# vim: set ts=2 sw=2 noet: -- 1.7.6

2 4

[pacman-dev] [PATCH 0/3] minor makepkg cleanups
by Dave Reisner 30 Jun '11

30 Jun '11

Just some trivial code cleanups and simplifications I came across looking for other bugs. Dave Reisner (3): makepkg: remove unneeded echo makepkg: fix vim syntax highlighting makepkg: simplify SIGNPKG check scripts/makepkg.sh.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) -- 1.7.6

3 6

[pacman-dev] [PATCH] lib/alpm: unlock the handle before freeing it
by Dave Reisner 30 Jun '11

30 Jun '11

This avoids, probably among other things, leaving the lock file in place after a SIGINT interrupts a sync DB update. Fixes regression introduced in 4f8ae2b. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dan this seems to work (surviving a variety of -Sy and -Syu <pkg> testcases) and pactest doesn't complain, but you know this portion of the code way better than I do. Does this seem sane? lib/libalpm/alpm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index b0bbbe8..d35512b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -117,6 +117,7 @@ int SYMEXPORT alpm_release(pmhandle_t *myhandle) ret = -1; } + _alpm_handle_unlock(myhandle); _alpm_handle_free(myhandle); #ifdef HAVE_LIBCURL -- 1.7.6

1 0

[pacman-dev] [PATCH] move proto files to new subdirectory, proto/
by Dave Reisner 30 Jun '11

30 Jun '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Since we're moving to cleanup the root dir, this seemed like low hanging fruit. Yes Dan, I ran distcheck and it passed. ChangeLog.proto | 16 ---------- Makefile.am | 6 +++- PKGBUILD-split.proto | 70 -------------------------------------------- PKGBUILD.proto | 47 ----------------------------- proto.install | 37 ----------------------- proto/ChangeLog.proto | 16 ++++++++++ proto/PKGBUILD-split.proto | 70 ++++++++++++++++++++++++++++++++++++++++++++ proto/PKGBUILD.proto | 47 +++++++++++++++++++++++++++++ proto/proto.install | 37 +++++++++++++++++++++++ 9 files changed, 175 insertions(+), 171 deletions(-) delete mode 100644 ChangeLog.proto delete mode 100644 PKGBUILD-split.proto delete mode 100644 PKGBUILD.proto delete mode 100644 proto.install create mode 100644 proto/ChangeLog.proto create mode 100644 proto/PKGBUILD-split.proto create mode 100644 proto/PKGBUILD.proto create mode 100644 proto/proto.install diff --git a/ChangeLog.proto b/ChangeLog.proto deleted file mode 100644 index 87e86e7..0000000 --- a/ChangeLog.proto +++ /dev/null @@ -1,16 +0,0 @@ -2007-12-01 Your Name <youremail(a)domain.com> - - * pkgver-pkgrel : - new upstream release. - Reason we changed stuff. - Another reason we changed stuff. - - * gcc-4.1.patch : - Removed, no longer needed. - -2007-11-01 Your Name <youremail(a)domain.com> - - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. diff --git a/Makefile.am b/Makefile.am index dddb751..286e6ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,11 @@ EXTRA_DIST = HACKING # Sample makepkg prototype files pkgdatadir = ${datadir}/${PACKAGE} -dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto +dist_pkgdata_DATA = \ + proto/PKGBUILD.proto \ + proto/PKGBUILD-split.proto \ + proto/proto.install \ + proto/ChangeLog.proto # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto deleted file mode 100644 index 52aacc5..0000000 --- a/PKGBUILD-split.proto +++ /dev/null @@ -1,70 +0,0 @@ -# This is an example of a PKGBUILD for splitting packages. Use this as a -# start to creating your own, and remove these comments. For more information, -# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! -# If it is unknown, then please put 'unknown'. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=('pkg1' 'pkg2') -pkgbase=BASE -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgbase-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package_pkg1() { - # options and directives that can be overridden - pkgver= - pkgrel= - pkgdesc="" - arch=() - license=() - groups=() - depends=() - optdepends=() - provides=() - conflicts=() - replaces=() - backup=() - options=() - install= - changelog= - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 -} - -package_pkg2() { - # options and directives overrides - pkgdesc="" - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 -} diff --git a/PKGBUILD.proto b/PKGBUILD.proto deleted file mode 100644 index 98172d8..0000000 --- a/PKGBUILD.proto +++ /dev/null @@ -1,47 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgname-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/proto.install b/proto.install deleted file mode 100644 index 2a8993d..0000000 --- a/proto.install +++ /dev/null @@ -1,37 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - -## arg 1: the new package version -#post_install() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#post_upgrade() { - # do something here -#} - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -#post_remove() { - # do something here -#} - -# vim:set ts=2 sw=2 et: diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto new file mode 100644 index 0000000..87e86e7 --- /dev/null +++ b/proto/ChangeLog.proto @@ -0,0 +1,16 @@ +2007-12-01 Your Name <youremail(a)domain.com> + + * pkgver-pkgrel : + new upstream release. + Reason we changed stuff. + Another reason we changed stuff. + + * gcc-4.1.patch : + Removed, no longer needed. + +2007-11-01 Your Name <youremail(a)domain.com> + + * 1.0-5 : + added ChangeLog. + the last line should end with just one newline. + you can cat the file to check it displays fine. diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto new file mode 100644 index 0000000..52aacc5 --- /dev/null +++ b/proto/PKGBUILD-split.proto @@ -0,0 +1,70 @@ +# This is an example of a PKGBUILD for splitting packages. Use this as a +# start to creating your own, and remove these comments. For more information, +# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! +# If it is unknown, then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=('pkg1' 'pkg2') +pkgbase=BASE +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgbase-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgbase-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package_pkg1() { + # options and directives that can be overridden + pkgver= + pkgrel= + pkgdesc="" + arch=() + license=() + groups=() + depends=() + optdepends=() + provides=() + conflicts=() + replaces=() + backup=() + options=() + install= + changelog= + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg1 +} + +package_pkg2() { + # options and directives overrides + pkgdesc="" + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg2 +} diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto new file mode 100644 index 0000000..98172d8 --- /dev/null +++ b/proto/PKGBUILD.proto @@ -0,0 +1,47 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgname-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/proto/proto.install b/proto/proto.install new file mode 100644 index 0000000..2a8993d --- /dev/null +++ b/proto/proto.install @@ -0,0 +1,37 @@ +# This is a default template for a post-install scriptlet. +# Uncomment only required functions and remove any functions +# you don't need (and this header). + +## arg 1: the new package version +#pre_install() { + # do something here +#} + +## arg 1: the new package version +#post_install() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#pre_upgrade() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#post_upgrade() { + # do something here +#} + +## arg 1: the old package version +#pre_remove() { + # do something here +#} + +## arg 1: the old package version +#post_remove() { + # do something here +#} + +# vim:set ts=2 sw=2 et: -- 1.7.6

1 0

[pacman-dev] [PATCH] repo-add: fix db creation one last time
by Dan McGee 30 Jun '11

30 Jun '11

We fubar-ed this pretty good. 1. The whole old/new move shuffle was totally busted if you used a relative path to your database, as we would just build the database in place. 2. Our prior temp directory layout had the database files extracted directly into it. When we tried to create a xxx.db.tar.gz file in this same directory, due to the fact that we were no longer using a shell wildcard, we tried to include the db in ourself, which is a big failure. Fix all this by extracting to tree/ so we can have a clean top-level temp directory. 3. Fix the inclusion of the './' directory entry; ensure the regex prunes both leading paths of '.' as well as './'. Where is that test suite again? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 17b32aa..a845049 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -100,7 +100,7 @@ format_entry() { find_pkgentry() { local pkgname=$1 local pkgentry - for pkgentry in $tmpdir/$pkgname*; do + for pkgentry in $tmpdir/tree/$pkgname*; do name=${pkgentry##*/} if [[ ${name%-*-*} = $pkgname ]]; then echo $pkgentry @@ -285,7 +285,7 @@ db_write_entry() { return 1 fi - pushd "$tmpdir" >/dev/null + pushd "$tmpdir/tree" >/dev/null if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" else @@ -350,7 +350,7 @@ db_write_entry() { # create files file if wanted if (( WITHFILES )); then msg2 "$(gettext "Creating '%s' db entry...")" 'files' - local files_path="$tmpdir/$pkgname-$pkgver/files" + local files_path="$tmpdir/tree/$pkgname-$pkgver/files" echo "%FILES%" >$files_path bsdtar --exclude='^.*' -tf "$pkgfile" >>$files_path fi @@ -381,7 +381,7 @@ db_remove_entry() { while [[ -n $pkgentry ]]; do notfound=0 if [[ -f $pkgentry/deltas ]]; then - mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas" + mv "$pkgentry/deltas" "$tmpdir/tree/$pkgname.deltas" fi msg2 "$(gettext "Removing existing entry '%s'...")" \ "${pkgentry##*/}" @@ -443,7 +443,7 @@ check_repo_db() { fi verify_signature "$REPO_DB_FILE" msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir" + bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir/tree" else case "$cmd" in repo-remove) @@ -509,7 +509,7 @@ remove() { msg "$(gettext "Searching for package '%s'...")" "$pkgname" if db_remove_entry "$pkgname"; then - rm -f "$tmpdir/$pkgname.deltas" + rm -f "$tmpdir/tree/$pkgname.deltas" return 0 else error "$(gettext "Package matching '%s' not found.")" "$pkgname" @@ -561,6 +561,7 @@ fi tmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) +mkdir $tmpdir/tree trap 'clean_up' EXIT trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT @@ -628,12 +629,13 @@ if (( success )); then TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE") filename=${REPO_DB_FILE##*/} - pushd "$tmpdir" >/dev/null + pushd "$tmpdir/tree" >/dev/null # strip the './' off filenames; this also allows us to tar an empty dir - bsdtar -s %^./%% -c${TAR_OPT}f "$REPO_DB_FILE" ./ - create_signature "$filename" + bsdtar -s '%^./\?%%' -c${TAR_OPT}f "$tmpdir/$filename" ./ popd >/dev/null + create_signature "$tmpdir/$filename" + [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $REPO_DB_FILE.sig ]] && rm -f "$REPO_DB_FILE.sig" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" -- 1.7.6

4 6

[pacman-dev] [PATCH] makepkg: fix removing symbolic link
by Allan McRae 29 Jun '11

29 Jun '11

The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..edfa9e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -518,7 +518,7 @@ download_sources() { local file=$(get_filepath "$netfile" || true) if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" - rm -f "$srcdir/$file" + rm -f "$srcdir/${file##*/}" ln -s "$file" "$srcdir/" continue fi -- 1.7.6

2 4

[pacman-dev] [PATCH] lib/util: modify entry_prefix, not prefix
by Dave Reisner 29 Jun '11

29 Jun '11

Modifying prefix caused tmp directories to be left behind after running scriptlets, and the path '/' to be passed to _alpm_rmrf. Broken in f01c6f. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 6fbe08a..028ed8a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -300,7 +300,7 @@ int _alpm_unpack(pmhandle_t *handle, const char *archive, const char *prefix, /* If specific files were requested, skip entries that don't match. */ if(list) { char *entry_prefix = strdup(entryname); - char *p = strstr(prefix,"/"); + char *p = strstr(entry_prefix,"/"); if(p) { *(p+1) = '\0'; } -- 1.7.6

2 1

[pacman-dev] [PATCH] Make local_db_read() private to the local backend
by Dan McGee 29 Jun '11

29 Jun '11

There is little need to expose the guts of this function even within the library. Make it static in be_local.c, and clean up a few other things since we know exactly where it is being called from: * Remove unnecessary origin checks in _cache_get_*() methods- if you are calling a cache method your package type will be correct. * Remove sanity checks within local_db_read() itself- packages will always have a name and version if they get this far, and the package object will never be NULL either. The one case calling this from outside the backend was in add.c, where we forced a full load of a package before we duplicated it. Move this concern elsewhere and have pkg_dup() always force a full package load via a new force_load() function on the operations callback struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 3 --- lib/libalpm/be_local.c | 45 +++++++++++++++++---------------------------- lib/libalpm/db.h | 1 - lib/libalpm/package.c | 8 ++++++++ lib/libalpm/package.h | 2 ++ 5 files changed, 27 insertions(+), 32 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 4f6c9d4..3df69f8 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -470,9 +470,6 @@ static int commit_single_pkg(pmhandle_t *handle, pmpkg_t *newpkg, /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_dup(local); - /* make sure all infos are loaded because the database entry - * will be removed soon */ - _alpm_local_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL); EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); _alpm_log(handle, PM_LOG_DEBUG, "upgrading package %s-%s\n", diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5006688..108980f 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -41,10 +41,12 @@ #include "package.h" #include "deps.h" +static int local_db_read(pmpkg_t *info, pmdbinfrq_t inforeq); + #define LAZY_LOAD(info, errret) \ do { \ - if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \ - _alpm_local_db_read(pkg->origin_data.db, pkg, info); \ + if(!(pkg->infolevel & info)) { \ + local_db_read(pkg, info); \ } \ } while(0) @@ -135,9 +137,7 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg) static int _cache_has_scriptlet(pmpkg_t *pkg) { - if(!(pkg->infolevel & INFRQ_SCRIPTLET)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_SCRIPTLET); - } + LAZY_LOAD(INFRQ_SCRIPTLET, NULL); return pkg->scriptlet; } @@ -179,19 +179,13 @@ static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg) static alpm_list_t *_cache_get_files(pmpkg_t *pkg) { - if(pkg->origin == PKG_FROM_LOCALDB - && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES); - } + LAZY_LOAD(INFRQ_FILES, NULL); return pkg->files; } static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) { - if(pkg->origin == PKG_FROM_LOCALDB - && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES); - } + LAZY_LOAD(INFRQ_FILES, NULL); return pkg->backup; } @@ -239,6 +233,11 @@ static int _cache_changelog_close(const pmpkg_t UNUSED *pkg, void *fp) return fclose((FILE *)fp); } +static int _cache_force_load(pmpkg_t *pkg) +{ + return local_db_read(pkg, INFRQ_ALL); +} + /** The local database operations struct. Get package fields through * lazy accessor methods that handle any backend loading and caching @@ -271,6 +270,8 @@ static struct pkg_operations local_pkg_ops = { .changelog_open = _cache_changelog_open, .changelog_read = _cache_changelog_read, .changelog_close = _cache_changelog_close, + + .force_load = _cache_force_load, }; static int checkdbdir(pmdb_t *db) @@ -460,7 +461,7 @@ static int local_db_populate(pmdb_t *db) pkg->handle = db->handle; /* explicitly read with only 'BASE' data, accessors will handle the rest */ - if(_alpm_local_db_read(db, pkg, INFRQ_BASE) == -1) { + if(local_db_read(pkg, INFRQ_BASE) == -1) { _alpm_log(db->handle, PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name); _alpm_pkg_free(pkg); continue; @@ -498,25 +499,13 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) } -int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) +static int local_db_read(pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; char line[1024]; char *pkgpath = NULL; - - if(info == NULL || info->name == NULL || info->version == NULL) { - _alpm_log(db->handle, PM_LOG_DEBUG, - "invalid package entry provided to _alpm_local_db_read, skipping\n"); - return -1; - } - - if(info->origin != PKG_FROM_LOCALDB) { - _alpm_log(db->handle, PM_LOG_DEBUG, - "request to read info for a non-local package '%s', skipping...\n", - info->name); - return -1; - } + pmdb_t *db = info->origin_data.db; /* bitmask logic here: * infolevel: 00001111 diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 0318734..b51412a 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -87,7 +87,6 @@ pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename, void _alpm_db_unregister(pmdb_t *db); /* be_*.c, backend specific calls */ -int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info); int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 75ac94c..f44cd41 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -126,6 +126,8 @@ static int _pkg_changelog_close(const pmpkg_t UNUSED *pkg, return EOF; } +static int _pkg_force_load(pmpkg_t UNUSED *pkg) { return 0; } + /** The standard package operations struct. Get fields directly from the * struct itself with no abstraction layer or any type of lazy loading. */ @@ -157,6 +159,8 @@ struct pkg_operations default_pkg_ops = { .changelog_open = _pkg_changelog_open, .changelog_read = _pkg_changelog_read, .changelog_close = _pkg_changelog_close, + + .force_load = _pkg_force_load, }; /* Public functions for getting package information. These functions @@ -437,6 +441,10 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) pmpkg_t *newpkg; alpm_list_t *i; + if(pkg->ops->force_load(pkg)) { + return NULL; + } + CALLOC(newpkg, 1, sizeof(pmpkg_t), goto cleanup); newpkg->name_hash = pkg->name_hash; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index d18020d..bbb4999 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -76,6 +76,8 @@ struct pkg_operations { size_t (*changelog_read) (void *, size_t, const pmpkg_t *, const void *); int (*changelog_close) (const pmpkg_t *, void *); + int (*force_load) (pmpkg_t *); + /* still to add: * checkmd5sum() ? * compute_requiredby() -- 1.7.6

2 1

[pacman-dev] Patch: Add install like support to makepkg for repo-add
by Simon Gomizelj 29 Jun '11

29 Jun '11

Hi, First of all, I'd like to say that this is both my first patch ever to an upstream project and my first time posting on a development mailing list. I apologize in advance if I have befouled the rules of this list. I recently started playing with repo-add to build a custom repo. I have a netbook and would like to avoid building packages directly on the machine. However I missed the niceness of automatic install with makepkg's -i flag. I have attempted to recreate this support for repo management by adding an -a/--repoadd flag which, instead of using pacman to install the package, adds it to a repo. In order for this to work REPO_PATH and REPO_DB need to be set in makepkg.conf, REPO_PATH being the path of the repository and REPO_DB being the location of the database inside REPO_PATH. I have only recently started playing with repo-add and I admit I'm not very confident with my code. If there is any interest upstream for this functionality, I'm willing to put in the time to perfect this patch if someone can point me in the right direction. >From 56ef40a2dbe42fafd32a152d102962d52e33e6f4 Mon Sep 17 00:00:00 2001 From: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Sat, 11 Jun 2011 21:16:11 -0400 Subject: [PATCH] Added repo-add support. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- scripts/makepkg.sh.in | 84 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 81 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b3081fc..348cb78 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -61,6 +61,7 @@ INFAKEROOT=0 GENINTEG=0 SKIPINTEG=0 INSTALL=0 +REPOADD=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 @@ -401,6 +402,33 @@ run_pacman() { eval "$cmd" } +run_repocp() { + local cmd + printf -v cmd "%q " "cp" -t $REPO_PATH "$@" + warning "$cmd" + if (( ! ASROOT )); then + if type -p sudo >/dev/null; then + cmd="sudo $cmd" + else + cmd="su root -c '$cmd'" + fi + fi + eval "$cmd" +} + +run_repoadd() { + local cmd + printf -v cmd "%q " "$REPO_ADD" $REPO_ADD_OPTS "$@" + if (( ! ASROOT )); then + if type -p sudo >/dev/null; then + cmd="sudo $cmd" + else + cmd="su root -c '$cmd'" + fi + fi + eval "$cmd" +} + check_deps() { (( $# > 0 )) || return 0 @@ -1241,6 +1269,39 @@ install_package() { fi } +repoadd_package() { + (( ! REPOADD )) && return + + if (( ! SPLITPKG )); then + msg "$(gettext "Adding package %s to repo %s with %s...")" "$pkgname" "$REPO_DB" "$REPO_ADD" + else + msg "$(gettext "Adding %s package group to repo with %s...")" "$pkgbase" "$REPO_DB" "$REPO_ADD" + fi + + local fullver pkg pkglist repolist + for pkg in ${pkgname[@]}; do + # TODO: this wasn't properly fixed in commit 2020e629 + fullver=$(get_full_version $epoch $pkgver $pkgrel) + if [[ -f $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT} ]]; then + pkglist+=" $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT}" + repolist+=" $REPO_PATH/${pkg}-${fullver}-${CARCH}${PKGEXT}" + else + pkglist+=" $REPO_PATH/${pkg}-${fullver}-any${PKGEXT}" + repolist+=" $REPO_PATH/${pkg}-${fullver}-any${PKGEXT}" + fi + done + + if ! run_repocp $pkglist; then + warning "$(gettext "Failed to copy package(s) to %s." "$REPO_PATH")" + return 0 + fi + + if ! run_repoadd $REPO_PATH/$REPO_DB $repolist; then + warning "$(gettext "Failed to add package(s) to repo %s." "$REPO_DB")" + return 0 + fi +} + check_sanity() { # check for no-no's in the build script local i @@ -1609,6 +1670,7 @@ usage() { echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -i, --install Install package after successful build")" + echo "$(gettext " -a, --repoadd Add the package to a repo after successful build")" echo "$(gettext " -L, --log Log package build process")" echo "$(gettext " -m, --nocolor Disable colorized output messages")" echo "$(gettext " -o, --nobuild Download and extract files only")" @@ -1659,10 +1721,10 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcCdefFghiaLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" +OPT_LONG+=",install,repoadd,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" @@ -1697,6 +1759,7 @@ while true; do -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; + -a|--repoadd) REPOADD=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; @@ -1749,6 +1812,9 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} +# set repoadd command if not already defined +REPO_ADD=${REPO_ADD:-repo-add} + # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then @@ -1970,6 +2036,10 @@ if (( ! SPLITPKG )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? + elif (( REPOADD )); then + warning "$(gettext "A package has already been built, adding existing package...")" + repoadd_package + exit $? else error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 @@ -1994,6 +2064,10 @@ else warning "$(gettext "The package group has already been built, installing existing packages...")" install_package exit $? + elif (( REPOADD )); then + warning "$(gettext "The package group has already been built, adding existing packages...")" + repoadd_package + exit $? else error "$(gettext "The package group has already been built. (use -f to overwrite)")" exit 1 @@ -2174,7 +2248,11 @@ fi fullver=$(get_full_version $epoch $pkgver $pkgrel) msg "$(gettext "Finished making: %s")" "$pkgbase $fullver ($(date))" -install_package +if (( INSTALL )); then + install_package +elif (( REPOADD )); then + repoadd_package +fi exit 0 #E_OK -- 1.7.5.2

3 2

[pacman-dev] [PATCH] makepkg: only source user override if using default config file
by Dan McGee 29 Jun '11

29 Jun '11

Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43bed72..10272b3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1829,8 +1829,9 @@ else exit 1 # $E_CONFIG_ERROR fi -# Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then +# Source user-specific makepkg.conf overrides, but only if no override config +# file was specified +if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi -- 1.7.6

1 0

[pacman-dev] Stale comment
by Allan McRae 28 Jun '11

28 Jun '11

This comment in libalpm/conflict.c is out of date, but I not really sure what it should be replaced with... Can someone take a look? /* Check for target vs (db - target) conflicts * In case of conflict the package1 field of pmdepconflict_t contains * the target package, package2 field contains the local package */ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages) Allan

2 1

[pacman-dev] [PATCH] makepkg: fix typo (misssing quotes)
by Rémy Oudompheng 28 Jun '11

28 Jun '11

Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..3ee9063 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1562,7 +1562,7 @@ devel_check() { newpkgver=$(date +%Y%m%d) elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then if ! type -p git >/dev/null; then - warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "git "git" + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "git" "git" return 0 fi msg "$(gettext "Determining latest %s revision...")" 'git' @@ -1576,7 +1576,7 @@ devel_check() { newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then if ! type -p bzr >/dev/null; then - warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "bzr" bzr" + warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "bzr" "bzr" return 0 fi msg "$(gettext "Determining latest %s revision...")" 'bzr' -- 1.7.6

3 2

[pacman-dev] [PATCH] makepkg: fix removing symbolic link
by Allan McRae 28 Jun '11

28 Jun '11

The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..edfa9e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -518,7 +518,7 @@ download_sources() { local file=$(get_filepath "$netfile" || true) if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" - rm -f "$srcdir/$file" + rm -f "$srcdir/${file##*/}" ln -s "$file" "$srcdir/" continue fi -- 1.7.6

1 0