- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 11/15] makepkg: use parameter expansion instead of basename
by Andres P 20 Jun '10

20 Jun '10

Signed-off-by: Andres P <aepd87(a)gmail.com> --- 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 deae2bb..536da30 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -325,7 +325,7 @@ get_downloadclient() { # ensure specified program is installed local program="${agent%% *}" if [[ ! -x $program ]]; then - local baseprog=$(basename $program) + local baseprog="${program##*/}" error "$(gettext "The download program %s is not installed.")" "$baseprog" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PROGRAM -- 1.7.1

2 1

[pacman-dev] [PATCH] makepkg: do not ignore errors from pacman
by Andres P 20 Jun '10

20 Jun '10

* check_deps is being run in a subshell, so exit 1 has no meaning. * Its return value was also being ignored by the enclosing funcion. * Local assignments *always* take precedence over subshell's $? Fixes FS#19840 Although this really ignored *all* errors from pacman except 127, not just illegal directives in pacman.conf. Signed-off-by: Andres P <aepd87(a)gmail.com> --- Let's not go crazy with them subshells. $ fn() { foo=$(false); echo $?; local bar=$(false); echo $?; } $ fn 1 0 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 b0215c8..41e6978 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -434,14 +434,15 @@ resolve_deps() { local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 - local deplist="$(check_deps $*)" + local deplist + deplist="$(check_deps $*)" || return if [[ -z $deplist ]]; then return $R_DEPS_SATISFIED fi if handle_deps $deplist; then # check deps again to make sure they were resolved - deplist="$(check_deps $*)" + deplist="$(check_deps $*)" || return [[ -z $deplist ]] && return $R_DEPS_SATISFIED elif (( DEP_BIN )); then error "$(gettext "Failed to install all missing dependencies.")" -- 1.7.1

2 2

[pacman-dev] More thought about signature implementation
by Denis A. Altoé Falqueto 19 Jun '10

19 Jun '10

Hi guys. One more of those long boring emails... sorry. See this situation: let's say we sign packages and the repo.db and the signatures are all dettached, in the same directory as their corresponding files. If some cracker breaks into the machine and deletes the signatures, pacman will not be able to know if the packages and repo.db were signed or not. So, it would be necessary to have some way to indicate that a repository is signed or not and this information must be kept in such a way that an intruder can't change. Another factor to consider is that the signature verification should be optional for each system. I mean, if a user doesn't care about signatures, he should be able to say "pacman, I can't care less about signatures, please". So, I believe that the best place for such information should be in the pacman.conf file, in each repository section. Maybe one cares about signature in one repository but not for another. And we would spread the attack surface for the entire user base, instead of concentrating it only on the server or mirrors. For the repository update, it would be like this: 1. for each repository 1.1. download the repo.db 1.2. if it is signed 1.2.1. download the signature 1.2.2. check the signature 1.3. extract the db to its right place, as today For the package verification, it would be like this: 1. downloads the package 2. if the signature is enabled for the repository 2.1. if the package is signed (this information must come from repo.db) 2.1.1. download the signature for the package 2.1.2. checks the signature For installation of local packages, I am not very worried about signatures. It could be optional, indicated via parameter. Well, I think that to store the new information, we'll have to break the ABI, isn't it? Sorry to say this just a few days after the new release... Maybe we could have put some new fields to future use. -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

3 6

[pacman-dev] [PATCH] Clarify testing within conditional statements
by Allan McRae 19 Jun '10

19 Jun '10

Follow the HACKING guidelines and always use != 0 or == 0 rather than negation within conditional statements to improve clarity. Most of these are !strcmp usages which is the example of what not to do in the HACKING document. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 34 +++++++++++++++++----------------- lib/libalpm/conflict.c | 4 ++-- lib/libalpm/deps.c | 2 +- lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.c | 2 +- src/pacman/callback.c | 2 +- src/pacman/package.c | 2 +- src/pacman/sync.c | 8 ++++---- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 6 +++--- src/util/testdb.c | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 38cf357..7b77ae6 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -69,19 +69,19 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } else { key = _alpm_strtrim(key); ptr = _alpm_strtrim(ptr); - if(!strcmp(key, "pkgname")) { + if(strcmp(key, "pkgname") == 0) { STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "pkgver")) { + } else if(strcmp(key, "pkgver") == 0) { STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "pkgdesc")) { + } else if(strcmp(key, "pkgdesc") == 0) { STRDUP(newpkg->desc, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "group")) { + } else if(strcmp(key, "group") == 0) { newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr)); - } else if(!strcmp(key, "url")) { + } else if(strcmp(key, "url") == 0) { STRDUP(newpkg->url, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "license")) { + } else if(strcmp(key, "license") == 0) { newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr)); - } else if(!strcmp(key, "builddate")) { + } else if(strcmp(key, "builddate") == 0) { char first = tolower((unsigned char)ptr[0]); if(first > 'a' && first < 'z') { struct tm tmp_tm = {0}; /* initialize to null in case of failure */ @@ -92,27 +92,27 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } else { newpkg->builddate = atol(ptr); } - } else if(!strcmp(key, "packager")) { + } else if(strcmp(key, "packager") == 0) { STRDUP(newpkg->packager, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "arch")) { + } else if(strcmp(key, "arch") == 0) { STRDUP(newpkg->arch, ptr, RET_ERR(PM_ERR_MEMORY, -1)); - } else if(!strcmp(key, "size")) { + } else if(strcmp(key, "size") == 0) { /* size in the raw package is uncompressed (installed) size */ newpkg->isize = atol(ptr); - } else if(!strcmp(key, "depend")) { + } else if(strcmp(key, "depend") == 0) { pmdepend_t *dep = _alpm_splitdep(ptr); newpkg->depends = alpm_list_add(newpkg->depends, dep); - } else if(!strcmp(key, "optdepend")) { + } else if(strcmp(key, "optdepend") == 0) { newpkg->optdepends = alpm_list_add(newpkg->optdepends, strdup(ptr)); - } else if(!strcmp(key, "conflict")) { + } else if(strcmp(key, "conflict") == 0) { newpkg->conflicts = alpm_list_add(newpkg->conflicts, strdup(ptr)); - } else if(!strcmp(key, "replaces")) { + } else if(strcmp(key, "replaces") == 0) { newpkg->replaces = alpm_list_add(newpkg->replaces, strdup(ptr)); - } else if(!strcmp(key, "provides")) { + } else if(strcmp(key, "provides") == 0) { newpkg->provides = alpm_list_add(newpkg->provides, strdup(ptr)); - } else if(!strcmp(key, "backup")) { + } else if(strcmp(key, "backup") == 0) { newpkg->backup = alpm_list_add(newpkg->backup, strdup(ptr)); - } else if(!strcmp(key, "makepkgopt")) { + } else if(strcmp(key, "makepkgopt") == 0) { /* not used atm */ } else { _alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n", diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e36844a..236ec1d 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -88,8 +88,8 @@ int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack) char *cpkg2 = conflict->package2; char *npkg1 = needle->package1; char *npkg2 = needle->package2; - if((!strcmp(cpkg1, npkg1) && !strcmp(cpkg2, npkg2)) - || (!strcmp(cpkg1, npkg2) && !strcmp(cpkg2, npkg1))) { + if((strcmp(cpkg1, npkg1) == 0 && strcmp(cpkg2, npkg2) == 0) + || (strcmp(cpkg1, npkg2) == 0 && strcmp(cpkg2, npkg1) == 0)) { return(1); } } diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 26f9b16..fd893a6 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -546,7 +546,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, for(i = dbs; i; i = i->next) { for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) { pmpkg_t *pkg = j->data; - if(alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) && + if(alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) != 0 && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install = 0; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 49fc0f6..c042f09 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -107,7 +107,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) for(i = pkgs; i; i = i->next) { pmpkg_t *pkg = i->data; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) { + if(strcmp(pkgarch,arch) != 0 && strcmp(pkgarch,"any") != 0) { char *string; const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgver = alpm_pkg_get_version(pkg); @@ -371,7 +371,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, /* either extract or copy the scriptlet */ snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir); - if(!strcmp(script, "pre_upgrade") || !strcmp(script, "pre_install")) { + if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) { if(_alpm_unpack_single(installfn, tmpdir, ".INSTALL")) { retval = 1; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 32eaa44..b033e0a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -398,7 +398,7 @@ int _alpm_rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { errflag += _alpm_rmrf(name); } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f5bf17d..23804d7 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -262,7 +262,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, case PM_TRANS_CONV_CONFLICT_PKG: /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ - if(!strcmp(data1, data3) || !strcmp(data2, data3)) { + if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), (char *)data1, (char *)data2, diff --git a/src/pacman/package.c b/src/pacman/package.c index 413754c..ac84a0c 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -189,7 +189,7 @@ void dump_pkg_backups(pmpkg_t *pkg) } /* if checksums don't match, file has been modified */ - if (strcmp(md5sum, ptr)) { + if (strcmp(md5sum, ptr) != 0) { printf(_("MODIFIED\t%s\n"), path); } else { printf(_("Not Modified\t%s\n"), path); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b299438..b9497d6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -60,11 +60,11 @@ static int sync_cleandb(const char *dbpath, int keep_used) { int found = 0; const char *dname = ent->d_name; - if(!strcmp(dname, ".") || !strcmp(dname, "..")) { + if(strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0) { continue; } /* skip the local and sync directories */ - if(!strcmp(dname, "sync") || !strcmp(dname, "local")) { + if(strcmp(dname, "sync") == 0 || strcmp(dname, "local") == 0) { continue; } @@ -178,7 +178,7 @@ static int sync_cleancache(int level) pmpkg_t *localpkg = NULL, *pkg = NULL; alpm_list_t *j; - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { continue; } /* build the full filepath */ @@ -666,7 +666,7 @@ static int sync_trans(alpm_list_t *targets) const char *package2 = alpm_conflict_get_package2(conflict); const char *reason = alpm_conflict_get_reason(conflict); /* only print reason if it contains new information */ - if(!strcmp(package1, reason) || !strcmp(package2, reason)) { + if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { printf(_(":: %s and %s are in conflict\n"), package1, package2); } else { printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 1442eb5..c9c8301 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -112,7 +112,7 @@ int pacman_upgrade(alpm_list_t *targets) const char *package2 = alpm_conflict_get_package2(conflict); const char *reason = alpm_conflict_get_reason(conflict); /* only print reason if it contains new information */ - if(!strcmp(package1, reason) || !strcmp(package2, reason)) { + if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { printf(_(":: %s and %s are in conflict\n"), package1, package2); } else { printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); diff --git a/src/pacman/util.c b/src/pacman/util.c index 0cae6d7..de1b162 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -142,7 +142,7 @@ int rmrf(const char *path) if(dp->d_ino) { char name[PATH_MAX]; sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { errflag += rmrf(name); } } @@ -718,9 +718,9 @@ static int question(short preset, char *fmt, va_list args) return(preset); } - if(!strcasecmp(response, _("Y")) || !strcasecmp(response, _("YES"))) { + if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) { return(1); - } else if (!strcasecmp(response, _("N")) || !strcasecmp(response, _("NO"))) { + } else if (strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) { return(0); } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 6d351eb..45a2626 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -69,7 +69,7 @@ static int db_test(char *dbpath, int local) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..") + if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0 || ent->d_name[0] == '.') { continue; } -- 1.7.1

1 0

[pacman-dev] How to test pacman
by Denis A. Altoé Falqueto 18 Jun '10

18 Jun '10

Hi, I'm starting to get an implementation for package siging and I would like an advice about how to test pacman without having to put it in my real system. Do you have an full virtual machine or just an chroot would suffice? Just for information, I want to test pacman-key, makepkg and repo-add to see if they can generate some valid contents. I've changed makepkg and repo-add to accept an optional key parameter, so that we can choose what key will be used. And I'm investigating how to use gpg directly, without gpgme, because the last is not very flexible. I'm learning about fork and execl for that matter and I believe that a initial implementation is nearer than what I've thought. By the way, I saw that Allan's branch gpg is updated, isn't it? Very good, so we don't lag behind. -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

2 1

[pacman-dev] makepkg patch series summary
by Allan McRae 18 Jun '10

18 Jun '10

Hi, A quick summary of what is happening with the patch series submitted by Andres. My local testing branch will be pushed to my repo some time in the next day and the patches will migrate to my working branch for Dan to pull as I test them more. [PATCH 01/11] makepkg: fix variable checks when writing pkginfo - on my testing branch with additional commit message [PATCH 02/11] makepkg: use declare -f's return val when checking for functions - on my testing branch [PATCH 03/11] makepkg: do not attempt to strip arch agnostic packages - -1 from Dan - +1 from Allan - I want to include this until a valid example of why it should not be is found - would require documentation updates [PATCH 04/11] makepkg: less code duplication in create_package - on my testing branch [PATCH 05/11] makepkg: undeclared local variables - on my testing branch with better commit summary and message [PATCH 06/11] makepkg: less code repetition for emtpy variable checking - on my testing branch with typo fixed [PATCH 07/11] makepkg: less code repetition when sanitizing variable contents - error messages must remain as informative as currently for this to be accepted - will definitely accept update to man pages describing variable restrictions [PATCH 08/11] makepkg: add to variables without expanding them - on my testing branch [PATCH 09/11] makepkg: merge in-line splitpkg handling logic - on my testing branch - new function name may change before moving to my working branch (run-split-packaging?). It will definitely change in the future (I have a draft patch that completely unifies split and non-split packaging). [PATCH 10/11] makepkg: do not ask sudo password twice - under-going cool down period. Will revisit in a week. [PATCH 11/11] makepkg: fix inconsistent output when checking dependencies - on my testing branch - need to remind translators about this during 3.5 release phase... That is 8 1/2 out of 11 patches to be accepted without major revision, which is a very good strike rate around here. Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-6-g09aae4b
by dan＠archlinux.org 17 Jun '10

17 Jun '10

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 09aae4b7a5891ad738754a22f956c83911d1d9eb (commit) via c71fe7db42cd733e85965b11b887762cfd99a981 (commit) via 0e96532096a1ce44801474798909527b522c05cd (commit) via f258ffab257010524cc7619907401b500923e439 (commit) via 95145d4c52e5a6bb22fbb396f5d6584a7e87b75b (commit) via 3c8816f74b75d2ffdfd4eb6825a55620220a159c (commit) from 892266277ed437114080591882d06d5508b3fed7 (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 09aae4b7a5891ad738754a22f956c83911d1d9eb Author: Nezmer <git(a)nezmer.info> Date: Wed Jun 2 19:40:38 2010 -0500 makepkg: Extract from any file bsdtar can recognize If "file -bizL" does not return a supported type, check if the file is recognized by bsdtar and if yes extract from it. Dan: use '-q' option to prevent needing to seek the entire archive. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c71fe7db42cd733e85965b11b887762cfd99a981 Author: Andres P <aepd87(a)gmail.com> Date: Sun May 23 09:02:57 2010 -0430 makepkg: use printf when writing pkginfo Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e96532096a1ce44801474798909527b522c05cd Author: Andres P <aepd87(a)gmail.com> Date: Thu May 27 12:04:22 2010 -0430 makepkg: use single redirection when writing PKGINFO Instead of specifying the output file on every echo, leave it to the caller of write_pkginfo to specify the target. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f258ffab257010524cc7619907401b500923e439 Author: Andres P <aepd87(a)gmail.com> Date: Wed May 26 11:35:40 2010 -0430 makepkg: use double brackets Change all instances of the (test) [ builtin to the [[ keyword. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95145d4c52e5a6bb22fbb396f5d6584a7e87b75b Author: Andres P <aepd87(a)gmail.com> Date: Thu May 27 10:36:08 2010 -0430 makepkg: use type -p's return value for PATH checks Rely on type -p's return value instead of a string check. And gettext was previously being checked with type -t, which was inconsistent with the rest of the tests pertaining commands that aren't expected to be functions nor builtins. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c8816f74b75d2ffdfd4eb6825a55620220a159c Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 17 14:32:08 2010 +1000 makepkg: fallback to sane defaults for library stripping If the library stripping variables are not defined in makepkg.conf, libraries will be fully stripped and become broken. Fallback to a sane default stripping level. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 116 ++++++++++++++++++++++--------------------------- 1 files changed, 52 insertions(+), 64 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-2-g7fc50d7
by dan＠archlinux.org 17 Jun '10

17 Jun '10

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 7fc50d79508f30e74e5ea8d9c801549e7f52229d (commit) via dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 (commit) via 892266277ed437114080591882d06d5508b3fed7 (commit) via 2ee186506c29b98d46420bc7d7b22c150b6cb71c (commit) via 1c59b9e88135395e72738f7dbb3f70a36b9132e1 (commit) via 2e5e3739a185b40344651df493387bd3c80f84f6 (commit) via 84b999823b5775dce3fd01128bbc74b678af919e (commit) via c355d2a3b7136ea7fb494e4ad1e51ad1dc548dac (commit) via 6e31ddf42e9bb9a42ae13e95554d04dc4b98e3fa (commit) via 8fbc91e6934ac553bccf2f65faccc942fa9f5657 (commit) via fe7b77cd8a8c95898fb990f92b97f5eea4eb79ff (commit) via ea7696b44124dfd28c85164290835fad61bd6d89 (commit) via 6297248087e3f73df636b7950b3f94b9e0b6d98d (commit) via 5f5b6f16afdac3b5fb5b0e1c7caf45dac4ade9d3 (commit) via f9c70d31402b11e21b25cba970f41e1853ce5ed6 (commit) via d978039cf0e0cf2accabc33c925d33edaabf0ebb (commit) via d73d055c6fc194ce7b383308ed283ef3100ab26f (commit) via b8863622828287fc0ba204ce7270176753df6bd2 (commit) via ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 (commit) via 8163beb622733824d9e7baa884a574ac36ad3d8e (commit) from 88f139ab4ecb5242dc4682b49bb706413da976cc (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 7fc50d79508f30e74e5ea8d9c801549e7f52229d Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 17 00:01:23 2010 -0500 Revert disabling of make in doc/ dir by default This is a partial revert of commit d44e5099. By making disabling docs the default, it presents all sorts of problems- namely anyone who builds from a tarball and isn't careful enough to include '--enable-doc' will get an install without any manpages at all. Remember that make includes both 'build' and 'install' steps. The warning introduced by the commit is kept, so we do not lose all its benefits, but I am not happy to see regressions introduced in packaging and installing of this piece of software. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 17 14:32:08 2010 +1000 makepkg: fallback to sane defaults for library stripping If the library stripping variables are not defined in makepkg.conf, libraries will be fully stripped and become broken. Fallback to a sane default stripping level. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 28 +++ Makefile.am | 2 +- TRANSLATORS | 6 +- configure.ac | 7 +- doc/Makefile.am | 13 +-- doc/index.txt | 1 + doc/makepkg.conf.5.txt | 16 +- lib/libalpm/po/LINGUAS | 4 +- lib/libalpm/po/ca.po | 24 ++-- lib/libalpm/po/el.po | 25 ++-- lib/libalpm/po/en_GB.po | 105 +---------- lib/libalpm/po/es.po | 25 ++-- lib/libalpm/po/{nb_NO.po => nb.po} | 0 lib/libalpm/po/pt_BR.po | 51 +++--- lib/libalpm/po/ro.po | 20 +- lib/libalpm/po/{sv_SE.po => sv.po} | 4 +- lib/libalpm/po/uk.po | 29 ++-- po/LINGUAS | 4 +- po/ca.po | 264 ++++++++++++++--------------- po/el.po | 39 ++--- po/en_GB.po | 272 +++++++++--------------------- po/es.po | 204 +++++++++++------------ po/{nb_NO.po => nb.po} | 0 po/pt_BR.po | 331 +++++++++++++++++------------------- po/ro.po | 165 ++++++++---------- po/{sv_SE.po => sv.po} | 4 +- po/uk.po | 178 +++++++++----------- po/zh_CN.po | 4 +- scripts/makepkg.sh.in | 21 ++- 29 files changed, 802 insertions(+), 1044 deletions(-) create mode 100644 .mailmap rename lib/libalpm/po/{nb_NO.po => nb.po} (100%) rename lib/libalpm/po/{sv_SE.po => sv.po} (99%) rename po/{nb_NO.po => nb.po} (100%) rename po/{sv_SE.po => sv.po} (99%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Revert disabling of make in doc/ dir by default
by Dan McGee 17 Jun '10

17 Jun '10

This is a partial revert of commit d44e5099. By making disabling docs the default, it presents all sorts of problems- namely anyone who builds from a tarball and isn't careful enough to include '--enable-doc' will get an install without any manpages at all. Remember that make includes both 'build' and 'install' steps. The warning introduced by the commit is kept, so we do not lose all its benefits, but I am not happy to see regressions introduced in packaging and installing of this piece of software. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Obviously a candidate for maint. Allan knows my frustration with this, just look at the current pacman package in [testing] and you'll note the lack of manpages which is just stupid. -Dan configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 008975b..4faf20d 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download, # Help line for documentation AC_ARG_ENABLE(doc, - AS_HELP_STRING([--enable-doc], [run make in doc/ dir]), - [wantdoc=$enableval], [wantdoc=no]) + AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), + [wantdoc=$enableval], [wantdoc=yes]) # Help line for doxygen AC_ARG_ENABLE(doxygen, @@ -272,7 +272,7 @@ if test "x$wantdoc" = "xyes" ; then fi wantdoc=yes else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no, disabled by configure]) wantdoc=no fi AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes") -- 1.7.1

1 0

[pacman-dev] [PATCH] makepkg: fallback to sane defaults for library stripping
by Allan McRae 17 Jun '10

17 Jun '10

If the library stripping variables are not defined in makepkg.conf, libraries will be fully stripped and become broken. Fallback to a sane default stripping level. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d986701..e64b564 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -864,6 +864,9 @@ tidy_install() { if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" + # make sure library stripping variables are defined to prevent excess stripping + [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" + [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" local binary find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in -- 1.7.1

1 0