- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: use basename instead of a sed command
by Cedric Staniewski 20 Oct '09

20 Oct '09

The basename command is easier to understand than a sed command and it is even slightly faster than sed. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- or if you prefer bashisms, see next patch 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 24fddf6..62d0923 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -190,7 +190,7 @@ get_filename() { # if a filename is specified, use it local filename=$(echo $1 | sed 's|::.*||') # if it is just an URL, we only keep the last component - echo "$filename" | sed 's|^.*://.*/||g' + basename "$filename" } # extract the URL from a source entry @@ -321,7 +321,7 @@ download_file() { # destination file local file=$3 # temporary download file, default to last component of the URL - local dlfile=$(echo "$url" | sed 's|^.*://.*/||g') + local dlfile=$(basename "$url") # replace %o by the temporary dlfile if it exists if echo "$dlcmd" | grep -q "%o" ; then -- 1.6.5

4 12

[pacman-dev] Is -Suu supposed to also update packages?
by Cedric Staniewski 20 Oct '09

20 Oct '09

Hi, while implementing pacman's downgrade operation in bash, I noticed that pacman also includes upgradeable package in the list of downgradeable ones. I did not complete the downgrade, but I would assume that it would have actually updated some of the packages. In my bash function I filter the upgradeable packages out of the installed ones and this is what I expected pacman would do, too. Apparently, this is not the case and I wonder, if this is the intended behavior or if it should be considered as a bug. According to the documentation, I would say this is intended, so the term "downgrade" is a little bit misleading in my opinion. > Pass this option twice to enable package downgrade; in this case pacman will select sync packages whose version does not match with > the local version. This can be useful when the user switches from a testing repo to a stable one. Thanks for clarification, Cedric

2 2

[pacman-dev] [PATCH] makepkg: fix --allsource when remote source files do not reside in SRCDEST
by Cedric Staniewski 20 Oct '09

20 Oct '09

When using the --allsource option, it was assumed that remote source files reside in SRCDEST which is not necessarily always the case. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- 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 24fddf6..806a325 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1074,9 +1074,10 @@ create_srcpackage() { if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif [ "$SOURCEONLY" -eq 2 -a -f "$SRCDEST/$file" ]; then + elif [ "$SOURCEONLY" -eq 2 ] && [ -f "$file" -o -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + [ ! -f "$file" ] && file="$SRCDEST/$file" + ln -s "$file" "${srclinks}/${pkgbase}/" fi done -- 1.6.5

4 5

[pacman-dev] Build issues with the maint branch of pacman
by Ciprian Dorin, Craciun 20 Oct '09

20 Oct '09

Hello all! While trying to build (a patched version) of the latest maint branch in the Git repository I get the following error: ~~~~ $ autoconf configure.ac:60: error: possibly undefined macro: AM_INIT_AUTOMAKE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:128: error: possibly undefined macro: AC_PROG_LIBTOOL configure.ac:132: error: possibly undefined macro: AM_GNU_GETTEXT configure.ac:133: error: possibly undefined macro: AM_GNU_GETTEXT_VERSION configure.ac:155: error: possibly undefined macro: AM_CONDITIONAL ~~~~ (My patch is only adding a git-dlagent script, and is not touching otherwise the configure.ac file.) Any ideas? (I'm using the latest up-to-date version of ArchLinux.) Thanks, Ciprian.

3 13

[pacman-dev] makepkg test suite
by Allan McRae 20 Oct '09

20 Oct '09

Hi all, I am starting to write a test suite for makepkg. Hopefully this will make it more difficult to break things in the future... I have written a brief outline of how I have started implementing this here: http://wiki.archlinux.org/index.php/User:Allan/Makepkg_Test_Suite I realize that most issues with the implementation will be discovered as it goes on but any comments at this stage would be useful. Allan

2 3

[pacman-dev] [PATCH] Size handling was changed in fgets() functions
by Laszlo Papp 19 Oct '09

19 Oct '09

./src/pacman/util.c: - response size handling was changed in fgets() function, because it's easier to handle the source modification after a size modification ./lib/libalp/be_files.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification ./lib/libalpm/trans.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- lib/libalpm/be_files.c | 48 ++++++++++++++++++++++++------------------------ lib/libalpm/trans.c | 2 +- src/pacman/util.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 03a1463..01be4a2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -409,7 +409,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); + memset(line, 0, sizeof(line)); pkgpath = get_pkgpath(db, info); @@ -433,7 +433,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->name) != 0) { @@ -441,7 +441,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->version) != 0) { @@ -449,39 +449,39 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->filename, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->desc, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->groups = alpm_list_add(info->groups, linedup); } } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->url, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->licenses = alpm_list_add(info->licenses, linedup); } } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->arch, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -497,7 +497,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->builddate = atol(line); } } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -513,12 +513,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->installdate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->packager, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); @@ -528,7 +528,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->size = atol(_alpm_strtrim(line)); @@ -539,19 +539,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%ISIZE%") == 0) { /* ISIZE (installed size) tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->isize = atol(_alpm_strtrim(line)); } else if(strcmp(line, "%MD5SUM%") == 0) { /* MD5SUM tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->md5sum, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->replaces = alpm_list_add(info->replaces, linedup); @@ -574,13 +574,13 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->files = alpm_list_add(info->files, linedup); } } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->backup = alpm_list_add(info->backup, linedup); @@ -602,24 +602,24 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); info->depends = alpm_list_add(info->depends, dep); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->optdepends = alpm_list_add(info->optdepends, linedup); } } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->conflicts = alpm_list_add(info->conflicts, linedup); } } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->provides = alpm_list_add(info->provides, linedup); @@ -638,7 +638,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1 fp) && strlen(_alpm_strtrim(line))) { pmdelta_t *delta = _alpm_delta_parse(line); if(delta) { info->deltas = alpm_list_add(info->deltas, delta); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c99f596..c182510 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -320,7 +320,7 @@ static int grep(const char *fn, const char *needle) } while(!feof(fp)) { char line[1024]; - fgets(line, 1024, fp); + fgets(line, sizeof(line), fp); if(feof(fp)) { continue; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 353aae3..c931bb2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -638,7 +638,7 @@ static int question(short preset, char *fmt, va_list args) return(preset); } - if(fgets(response, 32, stdin)) { + if(fgets(response, sizeof(response), stdin)) { strtrim(response); if(strlen(response) == 0) { return(preset); -- 1.6.4.4

6 10

[pacman-dev] about vercmp tools
by mcu GPS 19 Oct '09

19 Oct '09

usage: vercmp <ver1> <ver2> return values: < 0 : if ver1 < ver2 0 : if ver1 == ver2 > 0 : if ver1 > ver2 [arch@myarchtp mkarchlive] $ vercmp 0.1 0.1_rc1 -1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1_r1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_r1 0.1_rc1 -1 0.1_rc1 > 0.1 ? 0.1_rc1 > 0.1_r1 ? this is a bug?

2 2

[pacman-dev] [PATCH 4/4] Change strcat function using for strncat
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- 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 553591d..41a5783 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -105,7 +105,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) /* we have another path component- append the newest component to * existing string and create one more level of dir structure */ strcat(incr, "/"); - strcat(incr, ptr); + strncat(incr, ptr, strlen(ptr)); if(access(incr, F_OK)) { if(mkdir(incr, mode)) { ret = 1; -- 1.6.4.4

3 3

[pacman-dev] [PATCH 2/4] Change sprintf function using for snprintf
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/be_files.c | 10 +++++----- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 4 ++-- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 16 +++++++++------- src/pacman/sync.c | 2 +- src/pacman/util.c | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ebcd6a5..209c38e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -311,7 +311,7 @@ static int extract_single_file(struct archive *archive, size_t backup_len = strlen(oldbackup) + 34; MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(backup, "%s\t%s", oldbackup, hash_pkg); + snprintf(backup, backup_len, "%s\t%s", oldbackup, hash_pkg); backup[backup_len-1] = '\0'; FREE(oldbackup); backups->data = backup; @@ -462,7 +462,7 @@ static int extract_single_file(struct archive *archive, hash = alpm_compute_md5sum(filename); MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(backup, "%s\t%s", oldbackup, hash); + snprintf(backup, backup_len, "%s\t%s", oldbackup, hash); backup[backup_len-1] = '\0'; FREE(hash); FREE(oldbackup); diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..36a9cfc 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -67,7 +67,7 @@ static time_t getlastupdate(pmdb_t *db) dbpath = _alpm_db_path(db); /* dbpath + '.lastupdate' + NULL */ MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", dbpath); + snprintf(file, strlen(dbpath), "%s.lastupdate", dbpath); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { @@ -103,7 +103,7 @@ static int setlastupdate(pmdb_t *db, time_t time) dbpath = _alpm_db_path(db); /* dbpath + '.lastupdate' + NULL */ MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", dbpath); + snprintf(file, strlen(dbpath), "%s.lastupdate", dbpath); if((fp = fopen(file, "w")) == NULL) { free(file); @@ -211,7 +211,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) len = strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfile, "%s" DBEXT, db->treename); + snprintf(dbfile, len, "%s" DBEXT, db->treename); dbpath = alpm_option_get_dbpath(); @@ -241,7 +241,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) /* form the path to the db location */ len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); + snprintf(dbfilepath, len, "%s%s" DBEXT, dbpath, db->treename); /* uncompress the sync database */ checkdbdir(db); @@ -378,7 +378,7 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) dbpath = _alpm_db_path(db); len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3; MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL)); - sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version); + snprintf(pkgpath, len, "%s%s-%s/", dbpath, info->name, info->version); return(pkgpath); } diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e934c01..e27649c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -525,7 +525,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, /* check if all files of the dir belong to the installed pkg */ if(!resolved_conflict && S_ISDIR(lsbuf.st_mode) && dbpkg) { char *dir = malloc(strlen(filestr) + 2); - sprintf(dir, "%s/", filestr); + snprintf(dir, strlen(filestr)+2, "%s/", filestr); if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),dir)) { _alpm_log(PM_LOG_DEBUG, "check if all files in %s belongs to %s\n", dir, dbpkg->name); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index dca5452..a7e6d18 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -369,12 +369,12 @@ const char *_alpm_db_path(pmdb_t *db) if(db->is_local) { pathsize = strlen(dbpath) + strlen(db->treename) + 2; CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); - sprintf(db->_path, "%s%s/", dbpath, db->treename); + snprintf(db->_path, pathsize, "%s%s/", dbpath, db->treename); } else { pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2; CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); /* all sync DBs now reside in the sync/ subdir of the dbpath */ - sprintf(db->_path, "%ssync/%s/", dbpath, db->treename); + snprintf(db->_path, pathsize, "%ssync/%s/", dbpath, db->treename); } _alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n", db->treename, db->_path); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index aea71db..f4a6879 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -113,7 +113,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) const char *pkgver = alpm_pkg_get_version(pkg); size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3; MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid)); - sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch); + snprintf(string, len, "%s-%s-%s", pkgname, pkgver, pkgarch); invalid = alpm_list_add(invalid, string); } } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..553591d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -315,7 +315,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -394,7 +394,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); + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { errflag += _alpm_rmrf(name); } @@ -651,7 +651,9 @@ int _alpm_lstat(const char *path, struct stat *buf) char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; + int soutput = sizeof(output); char *md5sum; + int smd5sum = 33; int ret, i; ALPM_LOG_FUNC; @@ -659,7 +661,7 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) ASSERT(filename != NULL, return(NULL)); /* allocate 32 chars plus 1 for null */ - md5sum = calloc(33, sizeof(char)); + md5sum = calloc(smd5sum, sizeof(char)); ret = md5_file(filename, output); if (ret > 0) { @@ -667,11 +669,11 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) } /* Convert the result to something readable */ - for (i = 0; i < 16; i++) { - /* sprintf is acceptable here because we know our output */ - sprintf(md5sum +(i * 2), "%02x", output[i]); + for (i = 0; i < soutput; i++) { + /* snprintf is acceptable here because we know our output */ + snprintf(md5sum +(i * 2), smd5sum-i*2, "%02x", output[i]); } - md5sum[32] = '\0'; + md5sum[smd5sum-1] = '\0'; _alpm_log(PM_LOG_DEBUG, "md5(%s) = %s\n", filename, md5sum); return(md5sum); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..1507dd5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -117,7 +117,7 @@ static int sync_cleandb_all(void) { * and only the unused sync dbs in dbpath/sync/ */ ret += sync_cleandb(dbpath, 0); - sprintf(newdbpath, "%s%s", dbpath, "sync/"); + snprintf(newdbpath, PATH_MAX, "%s%s", dbpath, "sync/"); ret += sync_cleandb(newdbpath, 1); printf(_("Database directory cleaned up\n")); diff --git a/src/pacman/util.c b/src/pacman/util.c index 1143bef..f4e1756 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -128,7 +128,7 @@ int rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { errflag += rmrf(name); } -- 1.6.4.4

3 2

[pacman-dev] [PATCH 3/4] Change strcpy function using for strncpy
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/pacman.c | 4 ++-- src/pacman/query.c | 4 ++-- src/pacman/util.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 5e824f4..0aaf6f0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -960,11 +960,11 @@ static void cl_to_log(int argc, char* argv[]) return; char *p = cl_text; for(i = 0; i<argc-1; i++) { - strcpy(p, argv[i]); + strncpy(p, argv[i], strlen(argv[i])); p += strlen(argv[i]); *p++ = ' '; } - strcpy(p, argv[i]); + strncpy(p, argv[i], strlen(argv[i])); alpm_logaction("Running '%s'\n", cl_text); free(cl_text); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..cb15852 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -326,7 +326,7 @@ static int check(pmpkg_t *pkg) pm_fprintf(stderr, PM_LOG_ERROR, _("root path too long\n")); return(1); } - strcpy(f, root); + strncpy(f, root, rootlen); const char *pkgname = alpm_pkg_get_name(pkg); for(i = alpm_pkg_get_files(pkg); i; i = alpm_list_next(i)) { @@ -337,7 +337,7 @@ static int check(pmpkg_t *pkg) pm_fprintf(stderr, PM_LOG_WARNING, _("file path too long\n")); continue; } - strcpy(f + rootlen, path); + strncpy(f + rootlen, path, strlen(path)); allfiles++; /* use lstat to prevent errors from symlinks */ if(lstat(f, &st) != 0) { diff --git a/src/pacman/util.c b/src/pacman/util.c index f4e1756..4afed1c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -352,7 +352,7 @@ char *strreplace(const char *str, const char *needle, const char *replace) if(*p) { /* add the rest of 'p' */ - strcpy(newp, p); + strncpy(newp, p, strlen(p)); newp += strlen(p); } *newp = '\0'; -- 1.6.4.4

3 2

[pacman-dev] [patch] makepkg: update checksums (was: add checksums and resume)
by Ray Rashif 15 Oct '09

15 Oct '09

This is in reference to http://bugs.archlinux.org/task/15051 and a somewhat-old http://mailman.archlinux.org/pipermail/pacman-dev/2008-March/005939.html :) The initial idea was actually not substantial enough and it also went on to continue the build, so here is another one updated with Allan's suggestion. * Do not resume (maybe a separate switch for that..and for another person another day) * Consider all supported checksums from buildscript (regardless of user's config) * Do not support buildscripts with checksums for more than one architecture The last one is something I had hoped I wouldn't end up with. It's technically possible, but visually ugly. Firstly, to override $CARCH one needs to do something before generate_checksums, and this doesn't appear to be as trivial as I'd thought. Then, there is simply no way to redirect a properly-formatted multi-arch checksum output. Echo'ing along with the function produces a huge number of white spaces (or tabs), though nothing harmful. Any deeper trick is simply not going to be worth it. Obviously may not be the best way to do this, so adapt as you like if it's worth implementing. Against current git. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2941a5d..d3d0d61 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -504,7 +504,6 @@ download_sources() { generate_checksums() { msg "$(gettext "Generating checksums for source files...")" - plain "" if [ ! $(type -p openssl) ]; then error "$(gettext "Cannot find openssl.")" @@ -523,6 +522,7 @@ generate_checksums() { local ct=0 local numsrc=${#source[@]} + echo echo -n "${integ}sums=(" local i=0; @@ -557,6 +557,45 @@ generate_checksums() { done } +update_checksums() { + local file="$startdir/$BUILDSCRIPT" + local integ + + # necessary override for --geninteg + unset INTEGRITY_CHECK + + for integ in md5 sha1 sha256 sha384 sha512; do + grep "${integ}sums=(" $file &> /dev/null && \ + INTEGRITY_CHECK=(${INTEGRITY_CHECK[@]} $integ) + done + + integ=${INTEGRITY_CHECK[0]} + if grep "&& ${integ}sums=(" "$file" | grep '$CARCH' &> /dev/null; then + error "$(gettext "Multi-arch checksum update not supported. Exiting...")" + exit 1 + else + for integ in ${INTEGRITY_CHECK[@]}; do + sed -i "/${integ}sums=(/,/)$/d" "$file" + done + + if grep "# vim: set" "$file" &> /dev/null; then + sed -i '/# vim: set/d' "$file" + sed -i -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$file" + local vimset=1 + fi + + generate_checksums >> "$file" + + if [ $vimset -eq 1 ]; then + echo >> "$file" + echo "# vim: set ts=2 sw=2 et:" >> "$file" + fi + fi + + msg "$(gettext "Updated checksums in %s")" "$BUILDSCRIPT" + return 0 +} + check_checksums() { [ ${#source[@]} -eq 0 ] && return 0 @@ -1431,6 +1470,7 @@ usage() { echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" echo "$(gettext " -f, --force Overwrite existing package")" echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" + printf "$(gettext " -G, --getinteg Update integrity checks in %s")\n" "$BUILDSCRIPT" echo "$(gettext " -h, --help This help")" echo "$(gettext " -i, --install Install package after successful build")" echo "$(gettext " -L, --log Log package build process")" @@ -1477,9 +1517,9 @@ fi ARGLIST=$@ # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcCdefFgGhiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" -OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,getinteg,help,holdver" OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,skipinteg" OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" # Pacman Options @@ -1512,6 +1552,7 @@ while true; do --forcever) shift; FORCE_VER=$1;; -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; + -G| --getinteg) GETINTEG=1 ;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; @@ -1680,6 +1721,15 @@ if [ "$GENINTEG" -eq 1 ]; then exit 0 # $E_OK fi +if [ "$GETINTEG" -eq 1 ]; then + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + update_checksums + cd "$startdir" + exit 0 +fi + if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 fi

4 14

[pacman-dev] Getting Involved With Pacman Development
by Tim Skinner 15 Oct '09

15 Oct '09

Hey everyone, Apologies if this isn't the proper place to send this message to. I just pulled down the repo and signed up for the mailing list and bug tracker so I can start trying to contribute patches. I thought I'd shoot off an email to see if anyone had any suggestions for bugfixes or features that might be good tackle to help me get used to the codebase, or if anyone had any other pointers. I look forward to contributing. --Tim Skinner

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-68-gf9582c7
by dan＠archlinux.org 15 Oct '09

15 Oct '09

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 f9582c7df223e1eb4078e6db4e2d35dc0f2bf9be (commit) from 2cabe336eb33e443819a1d9d46b0c5bcceaa7e87 (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 f9582c7df223e1eb4078e6db4e2d35dc0f2bf9be Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Tue Oct 13 05:14:56 2009 +0200 Replace hardcoded option numbers with enumeration Pacman's long option parsing used hardcoded numbers to identify them. This is not good practice, so replace them with enumeration constants. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/conf.h | 18 ++++++++++++++++ src/pacman/pacman.c | 56 +++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 28 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] word-wrapping when not outputting to a tty
by Oleg Finkelshteyn 14 Oct '09

14 Oct '09

I've noticed the following behaviour which makes it somewhat difficult to use -Qi/-Si/etc. in a pipeline: $ pacman -Si binutils ... Description : A set of programs to assemble and manipulate binary and object files $ pacman -Si binutils | cat Description : A set of programs to assemble and manipulate binary and object files I'd expect pacman not word-wrapping the output in the second case, as it breaks the line-oriented nature of data. This happens because getcols() defaults to 80 when !isatty(1), but I'd rather like it not to word-wrap at all in this case, as we're outputting to something like a file or a pipe. In the former case, some text processing tool could do better anyway, and the current behavior makes the latter case hardly useful at all. Does that make sense? Basically I'm suggesting (maybe) getting rid of the isatty() check in getcols() and adding one around word-wrapping code in indentprint() and list_display(). An attempt at implementing the proposal above can be found at http://rain.ifmo.ru/~olegfink/pacman-wrap.patch (sorry for not inlining, I use gmail). Maybe there should be more code shared between the two routines, e.g. getcols() could return -1 when word wrapping shouldn't be done. Any thoughts? Thanks, oleg

6 11

[pacman-dev] PATCH 8/8] Replace hardcoded option numbers with enumeration
by Laszlo Papp 13 Oct '09

13 Oct '09

Pacman's long option parsing used hardcoded numbers to identify them. This is not good practice, so replace them with enumeration constants. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/conf.h | 18 ++++++++++++++++ src/pacman/pacman.c | 56 +++++++++++++++++++++++++----- -------------------- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 3c588a7..c854df4 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -88,6 +88,24 @@ enum { PM_OP_DEPTEST }; +/* Long Operations */ +enum { + PM_LONG_OP_NOCONFIRM = 1000, + PM_LONG_OP_CONFIG, + PM_LONG_OP_IGNORE, + PM_LONG_OP_DEBUG, + PM_LONG_OP_NOPROGRESSBAR, + PM_LONG_OP_NOSCRIPTLET, + PM_LONG_OP_ASK, + PM_LONG_OP_CACHEDIR, + PM_LONG_OP_ASDEPS, + PM_LONG_OP_LOGFILE, + PM_LONG_OP_IGNOREGROUP, + PM_LONG_OP_NEEDED, + PM_LONG_OP_ASEXPLICIT, + PM_LONG_OP_ARCH +}; + /* clean method */ enum { PM_CLEAN_KEEPINST = 0, /* default */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ac51502..30b39b5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -378,20 +378,20 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"noconfirm", no_argument, 0, 1000}, - {"config", required_argument, 0, 1001}, - {"ignore", required_argument, 0, 1002}, - {"debug", optional_argument, 0, 1003}, - {"noprogressbar", no_argument, 0, 1004}, - {"noscriptlet", no_argument, 0, 1005}, - {"ask", required_argument, 0, 1006}, - {"cachedir", required_argument, 0, 1007}, - {"asdeps", no_argument, 0, 1008}, - {"logfile", required_argument, 0, 1009}, - {"ignoregroup", required_argument, 0, 1010}, - {"needed", no_argument, 0, 1011}, - {"asexplicit", no_argument, 0, 1012}, - {"arch", required_argument, 0, 1013}, + {"noconfirm", no_argument, 0, PM_LONG_OP_NOCONFIRM}, + {"config", required_argument, 0, PM_LONG_OP_CONFIG}, + {"ignore", required_argument, 0, PM_LONG_OP_IGNORE}, + {"debug", optional_argument, 0, PM_LONG_OP_DEBUG}, + {"noprogressbar", no_argument, 0, PM_LONG_OP_NOPROGRESSBAR}, + {"noscriptlet", no_argument, 0, PM_LONG_OP_NOSCRIPTLET}, + {"ask", required_argument, 0, PM_LONG_OP_ASK}, + {"cachedir", required_argument, 0, PM_LONG_OP_CACHEDIR}, + {"asdeps", no_argument, 0, PM_LONG_OP_ASDEPS}, + {"logfile", required_argument, 0, PM_LONG_OP_LOGFILE}, + {"ignoregroup", required_argument, 0, PM_LONG_OP_IGNOREGROUP}, + {"needed", no_argument, 0, PM_LONG_OP_NEEDED}, + {"asexplicit", no_argument, 0, PM_LONG_OP_ASEXPLICIT}, + {"arch", required_argument, 0, PM_LONG_OP_ARCH}, {0, 0, 0, 0} }; @@ -403,21 +403,21 @@ static int parseargs(int argc, char *argv[]) } switch(opt) { case 0: break; - case 1000: config->noconfirm = 1; break; - case 1001: + case PM_LONG_OP_NOCONFIRM: config->noconfirm = 1; break; + case PM_LONG_OP_CONFIG: if(config->configfile) { free(config->configfile); } config->configfile = strndup(optarg, PATH_MAX); break; - case 1002: + case PM_LONG_OP_IGNORE: list = strsplit(optarg, ','); for(item = list; item; item = alpm_list_next(item)) { alpm_option_add_ignorepkg((char *)alpm_list_getdata(item)); } FREELIST(list); break; - case 1003: + case PM_LONG_OP_DEBUG: /* debug levels are made more 'human readable' than using a raw logmask * here, error and warning are set in config_new, though perhaps a * --quiet option will remove these later */ @@ -440,34 +440,34 @@ static int parseargs(int argc, char *argv[]) /* progress bars get wonky with debug on, shut them off */ config->noprogressbar = 1; break; - case 1004: config->noprogressbar = 1; break; - case 1005: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; - case 1006: config->noask = 1; config->ask = atoi(optarg); break; - case 1007: + case PM_LONG_OP_NOPROGRESSBAR: config->noprogressbar = 1; break; + case PM_LONG_OP_NOSCRIPTLET: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; + case PM_LONG_OP_ASK: config->noask = 1; config->ask = atoi(optarg); break; + case PM_LONG_OP_CACHEDIR: if(alpm_option_add_cachedir(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"), optarg, alpm_strerrorlast()); return(1); } break; - case 1008: + case PM_LONG_OP_ASDEPS: config->flags |= PM_TRANS_FLAG_ALLDEPS; break; - case 1009: + case PM_LONG_OP_LOGFILE: config->logfile = strndup(optarg, PATH_MAX); break; - case 1010: + case PM_LONG_OP_IGNOREGROUP: list = strsplit(optarg, ','); for(item = list; item; item = alpm_list_next(item)) { alpm_option_add_ignoregrp((char *)alpm_list_getdata(item)); } FREELIST(list); break; - case 1011: config->flags |= PM_TRANS_FLAG_NEEDED; break; - case 1012: + case PM_LONG_OP_NEEDED: config->flags |= PM_TRANS_FLAG_NEEDED; break; + case PM_LONG_OP_ASEXPLICIT: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; - case 1013: + case PM_LONG_OP_ARCH: setarch(optarg); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; -- 1.6.4.4

3 5

[pacman-dev] bug in pacman 3.3.2 retrieving of repos?
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 13 Oct '09

13 Oct '09

Hello List, pacman 3.3.2 libfetch backend doesn't retrieve an updated repo via http (tested with "touch repo.db.tar.gz" on the http server) here. I checked the http headers with curl just to be sure that my setup isn't f***ed up in some way and they are updated just fine after every touch on the file, so i has to be a problem with libfetch or pacman itself. A local revert to pacman 3.3.0 (no build-changes or libfetch changes and the exact same build-environment) fixes this problem here so it looks like a messed up usage of libfetch in pacman 3.3.2 release. Can someone else reproduce this behaviour? Because i have no clue on how to use libfetch the right way without reading the documentation and analyse the code in pacman afterwards, i hope someone else wants to hound it down. Marc

3 11

[pacman-dev] [PATCH] Only extract new db entries
by Xavier Chantry 12 Oct '09

12 Oct '09

This implements FS#15198. The idea apparently came from Csaba Henk <csaba-ml <at> creo.hu> which submitted a patch to frugalware, so thanks to him, even though I did not look at the code :) The idea is to only extract folders for new packages into the package database and clean up the old directories. This is essentially implementing Xyne's "rebase" script within pacman. If using -Syy, just remove and extract everything. If using -Sy : 1. Generate list of directories in db 2. Generate list of directories in archive 3. Compare both 4. Clean up old directories 5. Extract new directories Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/be_files.c | 168 ++++++++++++++++++++++++++++++++++++++++++++---- lib/libalpm/util.c | 3 +- 2 files changed, 156 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 53bbda1..ef045c5 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -33,6 +33,10 @@ #include <limits.h> /* PATH_MAX */ #include <locale.h> /* setlocale */ +/* libarchive */ +#include <archive.h> +#include <archive_entry.h> + /* libalpm */ #include "db.h" #include "alpm_list.h" @@ -137,6 +141,103 @@ static int checkdbdir(pmdb_t *db) return(0); } +/* create list of directories in db */ +static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist) +{ + struct archive *_archive; + struct archive_entry *entry; + + if((_archive = archive_read_new()) == NULL) + RET_ERR(PM_ERR_LIBARCHIVE, -1); + + archive_read_support_compression_all(_archive); + archive_read_support_format_all(_archive); + + if(archive_read_open_filename(_archive, archive, + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + _alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive, + archive_error_string(_archive)); + RET_ERR(PM_ERR_PKG_OPEN, -1); + } + + while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { + const struct stat *st; + const char *entryname; /* the name of the file in the archive */ + + st = archive_entry_stat(entry); + entryname = archive_entry_pathname(entry); + + if(S_ISDIR(st->st_mode)) { + char *name = strdup(entryname); + *dirlist = alpm_list_add(*dirlist, name); + } + } + archive_read_finish(_archive); + + *dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp); + return(0); +} + +/* create list of directories in db */ +static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist) +{ + DIR *dbdir; + struct dirent *ent = NULL; + struct stat sbuf; + char path[PATH_MAX]; + + dbdir = opendir(syncdbpath); + if (dbdir != NULL) { + while((ent = readdir(dbdir)) != NULL) { + char *name = ent->d_name; + int len; + char *entry; + + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + /* stat the entry, make sure it's a directory */ + snprintf(path, PATH_MAX, "%s%s", syncdbpath, name); + if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { + continue; + } + + len = strlen(name); + MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1)); + strcpy(entry, name); + entry[len] = '/'; + entry[len+1] = '\0'; + *dirlist = alpm_list_add(*dirlist, entry); + } + } + closedir(dbdir); + + *dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp); + return(0); +} + +/* remove old directories from dbdir */ +static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) +{ + alpm_list_t *i; + for (i = dirlist; i; i = i->next) { + const char *name = i->data; + char *dbdir; + int len = strlen(syncdbpath) + strlen(name) + 2; + MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(dbdir, len, "%s%s", syncdbpath, name); + _alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir); + if(_alpm_rmrf(dbdir) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir); + free(dbdir); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } + free(dbdir); + } + return(0); +} + /** Update a package database * * An update of the package database \a db will be attempted. Unless @@ -229,27 +330,63 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) return(-1); } else { const char *syncdbpath = _alpm_db_path(db); - /* remove the old dir */ - if(_alpm_rmrf(syncdbpath) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); - RET_ERR(PM_ERR_DB_REMOVE, -1); - } - - /* Cache needs to be rebuilt */ - _alpm_db_free_pkgcache(db); /* form the path to the db location */ len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); - /* uncompress the sync database */ - checkdbdir(db); - ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); - if(ret) { - free(dbfilepath); - RET_ERR(PM_ERR_SYSTEM, -1); + if(force) { + /* if forcing update, remove the old dir and extract the db */ + if(_alpm_rmrf(syncdbpath) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } + + checkdbdir(db); + + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); + if(ret) { + free(dbfilepath); + RET_ERR(PM_ERR_SYSTEM, -1); + } + } else { + /* if not forcing, only remove and extract what is necessary */ + alpm_list_t *onlyold = NULL; + alpm_list_t *onlynew = NULL; + alpm_list_t *olddirlist = NULL; + alpm_list_t *newdirlist = NULL; + + ret = dirlist_from_tar(dbfilepath, &newdirlist); + if(ret) { + goto cleanup; + } + ret = dirlist_from_fs(syncdbpath, &olddirlist); + if(ret) { + goto cleanup; + } + + alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew); + + ret = remove_olddir(syncdbpath, onlyold); + if(ret) { + goto cleanup; + } + checkdbdir(db); + ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0); + +cleanup: + alpm_list_free(onlyold); + alpm_list_free(onlynew); + FREELIST(olddirlist); + FREELIST(newdirlist); + + if(ret) { + free(dbfilepath); + RET_ERR(PM_ERR_SYSTEM, -1); + } } + unlink(dbfilepath); free(dbfilepath); @@ -259,6 +396,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) db->treename, (uintmax_t)newmtime); setlastupdate(db, newmtime); } + + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); } return(0); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..814a28a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -332,12 +332,13 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int char *found = alpm_list_find_str(list, prefix); free(prefix); if(!found) { - _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); if (archive_read_data_skip(_archive) != ARCHIVE_OK) { ret = 1; goto cleanup; } continue; + } else { + _alpm_log(PM_LOG_DEBUG, "extracting: %s\n", entryname); } } -- 1.6.4.4

1 0

Re: [pacman-dev] [PATCH 3/3] Only extract new db entries
by Xavier 12 Oct '09

12 Oct '09

On Mon, Oct 12, 2009 at 3:03 PM, Henning Garus <henning.garus(a)googlemail.com> wrote: > On Sun, Oct 11, 2009 at 03:42:50PM +0200, Xavier Chantry wrote: >> +/* create list of directories in db */ >> +static alpm_list_t *dirlist_from_fs(const char *syncdbpath) >> +{ >> + DIR *dbdir; >> + struct dirent *ent = NULL; >> + alpm_list_t *dirlist = NULL; >> + struct stat sbuf; >> + char path[PATH_MAX]; >> + >> + dbdir = opendir(syncdbpath); >> + if (dbdir != NULL) { >> + while((ent = readdir(dbdir)) != NULL) { >> + char *name = ent->d_name; >> + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { >> + continue; >> + } >> + >> + /* stat the entry, make sure it's a directory */ >> + snprintf(path, PATH_MAX, "%s%s", syncdbpath, name); >> + if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { >> + continue; >> + } >> + >> + int len = strlen(name); >> + char *entry = malloc(len + 2); > > Isn't MALLOC more appropriate here? > Probably :) >> + strcpy(entry, name); >> + entry[len] = '/'; >> + entry[len+1] = '\0'; >> + dirlist = alpm_list_add(dirlist, entry); >> + } >> + } >> + closedir(dbdir); >> + >> + dirlist = alpm_list_msort(dirlist, alpm_list_count(dirlist), _alpm_str_cmp); >> + return(dirlist); >> +} >> + >> +/* remove old directories from dbdir */ >> +static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) >> +{ >> + alpm_list_t *i; >> + for (i = dirlist; i; i = i->next) { >> + const char *name = i->data; >> + char *dbdir; >> + int len = strlen(syncdbpath) + strlen(name) + 2; >> + MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1)); >> + snprintf(dbdir, len, "%s%s", syncdbpath, name); >> + _alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir); >> + if(_alpm_rmrf(dbdir) != 0) { >> + _alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir); >> + free(dbdir); >> + RET_ERR(PM_ERR_DB_REMOVE, -1); >> + } >> + free(dbdir); >> + } >> + return(0); >> +} >> + >> /** Update a package database >> * >> * An update of the package database \a db will be attempted. Unless >> @@ -229,27 +329,54 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) >> return(-1); >> } else { >> const char *syncdbpath = _alpm_db_path(db); >> - /* remove the old dir */ >> - if(_alpm_rmrf(syncdbpath) != 0) { >> - _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); >> - RET_ERR(PM_ERR_DB_REMOVE, -1); >> - } >> - >> - /* Cache needs to be rebuilt */ >> - _alpm_db_free_pkgcache(db); >> >> /* form the path to the db location */ >> len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; >> MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); >> sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); >> >> - /* uncompress the sync database */ >> - checkdbdir(db); >> - ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); >> - if(ret) { >> - free(dbfilepath); >> - RET_ERR(PM_ERR_SYSTEM, -1); >> + /* remove the old dir if forcing update */ >> + if(force) { >> + if(_alpm_rmrf(syncdbpath) != 0) { >> + _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); >> + RET_ERR(PM_ERR_DB_REMOVE, -1); >> + } >> + >> + checkdbdir(db); >> + >> + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); >> + if(ret) { >> + free(dbfilepath); >> + RET_ERR(PM_ERR_SYSTEM, -1); >> + } >> + } else { >> + alpm_list_t *onlyold = NULL; >> + alpm_list_t *onlynew = NULL; >> + alpm_list_t *olddirlist = NULL; >> + alpm_list_t *newdirlist = NULL; >> + >> + newdirlist = dirlist_from_tar(dbfilepath); >> + olddirlist = dirlist_from_fs(syncdbpath); > > dirlist_from_tar could return NULL. dirlist_from_fs could as well if you > error out on failing malloc (see above). > I assume just moving on after failing to read the archive isn't really > intended, since onlyold will contain all entries from olddirlist and > onlynew will be empty, this would lead to an empty db. > Hmm. I think that these two functions can return NULL also in a non-error case. The sync database in the filesystem could be empty. And the new sync database tarball could be empty too (actually we just patched repo-add to support that). But yeah I will probably change the signature of these functions to distinguish error and empty case. >> + >> + alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew); >> + >> + ret = remove_olddir(syncdbpath, onlyold); >> + if(ret == 0) { >> + checkdbdir(db); >> + ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0); >> + } >> + >> + alpm_list_free(olddirlist); >> + alpm_list_free(newdirlist); >> + FREELIST(onlyold); >> + FREELIST(onlynew); > > Shouldn't this be the other way round? onlyold and onlynew contain a > subset of the entries in olddirlist and newdirlist. > Yeah, that seems right too :P Thanks for your review ! I will send a new patch ... when I can :)

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-4-gda5fb3e
by dan＠archlinux.org 12 Oct '09

12 Oct '09

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 da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (commit) from 5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (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 da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 20:11:03 2009 +1000 Fix Greek short Y/N translation Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: po/el.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-67-g2cabe33
by dan＠archlinux.org 12 Oct '09

12 Oct '09

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 2cabe336eb33e443819a1d9d46b0c5bcceaa7e87 (commit) via e3ac8062626877b8cf87df5ce94f61394bf10c0f (commit) from c7d8601e125de432f185c146c84333ca7d920d9a (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 2cabe336eb33e443819a1d9d46b0c5bcceaa7e87 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Oct 8 16:10:05 2009 +0200 Introduce new PKGBUILD variable `changelog` Currently, a changelog is added to a package if a specific file with a hardcoded name exists in the PKGBUILD's directory. This approach is not pretty and also inconsistent with the handling of install files, but it works. With the introduction of split PKGBUILDs, however, a drawback in this old behavior has arisen: you only have the possibility to include one specific changelog file in either every package defined in the PKGBUILD or in none. The use of an additional variable, `changelog`, works around this issue and makes it possible to include a changelog in only some of the packages, and besides, each package of the PKGBUILD can have its own changelog file. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3ac8062626877b8cf87df5ce94f61394bf10c0f Author: solsTiCe d'Hiver <solstice.dhiver(a)gmail.com> Date: Sat Sep 26 19:30:32 2009 +0200 use bitwise shift operator in enum "bit field" This offers a cleaner way to deal with constant in enum and allow easy maintainance Signed-off-by: solsTiCe d'Hiver <solstice.dhiver(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 + PKGBUILD.proto | 1 + contrib/PKGBUILD.vim | 9 +++++++ doc/PKGBUILD.5.txt | 8 ++++++- lib/libalpm/alpm.h | 56 ++++++++++++++++++++++++------------------------ lib/libalpm/db.h | 12 +++++----- scripts/makepkg.sh.in | 25 ++++++++++++++------- 7 files changed, 70 insertions(+), 43 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-65-gc7d8601
by dan＠archlinux.org 12 Oct '09

12 Oct '09

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 c7d8601e125de432f185c146c84333ca7d920d9a (commit) via ab3c6f01f5c884233f718e7f7d5c32b2fdf4ff73 (commit) from 72bc947cbb8ba752f021f28ec9e9a85c354918e3 (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 c7d8601e125de432f185c146c84333ca7d920d9a Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 10:59:34 2009 +0200 Fix stderr redirection When redirecting both stderr and stdout and using the 2>&1 construct, you have to redirect stdout first. Otherwise stderr will be redirected to the 'old' stdout and not to the new resource. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab3c6f01f5c884233f718e7f7d5c32b2fdf4ff73 Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Sun Oct 11 15:52:12 2009 -0500 Remove makepath function from frontend Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/repo-add.sh.in | 2 +- src/pacman/util.c | 36 ------------------------------------ src/pacman/util.h | 1 - 3 files changed, 1 insertions(+), 38 deletions(-) hooks/post-receive -- The official pacman repository

3 2

[pacman-dev] [PATCH] Introduce new PKGBUILD variable `changelog`
by Cedric Staniewski 11 Oct '09

11 Oct '09

Hi, This patch adds a new PKGBUILD variable, changelog, which replaces the old, hardcoded ChangeLog file. The old behavior is completely removed, which means that existing ChangeLog files will be ignored if there is no appropriate line in the PKGBUILD. For a more detailed description, please see the patch below. I hope I also caught all the necessary documentation updates. Cedric >From d8e1bb73705a665bc03f14f4eb3ec0d8b9e6d259 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed, 16 Sep 2009 14:38:18 +0200 Subject: [PATCH] Introduce new PKGBUILD variable `changelog` Currently, a changelog is added to a package if a specific file with a hardcoded name exists in the PKGBUILD's directory. This approach is not pretty and also inconsistent with the handling of install files, but it works. With the introduction of split PKGBUILDs, however, a drawback in this old behavior has arisen: you only have the possibility to include one specific changelog file in either every package defined in the PKGBUILD or in none. The use of an additional variable, `changelog`, works around this issue and makes it possible to include a changelog in only some of the packages, and besides, each package of the PKGBUILD can have its own changelog file. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- PKGBUILD-split.proto | 2 ++ PKGBUILD.proto | 1 + contrib/PKGBUILD.vim | 9 +++++++++ doc/PKGBUILD.5.txt | 8 +++++++- scripts/makepkg.sh.in | 23 ++++++++++++++++------- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 08f98d6..11ceff2 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -21,6 +21,7 @@ replaces=() backup=() options=() install= +changelog= source=($pkgbase-$pkgver.tar.gz) noextract=() md5sums=() #generate with 'makepkg -g' @@ -44,6 +45,7 @@ package_pkg1() { backup=() options=() install= + changelog= cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg1 diff --git a/PKGBUILD.proto b/PKGBUILD.proto index eddcf75..93da0fc 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -21,6 +21,7 @@ replaces=() backup=() options=() install= +changelog= source=($pkgname-$pkgver.tar.gz) noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 994eacc..af0f981 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -115,6 +115,12 @@ syn match pbValidInstall /$[[:alnum:]]\|\$\|+\|-\|_$*\.install/ contained syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote +" changelog +syn keyword pb_k_changelog changelog contained +syn match pbValidChangelog /$[[:alnum:]]\|\$\|+\|-\|_$*/ contained +syn match pbIllegalChangelog /[^=]/ contained contains=pbValidChangelog +syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChangelog,pbIllegalChangelog,shDeref,shDoubleQuote,shSingleQuote + " source: " XXX remove source from shStatement, fix strange bug syn clear shStatement @@ -212,6 +218,9 @@ hi def link pb_k_provides pbKeywords hi def link pbIllegalInstall Error hi def link pb_k_install pbKeywords +hi def link pbIllegalChangelog Error +hi def link pb_k_changelog pbKeywords + hi def link pb_k_source pbKeywords hi def link pbIllegalSource Error diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e6f6edf..435a148 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -79,6 +79,12 @@ similar to `$_basekernver`. be copied into the package by makepkg. It does not need to be included in the source array (e.g. `install=pkgname.install`). +*changelog*:: + Specifies a changelog file which is supposed to be included in the package. + It is required that this file is placed into the same directory as the + PKGBUILD, and makepkg will copy it into the package. The file must not be + included in the source array (e.g. `changelog=$pkgname.changelog`). + *source (array)*:: An array of source files required to build the package. Source files must either reside in the same directory as the PKGBUILD file, or be a @@ -271,7 +277,7 @@ All options and directives for the split packages default to the global values g within the PKGBUILD. However, some of these can be overridden within each split package's packaging function. The following variables can be overridden: `pkgdesc`, `license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, -`backup`, `options` and `install`. +`backup`, `options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2941a5d..88487da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -47,7 +47,7 @@ pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgdesc' 'license' 'groups' 'depends' 'optdepends' 'provides' \ - 'conflicts' 'replaces' 'backup' 'options' 'install') + 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options @@ -991,9 +991,9 @@ create_package() { fi # do we have a changelog? - if [ -f "$startdir/ChangeLog" ]; then + if [ -n "$changelog" ]; then msg2 "$(gettext "Adding package changelog...")" - cp "$startdir/ChangeLog" .CHANGELOG + cp "$startdir/$changelog" .CHANGELOG comp_files="$comp_files .CHANGELOG" fi @@ -1059,9 +1059,13 @@ create_srcpackage() { fi fi - if [ -f ChangeLog ]; then - msg2 "$(gettext "Adding %s...")" "ChangeLog" - ln -s "${startdir}/ChangeLog" "${srclinks}/${pkgbase}" + if [ -n "$changelog" ]; then + if [ -f "$changelog" ]; then + msg2 "$(gettext "Adding package changelog...")" + ln -s "${startdir}/$changelog" "${srclinks}/${pkgbase}/" + else + error "$(gettext "Changelog file %s not found.")" "$changelog" + fi fi local netfile @@ -1193,6 +1197,11 @@ check_sanity() { return 1 fi + if [ -n "$changelog" -a ! -f "$changelog" ]; then + error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" + return 1 + fi + local valid_options=1 local opt known kopt for opt in ${options[@]}; do @@ -1646,7 +1655,7 @@ if [ "$ASROOT" -eq 0 \ fi unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides -unset md5sums replaces depends conflicts backup source install build +unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} -- 1.6.4.4

6 11

[pacman-dev] Fwd: Feature Request
by Dan McGee 11 Oct '09

11 Oct '09

Something really old that I found today while cleaning email...not sure if you can pull anything useful out of this, Allan. The from address bounces which is why I'm forwarding this here rather than asking him to write directly. -Dan ---------- Forwarded message ---------- From: Archaic <archaic(a)kconline.com> Date: Sat, Feb 7, 2009 at 8:49 PM Subject: Re: Feature Request To: dan(a)archlinux.org Okay, I think I've managed to integrate this feature request with the minimal fuss and full backwards compatability. To give a run down, the new features will allow for a build(), check(), and inst() section in the PKGBUILD, however, if either check() or inst() are missing, they will be skipped over. Also, check() will never even be attempted unless the 'check' option appears in the PKGBUILD or makepkg.conf. There are 2 other changes that *can* be made to any give PKGBUILD merely as a result of making the above changes: 1) You no longer need to cd "$srcdir/pkgname-pkgver" in the PKGBUILD. The non-standard paths are still viable like ${srcdir}/tcl${pkgver}/unix if so needed. 2) You don't need excess || return 1 statements as in: ./configure make || return 1 make install Provided you use a separate build(), check(), and inst() function, the makepkg code itself will handle the errors. Let me know what you think of these changes. -- Archaic My other computer is an abacus.

1 0

[pacman-dev] [PATCH] FS#8798 - Allow -Qo to perform a functional 'which'
by Jatheendra 11 Oct '09

11 Oct '09

Hi all, This is a simple patch to add a "which" like functionality to pacman -Qo[Bug FS#8798]. This is my first patch ,so any constructive criticism is most welcome. Thanks, Shankar --- src/pacman/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..fb3bb92 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -55,6 +55,43 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip trailing '/' */ + while (path[len-1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname,bufptr) == 0) { + strncpy(filename,fullname,PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -66,21 +103,35 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename,alpm_list_getdata(t),PATH_MAX+1); + char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename,'/') == NULL) { + if((search_path(filename,&buf)) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } + if(S_ISDIR(buf.st_mode)) { pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine ownership of a directory\n")); @@ -140,6 +191,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.0.2

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-63-g72bc947
by dan＠archlinux.org 11 Oct '09

11 Oct '09

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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 (commit) via 3dc87851cc5990d358cf985d8e79dffeb2d91a21 (commit) via 14ab02e289668e30d33c473e00fc43e5dc457644 (commit) via 471b1fa54395f7f16939e213f50aaf76f390553b (commit) via caea098c2191a2d94a28e90bfef958c34473a5a4 (commit) via 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d (commit) via 302310c5aad5ae25a1e712ca6f9de6bef73e17de (commit) via 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f (commit) via 6e312220ec6668d6fc9ef37dbf581ca155511697 (commit) via 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 (commit) via 145103aacc57d35579315bfbf7c5607c590af194 (commit) via 35dc9b03149dc2f42022fe5fea80a3aed3207489 (commit) from cf0d619670a4d0c67ad67e22bacbb69c203714f5 (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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Sep 12 20:50:03 2009 +0200 Fix "-Sd conflict_pkg" bug If the -d switch was invoked with -S (or -U), the removes list was simply lost, because trans->remove was computed in an "if(!(trans->flags & PM_TRANS_FLAG_NODEPS))" block. I've added a new pactest file, sync045.py (derived from sync043.py) to test this. Additionally, I did some other minor cleanups in sync_prepare: * preferred list is not needed anymore * I removed a needless alpm_list_remove_dupes line (the target list should not contain dupes at all) * I moved alpm_list_free(remove); to cleanup part to eliminate a possible memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3dc87851cc5990d358cf985d8e79dffeb2d91a21 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Oct 11 02:38:33 2009 +0200 alpm_list : add new alpm_list_diff_sorted function This is more efficient than alpm_list_diff since it assumes the two lists are sorted. And also we get the two sides of the diff. Even sorting should more efficient than the current list_diff. Sorting the two lists should be O(n*log(n)+m*log(m)) while the current list_diff is O(n*m). So I also reimplemented list_diff using list_diff_sorted. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14ab02e289668e30d33c473e00fc43e5dc457644 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 22:49:24 2009 +0200 Rework the alpm_unpack functions Add support to extract a list of entries Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 471b1fa54395f7f16939e213f50aaf76f390553b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 23:56:15 2009 +0200 update sync200 pactest update download -> fetch This just meant that we used XferCommand even if internal download was available, no big deal. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit caea098c2191a2d94a28e90bfef958c34473a5a4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Sep 26 00:58:42 2009 +0200 cygwin fix : use unsigned char for ctype function See http://www.nabble.com/-PATCH-RFA--Distinguish-between-EOF-and-character-wit… cygwin 1.7 actually displays a warning when using signed char with the ctype function, so that compilation fails when using -Wall -Werror. So we just cast all arguments to unsigned char. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 9 20:27:40 2009 +0200 replace rankmirrors by bash clone This removes python optdepends in pacman package This bash clone is a courtesy of Matthew Bruenig <matthewbruenig(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 302310c5aad5ae25a1e712ca6f9de6bef73e17de Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:19:55 2009 -0500 Minor scope/typing cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:15:27 2009 -0500 libalpm: clean up lock function We were doing a lot of manual work; leverage the standard library a bit to do more for us. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e312220ec6668d6fc9ef37dbf581ca155511697 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:09:39 2009 -0500 Reduce calls to list_count() in removing package We don't need to count the number of packages left once per file when removing; we only need to do it once per package. Also move a variable into the correct scope. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:04:28 2009 -0500 Add missing get_usedelta() method Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 145103aacc57d35579315bfbf7c5607c590af194 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:02:20 2009 -0500 typing: a few more fixes for special int types Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35dc9b03149dc2f42022fe5fea80a3aed3207489 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 13:51:47 2009 -0500 int typing: s/unsigned short/int/ in libalpm After our recent screwup with size_t and ssize_t in the download code, I found the `-Wsign-conversion` flag to GCC to see if we were doing anything else boneheaded. I didn't find anything quite as bad, but we did have some goofups- most of our public unsigned methods would return -1 on error, which is a bit odd in an unsigned context. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 15 ++- lib/libalpm/alpm_list.c | 85 ++++++++++--- lib/libalpm/alpm_list.h | 2 + lib/libalpm/backup.c | 8 +- lib/libalpm/be_files.c | 6 +- lib/libalpm/be_package.c | 7 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 6 +- lib/libalpm/dload.c | 8 +- lib/libalpm/handle.c | 15 ++- lib/libalpm/handle.h | 4 +- lib/libalpm/package.c | 4 +- lib/libalpm/package.h | 4 +- lib/libalpm/remove.c | 8 +- lib/libalpm/sync.c | 27 ++--- lib/libalpm/trans.c | 6 +- lib/libalpm/util.c | 75 ++++++++---- lib/libalpm/util.h | 7 +- pactest/tests/{sync043.py => sync045.py} | 4 +- pactest/tests/sync200.py.in | 2 +- scripts/Makefile.am | 4 +- scripts/rankmirrors.py.in | 191 ---------------------------- scripts/rankmirrors.sh.in | 202 ++++++++++++++++++++++++++++++ src/pacman/pacman.c | 4 +- src/pacman/util.c | 10 +- 26 files changed, 404 insertions(+), 304 deletions(-) copy pactest/tests/{sync043.py => sync045.py} (87%) delete mode 100644 scripts/rankmirrors.py.in create mode 100644 scripts/rankmirrors.sh.in hooks/post-receive -- The official pacman repository

1 0