- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] call alpm_option_get_localdb once in syncfirst()
by Andrea Scarpino 29 Mar '11

29 Mar '11

Signed-off-by: Andrea Scarpino <andrea(a)archlinux.org> --- :100644 100644 b12206c... 0b34f04... M src/pacman/sync.c src/pacman/sync.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b12206c..0b34f04 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = config->syncfirst; i; i = alpm_list_next(i)) { char *pkgname = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue; } -- 1.7.4.2

1 0

[pacman-dev] [PATCH] call alpm_option_get_localdb once in syncfirst()
by Andrea Scarpino 29 Mar '11

29 Mar '11

Call alpm_option_get_localdb once and use the same value for every package in the loop. >From ba81c98746b18a820769d209fc13740ef76939db Mon Sep 17 00:00:00 2001 From: Andrea Scarpino <andrea(a)archlinux.org> Date: Tue, 29 Mar 2011 16:27:11 +0200 Subject: [PATCH] call alpm_option_get_localdb() once --- src/pacman/sync.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b12206c..0b34f04 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -578,10 +578,11 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); for(i = config->syncfirst; i; i = alpm_list_next(i)) { char *pkgname = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + pmpkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue; } -- 1.7.4.2

1 0

[pacman-dev] [PATCH] alpm/handle.c: ensure handle is not NULL before proceeding
by Rémy Oudompheng 28 Mar '11

28 Mar '11

Many alpm_option_get/set_*() functions already check this and set pm_errno to the right value, but not all, so this improves consistency. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- lib/libalpm/handle.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index d4ebe82..c37a0f9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -302,6 +302,10 @@ int SYMEXPORT alpm_option_set_root(const char *root) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!root) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -342,6 +346,10 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!dbpath) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -380,6 +388,10 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!cachedir) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -402,6 +414,10 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->cachedirs) FREELIST(handle->cachedirs); if(cachedirs) handle->cachedirs = cachedirs; } @@ -411,6 +427,10 @@ int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir) char *vdata = NULL; char *newcachedir; size_t cachedirlen; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } /* verify cachedir ends in a '/' */ cachedirlen = strlen(cachedir); if(cachedir[cachedirlen-1] != '/') { @@ -434,6 +454,10 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) ALPM_LOG_FUNC; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } if(!logfile) { pm_errno = PM_ERR_WRONG_ARGS; return(-1); @@ -456,16 +480,28 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) void SYMEXPORT alpm_option_set_usesyslog(int usesyslog) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->usesyslog = usesyslog; } void SYMEXPORT alpm_option_add_noupgrade(const char *pkg) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); } void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->noupgrade) FREELIST(handle->noupgrade); if(noupgrade) handle->noupgrade = noupgrade; } @@ -473,6 +509,10 @@ void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -495,6 +535,10 @@ void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) int SYMEXPORT alpm_option_remove_noextract(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -505,11 +549,19 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg) void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); } void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->ignorepkg) FREELIST(handle->ignorepkg); if(ignorepkgs) handle->ignorepkg = ignorepkgs; } @@ -517,6 +569,10 @@ void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata); if(vdata != NULL) { FREE(vdata); @@ -527,11 +583,19 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); } void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(ignoregrps) handle->ignoregrp = ignoregrps; } @@ -539,6 +603,10 @@ void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) { char *vdata = NULL; + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return(-1); + } handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata); if(vdata != NULL) { FREE(vdata); @@ -549,17 +617,29 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) void SYMEXPORT alpm_option_set_arch(const char *arch) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } if(handle->arch) FREE(handle->arch); if(arch) handle->arch = strdup(arch); } void SYMEXPORT alpm_option_set_usedelta(int usedelta) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->usedelta = usedelta; } void SYMEXPORT alpm_option_set_checkspace(int checkspace) { + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } handle->checkspace = checkspace; } -- 1.7.4.2

3 5

[pacman-dev] [PATCH] Create pacman keyring directory if missing
by Ray Kohler 28 Mar '11

28 Mar '11

Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/pacman-key.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5746e64..ccc7f92 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -246,6 +246,12 @@ if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then fi GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR}" +# Try to create $PACMAN_KEYRING_DIR if non-existent +# Check for simple existence rather than for a directory as someone may want +# to use a symlink here +# Force mode 700 as gpg complains if any group or other access is present +[[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 700 "${PACMAN_KEYRING_DIR}" + # Parse and execute command command="$1" if [[ -z "${command}" ]]; then -- 1.7.4.1

4 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-94-g4ef664f
by dan＠archlinux.org 28 Mar '11

28 Mar '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 4ef664f485559b0764271184a5305808b1a2e911 (commit) via c3ae209246804e9aebdc04c958548e340ff8998f (commit) via f6c8532fd04f334c35b3e860ee08d2cdee83a07c (commit) via c0190798e100a46997f58c6afe3598b91f80edda (commit) via 86ff381ac20df4317c1068fc82d556e74219ea9b (commit) from 4a3cd364d00b6889b24a16542618f1e2c14b86ac (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 4ef664f485559b0764271184a5305808b1a2e911 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Sun Mar 27 12:14:15 2011 -0400 Create pacman keyring directory if missing Use mode 755, so non-root users can see inside. Add "--no-permission-warning" to GPG_PACMAN to suppress the noise that otherwise comes of not using mode 700 - this is not private data. GPGme turns out not to issue this warning itself, so no problem there. TODO: should non-root users be allowed to use the read-only operations (--list, --export, --finger)? Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c3ae209246804e9aebdc04c958548e340ff8998f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 21:27:15 2011 -0500 Documentation formatting updates Be consistent in the Synopsis and Description sections with the use of quotes around command names. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f6c8532fd04f334c35b3e860ee08d2cdee83a07c Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 20:26:08 2011 -0400 Add manpage for pkgdelta Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c0190798e100a46997f58c6afe3598b91f80edda Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 20:26:07 2011 -0400 Update repo-add manpage Add -v, mention delta support (other than -d), and split repo-add-specific options out from those common to repo-add and repo-remove. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86ff381ac20df4317c1068fc82d556e74219ea9b Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Sun Mar 27 22:04:40 2011 -0400 Clean up repo-add usage message This now includes -s and -v, tailors itself to the current command, and is formatted more like that of other pacman commands. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 4 +++ doc/index.txt | 1 + doc/makepkg.8.txt | 8 +++--- doc/pacman-key.8.txt | 4 +- doc/pkgdelta.8.txt | 42 ++++++++++++++++++++++++++++++++++++++++ doc/repo-add.8.txt | 48 ++++++++++++++++++++++++++------------------- scripts/pacman-key.sh.in | 7 +++++- scripts/repo-add.sh.in | 43 +++++++++++++++++++++++----------------- 9 files changed, 113 insertions(+), 45 deletions(-) create mode 100644 doc/pkgdelta.8.txt hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Update repo-add manpage
by Ray Kohler 28 Mar '11

28 Mar '11

Add -v, mention delta support (other than -d), and split repo-add-specific options out from those common to repo-add and repo-remove. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- doc/repo-add.8.txt | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 26009f6..9167a40 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -10,35 +10,28 @@ repo-add - package database maintenance utility Synopsis -------- -repo-add [-d] [-f] [-q] <path-to-db> <package1> [<package2> ...] +repo-add [-d] [-f] [-q] [-s] [-v] <path-to-db> <package|delta> [<package|delta> ...] -repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...] +repo-remove [-q] [-s] [-v] <path-to-db> <packagename|delta> [<packagename|delta> ...] Description ----------- repo-add and repo-remove are two scripts to help build a package database for packages built with linkman:makepkg[8] and installed with linkman:pacman[8]. +They also handle package deltas produced by linkman:pkgdelta[8]. -repo-add will update a package database by reading a built package file. -Multiple packages to add can be specified on the command line. +repo-add will update a package database by reading a built package or package +delta file. Multiple packages and/or deltas to add can be specified on the +command line. -repo-remove will update a package database by removing the package name -specified on the command line. Multiple packages to remove can be specified -on the command line. +repo-remove will update a package database by removing the package name or +delta specified on the command line. Multiple packages and/or delta to remove +can be specified on the command line. -Options -------- -*-d, \--delta*:: - Automatically generate and add a delta file between the old entry and the - new one, if the old package file is found next to the new one. - -*-f, \--files*:: - Tells repo-add also to create and include a list of the files in the - specified packages. This is useful for creating databases listing all files - in a given sync repository for tools that may use this information. - +Common Options +-------------- *-q, \--quiet*:: Force this program to keep quiet and run silent except for warning and error messages. @@ -49,9 +42,24 @@ Options signature file, using the GPG agent if it is available. The signature file will be the entire filename of the database with a ``.sig'' extension. +*-v, \--verify*:: + Verify the PGP signature of the database before updating the database. + If the signature is invalid, an error is produced and the update does not + proceed. + +repo-add Options +---------------- +*-d, \--delta*:: + Automatically generate and add a delta file between the old entry and the + new one, if the old package file is found next to the new one. + +*-f, \--files*:: + Tells repo-add also to create and include a list of the files in the + specified packages. This is useful for creating databases listing all files + in a given sync repository for tools that may use this information. See Also -------- -linkman:makepkg[8], linkman:pacman[8] +linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] include::footer.txt[] -- 1.7.4.1

2 3

[pacman-dev] [PATCH] Add -s --sign and -v --verify to repo-add usage message.
by Ray Kohler 28 Mar '11

28 Mar '11

There were not added to the end of the list as that would mean splitting the single gettext string that contains -f and the "see the man page" message, and I wanted to do as little string damage as possible. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/repo-add.sh.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 9b57ba7..3d6d0c7 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -74,6 +74,11 @@ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ packages to remove can be specified on the command line.\n\n")" printf "$(gettext "\ +Use the -s/--sign flag to sign the database with GnuPG after updating.\n\n")" + printf "$(gettext "\ +Use the -v/--verify flag to verify the GnuPG signature of the database\n\ +before updating.\n\n")" + printf "$(gettext "\ Use the -q/--quiet flag to minimize output to basic messages, warnings,\n\ and errors.\n\n")" printf "$(gettext "\ -- 1.7.4.1

3 13

[pacman-dev] heads-up - master branch compile failure with gcc-4.6
by Allan McRae 28 Mar '11

28 Mar '11

Just a heads-up that the upcoming gcc-4.6 release will cause a build failure when building with --enable-debug (which sets -Werror...) be_package.c: In function 'pkg_load': be_package.c:257:7: error: variable 'ret' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors Clearly something on the TODO list anyway! /* TODO: do something with ret value */ ret = _alpm_load_signature(pgpfile, &(newpkg->pgpsig)); Allan

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-89-g4a3cd36
by dan＠archlinux.org 28 Mar '11

28 Mar '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 4a3cd364d00b6889b24a16542618f1e2c14b86ac (commit) via 3f269503d53811cf45037022a263f2447e427a0b (commit) via 630b7b94c39ddc60d4e2b3c80d5d9f3101049b93 (commit) via 43dacceb6bba837aceba331c31ed8d8ee7a9e1d5 (commit) via c02556e2905dc1801d751db8cc3e96ccbedb76ab (commit) via a9fb4d9d5b065560f7e42378ad1ee3d2f7b19911 (commit) via 98c8ab18ff7f48bb2074d821ad93b009fd4bac4c (commit) via 33c08ac91e32e1c1fe135c42030f1a2b64a63a54 (commit) via fd64988c8085a410a80851e2b4b6b62ea59139c2 (commit) via 55f790ebe49ebf5a7d2084682735fd75f6d4903b (commit) via 283bf7e87cab1fa187334830fe2d05dd28bc5b77 (commit) via ea216d3f5a84814c512ab51ac37a4055b82032c3 (commit) via 68701a98aff46821e7e3440d5db233adbe249770 (commit) via 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 (commit) via 5a9a570dda81148fd9ce8ea46b3c57befa8535fe (commit) via c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 (commit) via 7f480ccc0de9438ef499685088a49b3c5964606b (commit) via e214b260efcba299611688bdbbc02b7391632d43 (commit) from 86e7f6075671e08c456f389d8ecba47190c03f0f (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 4a3cd364d00b6889b24a16542618f1e2c14b86ac Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:48:26 2011 -0500 Temporary fix for new warnings from gcc 4.6 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3f269503d53811cf45037022a263f2447e427a0b Merge: 630b7b9 ea216d3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:41:23 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/deps.c commit 630b7b94c39ddc60d4e2b3c80d5d9f3101049b93 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 19:25:38 2011 -0400 Sign database even if empty Move the create_signature() call outside the case of non-empty databases, so it will be called regardless. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43dacceb6bba837aceba331c31ed8d8ee7a9e1d5 Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Fri Mar 25 21:32:21 2011 -0400 makepkg: allow PKGEXT and SRCEXT to be overridden by env variables Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c02556e2905dc1801d751db8cc3e96ccbedb76ab Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 24 10:10:05 2011 -0400 Rely on the return value of type instead of its output Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a9fb4d9d5b065560f7e42378ad1ee3d2f7b19911 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 09:15:30 2011 -0400 lib/dload: abstract out helper function to set utimes This greatly simplifies the cleanup fallthrough in our download function and we'll be able to reuse this for signatures. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98c8ab18ff7f48bb2074d821ad93b009fd4bac4c Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:49:13 2011 -0400 lib/dload: remove proxy debug output Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 33c08ac91e32e1c1fe135c42030f1a2b64a63a54 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:45:54 2011 -0400 lib/dload: code simplification Based on the fact that localf always points to the same file, there's no need to code in multiple fopen calls with varying results. Instead, track the desired file open mode and make a single call to fopen. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fd64988c8085a410a80851e2b4b6b62ea59139c2 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 08:37:02 2011 -0400 lib/dload: merge get_{destfile,tempfile} into get_fullpath Create a more general function that allows appending a suffix to a filepath. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 55f790ebe49ebf5a7d2084682735fd75f6d4903b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 18:33:34 2011 -0400 pacman/pacman.c: fix setting of useragent string libcurl doesn't natively honor the HTTP_USER_AGENT environment variable. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 283bf7e87cab1fa187334830fe2d05dd28bc5b77 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Mar 21 16:54:00 2011 -0400 lib/dload: pass a struct with filename and size to curl_progress This lets us determine the real size of the file on disk so that we can properly bump the progress bar when we're resuming a download. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacscripts.in | 2 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/db.c | 1 + lib/libalpm/deps.c | 176 ++++++++++++++++++++------------------- lib/libalpm/deps.h | 6 -- lib/libalpm/dload.c | 135 +++++++++++++++--------------- lib/libalpm/dload.h | 6 ++ lib/libalpm/package.c | 16 ++-- scripts/makepkg.sh.in | 8 ++- scripts/pacman-db-upgrade.sh.in | 6 +- scripts/repo-add.sh.in | 7 +- src/pacman/pacman.c | 17 ++-- test/util/vercmptest.sh | 2 +- 13 files changed, 201 insertions(+), 186 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-10-gea216d3
by dan＠archlinux.org 28 Mar '11

28 Mar '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, maint has been updated via ea216d3f5a84814c512ab51ac37a4055b82032c3 (commit) via 68701a98aff46821e7e3440d5db233adbe249770 (commit) via 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 (commit) via 5a9a570dda81148fd9ce8ea46b3c57befa8535fe (commit) via c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 (commit) via 7f480ccc0de9438ef499685088a49b3c5964606b (commit) via e214b260efcba299611688bdbbc02b7391632d43 (commit) from c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (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 ea216d3f5a84814c512ab51ac37a4055b82032c3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 27 20:03:08 2011 -0500 Clarify error message in pacman-db-upgrade Addresses FS#23451. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68701a98aff46821e7e3440d5db233adbe249770 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 15:37:18 2011 -0500 Ensure reported missing dependencies show correct version comparison This addresses FS#23424. The -dd backend code was introduced in commit b6ec9019d77, and unfortunately the munged depend used for comparison did not carry through to the eventual display of this version. To fix this, we undo some of the depcmp_tolerant() business introduced, and instead make a new pmdepend_t object if necessary when the no dependency version flag is set. This results in the correct depend being copied to the missing depend passed onto the frontend. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:45:42 2011 -0500 Mark various functions in deps.c static Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a9a570dda81148fd9ce8ea46b3c57befa8535fe Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:38:39 2011 -0500 Move alpm_find_dbs_satisfier() function down in deps.c This will make sense for a later commit when static/non-static properties of other functions are changed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c40fc6b80d4a97e3333afab6d2ce8290aaa29c46 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 15:34:39 2011 -0500 Rework find_requiredby() to not use _alpm_dep_edge() And move the sort after the final loop; we don't need to sort once for each database we look at. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f480ccc0de9438ef499685088a49b3c5964606b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 14:51:31 2011 -0500 Don't include version in dep string if mod == ANY Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e214b260efcba299611688bdbbc02b7391632d43 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 25 13:47:27 2011 -0500 Update usage instruction strings * Address FS#23433 by documenting -d vs. -dd * Drop the useless "as well", "also", "too", and "that won't break packages" strings from -R usage * Fix alignment of multiline strings in source (no string change) Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/deps.c | 176 ++++++++++++++++++++------------------- lib/libalpm/deps.h | 6 -- lib/libalpm/package.c | 16 ++-- scripts/pacman-db-upgrade.sh.in | 6 +- src/pacman/pacman.c | 17 ++-- 5 files changed, 113 insertions(+), 108 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] inconsistent behaviour in handle.c
by Rémy Oudompheng 27 Mar '11

27 Mar '11

Hello, The functions defined in handle.c seem to have an inconsistent behaviour. Many of them check that handle is not NULL before acting, and set pm_errno to PM_ERR_HANDLE_NULL if so. But others do not, and segfault if used before alpm_initialize() is called. Is there a rationale behind that or should it be patched? Regards, Rémy.

2 1

[pacman-dev] [namcap] Released version 3.0.3
by Rémy Oudompheng 27 Mar '11

27 Mar '11

Hello, I have released and packaged namcap 3.0.3. It includes Dan's patches for the PKGBUILD analysis and a fix for the dangling symlink detection. I hope this will be the last bugfix release before the move from [testing] to [extra]. Regards, Rémy.

3 3

[pacman-dev] [RFC] Replacing wget with curl in makepkg
by Dave Reisner 27 Mar '11

27 Mar '11

The attached patch proposes to replace wget with curl as the default DLAGENT in makepkg for http, https, and ftp. This seems like the sane choice given our switch from fetch to curl. dave

3 2

[pacman-dev] pacman-key imports and key trust levels
by Ray Kohler 26 Mar '11

26 Mar '11

So, after a couple of days of messing around (and fixing random things here and there), I was able to go end-to-end, verifying a signed repo DB, and then installing a signed package from that repo. Very nice! I ended up testing out the failure case on verifying signatures a bit more than I wanted, though, as I something surprised me: When importing keys with pacman-key, they keys themselves are imported fine, but they are not marked as sufficiently trusted that the signatures are worth anything. I just imported my "real" GPG pubring (which has nothing in it but my own key) with "pacman-key -a ~/.gnupg/pubring.gpg", and used that same key to sign a package and add that package to a signed repo. GPGme returns "unknown key" when asked to verify these sigs, so pacman flunks them as "invalid signature". After editing the trustdb to mark this key as "ultimate" (hey, it's my own key after all), everything worked. So, my question is, where does the fault lie? Did I make some wrong assumption? Should pacman-key set high levels of trust on keys it imports? Should alpm configure GPGme with trust-level=always? While I'm talking about signing stuff - I noticed an open question on what to do with the downloaded DB if sig verification fails. I suggest it be deleted, and the sig be deleted also. These are generally small files, and it feels really wrong to keep a file "live" on my disk which has been declared untrustworthy.

4 4

[pacman-dev] [PATCH] Renamed --trust to --edit-key
by Richard Alex Hofer 26 Mar '11

26 Mar '11

Hi, I'm very new here, but hope this saves someone a minute or two. Fixes the first thing on the TODO list "TODO: rename the --trust option to --edit-key". Tried sending this before, but I think I messed something up. Also, looks like the date is way off. From fb1fe43baa5e46de09d102a29669de250bd4d065 Mon Sep 17 00:00:00 2001 From: Richard A Hofer <atomic.quark(a)gmail.com> Date: Fri, 25 Mar 2011 17:39:30 -0400 Subject: [PATCH] Renamed --trust to --edit-key and -t to -k (for Key) --- scripts/pacman-key.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5746e64..bb05429 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -66,7 +66,7 @@ usage() { echo "$(gettext " -h, --help This help")" echo "$(gettext " -l, --list List keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" - echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" + echo "$(gettext " -k, --edit-key <keyid(s)> Set the trust level of the given keyids")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -V, --version Show program version")" echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" @@ -290,7 +290,7 @@ case "${command}" in shift ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" ;; - -t|--trust) + -k|--edit-key) if (( $# == 0 )); then error "$(gettext "You need to specify at least one key identifier")" exit 1 -- 1.7.4.1

3 2

[pacman-dev] [PATCH] makepkg: command line options for signing packages
by Allan McRae 26 Mar '11

26 Mar '11

From: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Three new command line options were added: --sign: forces the generation of a signature for the resulting package, taking precedence over the value in makepkg.conf --nosign: do not sign the resulting package --key <key>: use a different key than the user's default for signing the package. A check is performed to ensure the user has (provided) a valid gpg for signing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a patch originially supplied by Denis a few weeks back that got a bit lost with preparing for release of pacman-3.5. I made some minor changes: 1) removed the short option for --sign. This is overriding the default set in makepkg.conf so no need for a short option 2) changed --signwithkey to just --key as I found the longer option name too long 3) simplified the checking for if we need to sign the package @Denis: I'm sure you would have made these changes if I had asked, but with the delay from me in re-review this patch, I figured it was only fair for me to make the small changes and get it done! scripts/makepkg.sh.in | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5742c49..c8ac6a4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -28,7 +28,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), -# gettext, grep, gzip, openssl, sed, tput (ncurses), xz +# gettext, gpg, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization export TEXTDOMAIN='pacman' @@ -75,6 +75,7 @@ CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() +SIGNPKG='' # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. @@ -1106,7 +1107,7 @@ create_package() { } create_signature() { - if [[ $(check_buildenv sign) != "y" ]]; then + if [[ $SIGNPKG != 'y' ]]; then return fi local ret=0 @@ -1116,7 +1117,15 @@ create_signature() { error "$(gettext "Cannot find the gpg binary! Is gnupg installed?")" exit 1 # $E_MISSING_PROGRAM fi - gpg --detach-sign --use-agent "$filename" || ret=$? + + local SIGNWITHKEY="" + if [[ -n $SIGNKEY ]]; then + SIGNWITHKEY="-u ${SIGNKEY}" + fi + # The signature will be generated directly in ascii-friendly format + gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$? + + if (( ! ret )); then msg2 "$(gettext "Created signature file %s.")" "$filename.sig" else @@ -1615,8 +1624,11 @@ usage() { printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf "$(gettext " --holdver Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT" + echo "$(gettext " --key <key> Specify a key to use for gpg signing instead of the default")" printf "$(gettext " --nocheck Do not run the check() function in the %s")\n" "$BUILDSCRIPT" + echo "$(gettext " --nosign Do not create a signature for the package")" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" + echo "$(gettext " --sign Sign the resulting package with gpg")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo @@ -1653,8 +1665,8 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" -OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" +OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1688,15 +1700,18 @@ while true; do -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; + --key) shift; SIGNKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; --nocheck) RUN_CHECK='n' ;; + --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --skipinteg) SKIPINTEG=1 ;; + --sign) SIGNPKG='y' ;; --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; @@ -1927,6 +1942,22 @@ if [[ -n "${PKGLIST[@]}" ]]; then pkgname=("${PKGLIST[@]}") fi +# check if gpg signature is to be created and if signing key is valid +if [[ -z "$SIGNPKG" && $(check_buildenv sign) == 'y' ]]; then + SIGNPKG='y' +fi +if [[ $SIGNPKG == 'y' ]]; then + if ! gpg --list-key ${SIGNKEY} &>/dev/null; then + if [[ ! -z $SIGNKEY ]]; then + error "$(gettext "The key ${SIGNKEY} does not exist in your keyring.")" + else + error "$(gettext "There is no key in your keyring.")" + fi + exit 1 + fi +fi + + if (( ! SPLITPKG )); then fullver=$(get_full_version $epoch $pkgver $pkgrel) if [[ -f $PKGDEST/${pkgname}-${fullver}-${CARCH}${PKGEXT} \ -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Skip md5sum check if signature check is successful
by Peter Tseng 26 Mar '11

26 Mar '11

Been sitting on the TODO list for a while, and figured I'd give it a shot. This simply moves the md5sum check to after the signature check, then adds a variable to indicate that signature check was okay. Yes, my first attempt to submit, and it's a simple one, but you gotta start somewhere. If it fails miserably, feel free to tear it apart. I'll respond to feedback and hopefully move on to submit more in the future... Signed-off-by: Peter Tseng <archlinux(a)leftylink.com> --- lib/libalpm/sync.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5428e40..2b1c6cb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -828,6 +828,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) for(i = trans->add; i; i = i->next, current++) { pmpkg_t *spkg = i->data; int percent = (current * 100) / numtargs; + int sig_check_ok = 0; if(spkg->origin == PKG_FROM_FILE) { continue; /* pkg_load() has been already called, this package is valid */ } @@ -839,14 +840,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) const char *md5sum = alpm_pkg_get_md5sum(spkg); const pmpgpsig_t *pgpsig = alpm_pkg_get_pgpsig(spkg); - /* check md5sum first */ - if(test_md5sum(trans, filepath, md5sum) != 0) { - errors++; - *data = alpm_list_add(*data, strdup(filename)); - FREE(filepath); - continue; - } - /* check PGP signature next */ + /* check PGP signature first */ pmdb_t *sdb = alpm_pkg_get_db(spkg); if(sdb->pgp_verify != PM_PGP_VERIFY_NEVER) { @@ -857,8 +851,17 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) *data = alpm_list_add(*data, strdup(filename)); FREE(filepath); continue; + } else { + sig_check_ok = 1; } } + /* check md5sum next */ + if(!sig_check_ok && test_md5sum(trans, filepath, md5sum) != 0) { + errors++; + *data = alpm_list_add(*data, strdup(filename)); + FREE(filepath); + continue; + } /* load the package file and replace pkgcache entry with it in the target list */ /* TODO: alpm_pkg_get_db() will not work on this target anymore */ _alpm_log(PM_LOG_DEBUG, "replacing pkgcache entry with package file for target %s\n", spkg->name); -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Update usage instruction strings
by Dan McGee 25 Mar '11

25 Mar '11

* Address FS#23433 by documenting -d vs. -dd * Drop the useless "as well", "also", "too", and "that won't break packages" strings from -R usage * Fix alignment of multiline strings in source (no string change) Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 2847fd5..0ad0354 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -114,6 +114,7 @@ static void usage(int op, const char * const myname) char const * const str_usg = _("usage"); char const * const str_opr = _("operation"); + /* please limit your strings to 80 characters in width */ if(op == PM_OP_MAIN) { printf("%s: %s <%s> [...]\n", str_usg, myname, str_opr); printf(_("operations:\n")); @@ -132,10 +133,10 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); addlist(_(" -c, --cascade remove packages and all packages that depend on them\n")); - addlist(_(" -n, --nosave remove configuration files as well\n")); - addlist(_(" -s, --recursive remove dependencies also (that won't break packages)\n" - " (-ss includes explicitly installed dependencies too)\n")); - addlist(_(" -u, --unneeded remove unneeded packages (that won't break packages)\n")); + addlist(_(" -n, --nosave remove configuration files\n")); + addlist(_(" -s, --recursive remove unnecessary dependencies\n" + " (-ss includes explicitly installed dependencies)\n")); + addlist(_(" -u, --unneeded remove unneeded packages\n")); } else if(op == PM_OP_UPGRADE) { printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); @@ -186,16 +187,16 @@ static void usage(int op, const char * const myname) addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" - " ignore a group upgrade (can be used more than once)\n")); + " ignore a group upgrade (can be used more than once)\n")); /* pass through */ case PM_OP_REMOVE: - addlist(_(" -d, --nodeps skip dependency checks\n")); + addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" -k, --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); - addlist(_(" --print only print the targets instead of performing the operation\n")); + addlist(_(" --print print the targets instead of performing the operation\n")); addlist(_(" --print-format <string>\n" - " specify how the targets should be printed\n")); + " specify how the targets should be printed\n")); break; } -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Make log redirection saner
by Jan Steffens 25 Mar '11

25 Mar '11

My main motivation was to remove the "sync", which can stall for minutes on a busy machine (FS#23378). I also cleaned up the redirection. Signed-off-by: Jan Steffens <jan.steffens(a)gmail.com> --- scripts/makepkg.sh.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5742c49..0b3891e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -794,15 +794,14 @@ run_function() { # ensure overridden package variables survive tee with split packages logpipe=$(mktemp -u "$startdir/logpipe.XXXXXXXX") mkfifo "$logpipe" - exec 3>&1 - tee "$BUILDLOG" < "$logpipe" & - exec 1>"$logpipe" 2>"$logpipe" + tee "$BUILDLOG" < "$logpipe" & teepid=$! + restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR - $pkgfunc 2>&1 + $pkgfunc &>"$logpipe" eval $restoretrap - sync - exec 1>&3 2>&3 3>&- + + wait $teepid rm "$logpipe" else restoretrap=$(trap -p ERR) -- 1.7.4.1

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-71-g86e7f60
by dan＠archlinux.org 25 Mar '11

25 Mar '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 86e7f6075671e08c456f389d8ecba47190c03f0f (commit) via c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (commit) via 14474a32c90b2202f1faf69ea20abbcdedfe4c29 (commit) via e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b (commit) via cfa2eebdafc4d2341621e24ce61dd5a74a0de9fc (commit) via 351942c71b80adaac614ed1c353d0e8e6f49ac8b (commit) from a8b22e16efbffee84ff8647846196958d871c64b (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 86e7f6075671e08c456f389d8ecba47190c03f0f Merge: cfa2eeb c37c9c5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 24 21:18:09 2011 -0500 Merge branch 'maint' commit cfa2eebdafc4d2341621e24ce61dd5a74a0de9fc Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 24 18:05:30 2011 -0400 Fix use of relative paths for packages in repo-add Move checksum and pgpsig calcluation before changing into the tmpdir, otherwise we can't find the files if a relative path was used. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 1 + lib/libalpm/alpm.c | 9 +++++++++ lib/libalpm/db.c | 8 ++------ scripts/makepkg.sh.in | 10 +++++----- scripts/repo-add.sh.in | 31 +++++++++++++++++-------------- src/pacman/pacman.c | 4 ++++ 6 files changed, 38 insertions(+), 25 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-3-gc37c9c5
by dan＠archlinux.org 25 Mar '11

25 Mar '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, maint has been updated via c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (commit) via 14474a32c90b2202f1faf69ea20abbcdedfe4c29 (commit) via e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b (commit) from 351942c71b80adaac614ed1c353d0e8e6f49ac8b (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 c37c9c5dcae06c1585b4da4c0b838f5b44e1498e Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 24 22:00:35 2011 -0400 Add -T, --deptest to usage message Fixes FS #23369 Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14474a32c90b2202f1faf69ea20abbcdedfe4c29 Author: Jan Steffens <jan.steffens(a)gmail.com> Date: Thu Mar 24 13:30:15 2011 +0100 Make log redirection saner My main motivation was to remove the "sync", which can stall for minutes on a busy machine (FS#23378). I also cleaned up the redirection. Signed-off-by: Jan Steffens <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 24 15:10:01 2011 -0400 alpm/db: do not close local DB in alpm_db_unregister_all pacman 3.5.0 removed alpm_db_register_local, so calling alpm_db_unregister_all leaves the front end in a position where there's no local db, and no way to re-register it. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.c | 9 +++++++++ lib/libalpm/db.c | 8 ++------ scripts/makepkg.sh.in | 10 +++++----- src/pacman/pacman.c | 4 ++++ 4 files changed, 20 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add -T, --deptest to usage message
by Ray Kohler 25 Mar '11

25 Mar '11

Fixes FS #23369 Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- src/pacman/pacman.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 0487ee8..d10cefe 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -123,6 +123,7 @@ static void usage(int op, const char * const myname) printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-T --deptest} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); printf(_("\nuse '%s {-h --help}' with an operation for available options\n"), myname); -- 1.7.4.1

2 2

[pacman-dev] [PATCH] Fix use of relative paths for packages in repo-add
by Ray Kohler 24 Mar '11

24 Mar '11

I first noticed that checksums weren't calculated if a relative path was used, since they're done after moving into the $tmpdir and relative paths become useless. Then I saw that PGP sigs had basically the same problem, with the addition of the introduction of $startdir, which was never set beforehand (cut-n-paste from makepkg?). Seeing that having this value known would solve both problems, I just defined it and used it for the checksums as well. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/repo-add.sh.in | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 59e98cf..0461c7a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -235,7 +235,8 @@ db_write_entry() # blank out all variables local pkgfile="$1" local pkgname pkgver pkgdesc csize size md5sum url arch builddate packager \ - _groups _licenses _replaces _depends _conflicts _provides _optdepends + startdir _groups _licenses _replaces _depends _conflicts _provides \ + _optdepends local OLDIFS="$IFS" # IFS (field separator) is only the newline character @@ -271,6 +272,8 @@ db_write_entry() return 1 fi + startdir=$(pwd) + pushd "$tmpdir" >/dev/null if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" @@ -286,9 +289,9 @@ db_write_entry() # compute checksums msg2 "$(gettext "Computing checksums...")" - md5sum="$(openssl dgst -md5 "$pkgfile")" + md5sum="$(openssl dgst -md5 "$startdir/$pkgfile")" md5sum="${md5sum##* }" - sha256sum="$(openssl dgst -sha256 "$pkgfile")" + sha256sum="$(openssl dgst -sha256 "$startdir/$pkgfile")" sha256sum="${sha256sum##* }" # remove an existing entry if it exists, ignore failures @@ -317,7 +320,7 @@ db_write_entry() echo -e "%SHA256SUM%\n$sha256sum\n" >>desc # add base64'd PGP signature - if [[ -f $startdir/$pkgfile.sig ]]; then + if [[ -f "$startdir/$pkgfile.sig" ]]; then pgpsig=$(openssl base64 -in "$startdir/$pkgfile.sig" | tr -d '\n') echo -e "%PGPSIG%\n$pgpsig\n" >>desc fi -- 1.7.4.1

2 3

[pacman-dev] [RFC] Proposed fix for FS#20538
by Dave Reisner 24 Mar '11

24 Mar '11

https://bugs.archlinux.org/task/20538 The attached patch flushes the terminal input buffer shortly before prompting users for input to answer a question. On the one hand, I can see how this might be nice when you accidentally hit <enter> twice, or fat finger a key during a download and press <enter> at the prompt only to be oddly returned to your shell. On the other hand, I've occasionally abused this exact behavior to walk away from my computer in the middle of a large -Syu. Thoughts? Any issues with the code approach? dave

2 2

[pacman-dev] [PATCH 1/3] Add --with-bsdtar-bin configure option
by Nezmer 24 Mar '11

24 Mar '11

This will enable us to use a custom name and/or location of bsdtar binary in scripts. Signed-off-by: Nezmer <git(a)nezmer.info> --- configure.ac | 6 ++++++ contrib/Makefile.am | 1 + contrib/bacman.in | 4 ++-- contrib/pacscripts.in | 4 ++-- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 12 ++++++------ scripts/pacman-optimize.sh.in | 4 ++-- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 14 +++++++------- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..50d4a04 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,11 @@ AC_ARG_WITH(fetch, AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]), [], [with_fetch=check]) +# Custom bsdtar binary name and/or location +AC_ARG_WITH(bsdtar_bin, + AS_HELP_STRING([--with-bsdtar-bin=BSDTAR], [use bsdtar_bin as the bsdtar binary in scripts]), + BSDTAR_BIN=$with_bsdtar_bin) + # Help line for documentation AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), @@ -128,6 +133,7 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false]) +AC_PATH_PROGS([BSDTAR_BIN], [bsdtar], [false]) # find installed gettext AM_GNU_GETTEXT([external]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 55366b4..985b19f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ MOSTLYCLEANFILES = $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@BSDTAR_BIN[@]|$(BSDTAR_BIN)|g' \ -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' $(OURFILES): Makefile diff --git a/contrib/bacman.in b/contrib/bacman.in index b4e3b4b..1891ef6 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -133,7 +133,7 @@ while read i; do %FILES%) ret=0 if [ -e "/$i" ]; then - bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - + @BSDTAR_BIN@ -cnf - "/$i" 2> /dev/null | @BSDTAR_BIN@ -xpf - # Workaround to bsdtar not reporting a missing file as an error if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then @@ -288,7 +288,7 @@ ret=0 shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail -bsdtar -cf - $comp_files * | +@BSDTAR_BIN@ -cf - $comp_files * | case "$PKGEXT" in *tar.gz) gzip -c -f -n ;; *tar.bz2) bzip2 -c -f ;; diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index d366409..6faf964 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -85,7 +85,7 @@ print_db() { } print_pkg() { - if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + if ! @BSDTAR_BIN@ -xOf "$1" .INSTALL 2>/dev/null; then error "Package $1 does not include any .INSTALL script" return 1 fi @@ -94,7 +94,7 @@ print_pkg() { print_scriptlet() { if [ -f "$1" ]; then - if bsdtar tf "$1" .PKGINFO &>/dev/null; then + if @BSDTAR_BIN@ tf "$1" .PKGINFO &>/dev/null; then print_pkg "$1" return fi diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 78deb0b..4668ad1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@BSDTAR_BIN[@]|$(BSDTAR_BIN)|g' \ -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bdf63ef..2731dbf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -671,7 +671,7 @@ extract_sources() { local cmd='' case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar" ;; + cmd="@BSDTAR_BIN@" ;; *application/x-gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; @@ -689,8 +689,8 @@ extract_sources() { esac ;; *) # See if bsdtar can recognize the file - if bsdtar -tf "$file" -q '*' &>/dev/null; then - cmd="bsdtar" + if @BSDTAR_BIN@ -tf "$file" -q '*' &>/dev/null; then + cmd="@BSDTAR_BIN@" else continue fi ;; @@ -698,7 +698,7 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" - if [[ $cmd = bsdtar ]]; then + if [[ $cmd = @BSDTAR_BIN@ ]]; then $cmd -xf "$file" || ret=$? else rm -f "${file%.*}" @@ -1043,7 +1043,7 @@ create_package() { shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - bsdtar -cf - $comp_files * | + @BSDTAR_BIN@ -cf - $comp_files * | case "$PKGEXT" in *tar.gz) gzip -c -f -n ;; *tar.bz2) bzip2 -c -f ;; @@ -1135,7 +1135,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + if ! @BSDTAR_BIN@ -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index f4642ab..a0026b7 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -129,7 +129,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +@BSDTAR_BIN@ -czf "$workdir/pacman-db.tar.gz" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" @@ -138,7 +138,7 @@ fi # step 3: make and sum the new db side-by-side with the old msg "$(gettext "Making and MD5sum'ing the new database...")" mkdir "$dbroot.new" -bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" +@BSDTAR_BIN@ -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Untar'ing %s failed.")" "$dbroot" diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 6bc3f5d..b569ea4 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -76,7 +76,7 @@ read_pkginfo() IFS=" " local line var val - for line in $(bsdtar -xOf "$1" .PKGINFO 2>/dev/null | + for line in $(@BSDTAR_BIN@ -xOf "$1" .PKGINFO 2>/dev/null | grep -v "^#" | sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do eval "$line" if [[ -n $pkgname && -n $pkgver && -n $arch ]]; then diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d09d1b4..8b6a028 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -198,7 +198,7 @@ db_write_entry() # read info from the zipped package local line var val - for line in $(bsdtar -xOqf "$pkgfile" .PKGINFO | + for line in $(@BSDTAR_BIN@ -xOqf "$pkgfile" .PKGINFO | grep -v '^#' | sed 's|$\w*$\s*=\s*$.*$|\1 \2|'); do # bash awesomeness here- var is always one word, val is everything else var=${line%% *} @@ -337,15 +337,15 @@ check_repo_db() if [[ -f $REPO_DB_FILE ]]; then # there are two situations we can have here- a DB with some entries, # or a DB with no contents at all. - if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then + if ! @BSDTAR_BIN@ -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then # check empty case - if [[ -n $(bsdtar -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then + if [[ -n $(@BSDTAR_BIN@ -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi fi msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir" + @BSDTAR_BIN@ -xf "$REPO_DB_FILE" -C "$tmpdir" else case "$cmd" in repo-remove) @@ -386,7 +386,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then + if ! @BSDTAR_BIN@ -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi @@ -505,11 +505,11 @@ if (( success )); then cd "$tmpdir" if [[ -n $(ls) ]]; then - bsdtar -c${TAR_OPT}f "$filename" * + @BSDTAR_BIN@ -c${TAR_OPT}f "$filename" * else # we have no packages remaining? zip up some emptyness warning "$(gettext "No packages remain, creating empty database.")" - bsdtar -c${TAR_OPT}f "$filename" -T /dev/null + @BSDTAR_BIN@ -c${TAR_OPT}f "$filename" -T /dev/null fi cd "$startdir" -- 1.7.3.1

2 8