- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/6] VCS versioning modifications
by dgbaley27＠0x01b.net 13 Mar '12

13 Mar '12

From: Matthew Monaco <matthew.monaco(a)0x01b.net> I've been bothered by makepkg automatically adjusting pkgver if a package doesn't have the correct -git/svn/etc suffix. The first 4 patches might be useful regardless. They allow for multiple sets of _vcs variables in a PKGBUILD and use the package's name to clear up any ambiguity. The 5th patch changes the current semantics of makepkg. The 6th patch provides a new option to force the old semantics. An alternative might be to sanitize the --forcever option so that it may be used from the command line as well as internally. Matthew Monaco (6): makepkg: remove unused variable makepkg: devel_check(): determine vcs makepkg: devel_check(): consolidate common code makepkg: devel_check(): set newpkgver (cleanup) makepkg: devel_check(): only work for -vcs pkgnames makepkg: add --devver option for SCM packages doc/PKGBUILD.5.txt | 3 +- doc/makepkg.8.txt | 4 ++ scripts/makepkg.sh.in | 126 +++++++++++++++++++++++++++---------------------- 3 files changed, 75 insertions(+), 58 deletions(-) -- 1.7.9.3

5 22

[pacman-dev] [PATCH v3 0/5] development package cleanups
by Matthew Monaco 13 Mar '12

13 Mar '12

From: Matthew Monaco <matthew.monaco(a)0x01b.net> Some cleanup in the devel_check() function. The semantics aren't really changed here. Guard against the potential to specify multiple groups of development directives. Matthew Monaco (5): makepkg: remove unused variable makepkg: devel_check(): determine vcs makepkg: devel_check(): consolidate common code makepkg: devel_check(): set newpkgver (cleanup) makepkg: devel_check(): cleanup for hg version scripts/makepkg.sh.in | 117 +++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 58 deletions(-) -- 1.7.9.3

2 6

[pacman-dev] [PATCH 0/6] fix some safety issues in makepkg
by Allan McRae 12 Mar '12

12 Mar '12

With the upcoming makepkg-lobotomy (removing the error trap apart from in the actual packaging steps), we need to add some more error checking and be as safe as possible when potentially dealing with strange variable contents. Some of these are a bit unnecessary (e.g. using printf to output variables that almost certainly cannot start with a "-n"), but there is no harm in applying them globally. Allan McRae (6): makepkg: the rhs in string comparisons should be quoted makepkg: use printf rather than echo to output variable makepkg: prevent issues with files starting with a hyphen makepkg: abort when failing to create BUILDDIR makepkg: quote removed filename as it can have spaces makepkg: safely change directories scripts/makepkg.sh.in | 147 ++++++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 68 deletions(-) -- 1.7.9.3

4 19

[pacman-dev] [PATCH 1/2] makepkg: fix extraction of soname in find_libdepends
by Florian Pritz 10 Mar '12

10 Mar '12

libperl.so results in soname="libperl.so.so" which is wrong. This returns the correct string: "libperl.so" Fix-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This should be applied to both master and maint. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6e7a556..9301730 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1071,7 +1071,7 @@ find_libdepends() { for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p') do # extract the library name: libfoo.so - soname="${sofile%%\.so\.*}.so" + soname="${sofile%.so?(+(.+([0-9])))}".so # extract the major version: 1 soversion="${sofile##*\.so\.}" if in_array "${soname}" ${depends[@]}; then -- 1.7.9.2

2 3

[pacman-dev] [PATCH v2] Skip special files when cleaning package cache
by Allan McRae 10 Mar '12

10 Mar '12

Ignore *.sig, *.db*, and *.src.tar* when cleaning the package cache. Fixes FS#25166. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Why didn't I know about fnmatch before... so much easier than the regex stuff I was doing before! src/pacman/sync.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e69ca58..1df2a6f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -26,6 +26,7 @@ #include <errno.h> #include <dirent.h> #include <sys/stat.h> +#include <fnmatch.h> #include <alpm.h> #include <alpm_list.h> @@ -222,6 +223,23 @@ static int sync_cleancache(int level) if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { continue; } + + /* skip signature files - they are removed with their package file */ + if(fnmatch("*.sig", ent->d_name, 0) == 0) { + continue; + } + + /* skip package database within the cache directory */ + if(fnmatch("*.db*", ent->d_name, 0) == 0) { + continue; + } + + /* skip source packages withing the cache directory */ + if(fnmatch("*.src.tar*", ent->d_name, 0) == 0) { + continue; + } + + /* build the full filepath */ snprintf(path, PATH_MAX, "%s%s", cachedir, ent->d_name); -- 1.7.9.3

1 0

[pacman-dev] [PATCH] Extract a write_deps function from local database writing
by Dan McGee 09 Mar '12

09 Mar '12

This reduces a lot of code duplication in the write function, which cleans it up a bit. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 67 ++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 16c794e..7cce022 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -749,6 +749,22 @@ int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info) return retval; } +void write_deps(FILE *fp, const char *header, alpm_list_t *deplist) +{ + alpm_list_t *lp; + if(!deplist) { + return; + } + fputs(header, fp); + fputc('\n', fp); + for(lp = deplist; lp; lp = lp->next) { + char *depstring = alpm_dep_compute_string(lp->data); + fprintf(fp, "%s\n", depstring); + free(depstring); + } + fputc('\n', fp); +} + int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq) { FILE *fp = NULL; @@ -790,15 +806,6 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq } fprintf(fp, "\n"); } - if(info->replaces) { - fputs("%REPLACES%\n", fp); - for(lp = info->replaces; lp; lp = lp->next) { - char *depstring = alpm_dep_compute_string(lp->data); - fprintf(fp, "%s\n", depstring); - free(depstring); - } - fprintf(fp, "\n"); - } if(info->url) { fprintf(fp, "%%URL%%\n" "%s\n\n", info->url); @@ -851,42 +858,12 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq } fprintf(fp, "\n"); } - if(info->depends) { - fputs("%DEPENDS%\n", fp); - for(lp = info->depends; lp; lp = lp->next) { - char *depstring = alpm_dep_compute_string(lp->data); - fprintf(fp, "%s\n", depstring); - free(depstring); - } - fprintf(fp, "\n"); - } - if(info->optdepends) { - fputs("%OPTDEPENDS%\n", fp); - for(lp = info->optdepends; lp; lp = lp->next) { - char *optstring = alpm_dep_compute_string(lp->data); - fprintf(fp, "%s\n", optstring); - free(optstring); - } - fprintf(fp, "\n"); - } - if(info->conflicts) { - fputs("%CONFLICTS%\n", fp); - for(lp = info->conflicts; lp; lp = lp->next) { - char *depstring = alpm_dep_compute_string(lp->data); - fprintf(fp, "%s\n", depstring); - free(depstring); - } - fprintf(fp, "\n"); - } - if(info->provides) { - fputs("%PROVIDES%\n", fp); - for(lp = info->provides; lp; lp = lp->next) { - char *depstring = alpm_dep_compute_string(lp->data); - fprintf(fp, "%s\n", depstring); - free(depstring); - } - fprintf(fp, "\n"); - } + + write_deps(fp, "%REPLACES%", info->replaces); + write_deps(fp, "%DEPENDS%", info->depends); + write_deps(fp, "%OPTDEPENDS%", info->optdepends); + write_deps(fp, "%CONFLICTS%", info->conflicts); + write_deps(fp, "%PROVIDES%", info->provides); fclose(fp); fp = NULL; -- 1.7.9.3

3 3

[pacman-dev] [PATCH] Remove unnecessary path check from local database
by Dan McGee 09 Mar '12

09 Mar '12

This removes a call to _alpm_local_db_pkgpath() as well as an access() call when reading the local database. This appears to be code from 2006 that has stuck around. We don't need it because: 1) We never use this path except to check it via access(); however, we are already in a readdir() loop so it exists, or at least did at the time of the call. 2) The fopen() and other calls will fail on accessing the database files anyway, and we need to check those for errors. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 51721d1..16c794e 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -405,7 +405,7 @@ static int local_db_populate(alpm_db_t *db) rewinddir(dbdir); } if(est_count >= 2) { - /* subtract the two extra pointers to get # of children */ + /* subtract the '.' and '..' pointers to get # of children */ est_count -= 2; } @@ -526,7 +526,6 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) { FILE *fp = NULL; char line[1024]; - char *pkgpath; alpm_db_t *db = info->origin_data.db; /* bitmask logic here: @@ -545,18 +544,10 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) return -1; } - _alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", + _alpm_log(db->handle, ALPM_LOG_FUNCTION, + "loading package data for %s : level=0x%x\n", info->name, inforeq); - pkgpath = _alpm_local_db_pkgpath(db, info, NULL); - if(!pkgpath || access(pkgpath, F_OK)) { - /* directory doesn't exist or can't be opened */ - _alpm_log(db->handle, ALPM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n", - info->name, info->version, db->treename); - goto error; - } - free(pkgpath); - /* clear out 'line', to be certain - and to make valgrind happy */ memset(line, 0, sizeof(line)); -- 1.7.9.3

1 0

[pacman-dev] [PATCH] Skip special files when cleaning package cache
by Allan McRae 09 Mar '12

09 Mar '12

Ignore .sig, *.db*, and *.src.tar* when cleaning the package cache. Fixes FS#25166. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am bad at regex... so I am sure some of these could be tightened up. src/pacman/sync.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e69ca58..c617e0b 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -26,6 +26,7 @@ #include <errno.h> #include <dirent.h> #include <sys/stat.h> +#include <regex.h> #include <alpm.h> #include <alpm_list.h> @@ -170,6 +171,7 @@ static int sync_cleancache(int level) alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); int ret = 0; + regex_t sigreg, dbreg, srcpkgreg; for(i = cachedirs; i; i = alpm_list_next(i)) { printf(_("Cache directory: %s\n"), (const char *)i->data); @@ -199,6 +201,10 @@ static int sync_cleancache(int level) printf(_("removing all files from cache...\n")); } + regcomp(&sigreg, "\\.sig$", REG_EXTENDED | REG_NEWLINE); + regcomp(&dbreg, "\\.db(\\.tar[^[:space:]]*)?$", REG_EXTENDED | REG_NEWLINE); + regcomp(&srcpkgreg, "\\.src\\.tar", REG_EXTENDED | REG_NEWLINE); + for(i = cachedirs; i; i = alpm_list_next(i)) { const char *cachedir = i->data; DIR *dir = opendir(cachedir); @@ -222,6 +228,22 @@ static int sync_cleancache(int level) if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { continue; } + + /* skip signature files - they are removed with their package file */ + if(regexec(&sigreg, ent->d_name, 0, 0, 0) == 0) { + continue; + } + + /* skip package database within the cache directory */ + if(regexec(&dbreg, ent->d_name, 0, 0, 0) == 0) { + continue; + } + + /* skip source packages withing the cache directory */ + if(regexec(&srcpkgreg, ent->d_name, 0, 0, 0) == 0) { + continue; + } + /* build the full filepath */ snprintf(path, PATH_MAX, "%s%s", cachedir, ent->d_name); -- 1.7.9.3

3 2

[pacman-dev] [PATCH] makepkg: deal with overriden package arch properly
by Allan McRae 09 Mar '12

09 Mar '12

This fixes a lot of checks done by makepkg (e.g. to see if a package is already built and choosing which package to install). Previously, if a package had both "i686" and "any" versions, the "i686" one always took precidence regardless of the value of "arch" in the PKGBUILD for that package. Fixes FS#27204. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f21c638..8abd69c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -168,7 +168,7 @@ clean_up() { # clean up dangling symlinks to packages for pkg in ${pkgname[@]}; do - for file in ${pkg}-*-*-${CARCH}{${PKGEXT},${SRCEXT}}; do + for file in ${pkg}-*-*-*{${PKGEXT},${SRCEXT}}; do if [[ -h $file && ! -e $file ]]; then rm -f "$file" fi @@ -261,6 +261,28 @@ get_full_version() { } ## +# usage : get_pkg_arch( [$pkgname] ) +# return : architecture of the package +## +get_pkg_arch() { + if [[ -z $1 ]]; then + if [[ $arch = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + else + local arch_override + eval $(declare -f package_$1 | sed -n 's/$^[[:space:]]*arch=$/arch_override=/p') + if [[ $arch_override = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + fi +} + +## # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # @@ -1180,7 +1202,7 @@ write_pkginfo() { printf "builddate = %s\n" "$builddate" printf "packager = %s\n" "$packager" printf "size = %s\n" "$size" - printf "arch = %s\n" "$PKGARCH" + printf "arch = %s\n" "$pkgarch" [[ $license ]] && printf "license = %s\n" "${license[@]}" [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" @@ -1266,11 +1288,7 @@ create_package() { nameofpkg="$1" fi - if [[ $arch = "any" ]]; then - PKGARCH="any" - else - PKGARCH=$CARCH - fi + pkgarch=$(get_pkg_arch) write_pkginfo $nameofpkg > .PKGINFO @@ -1292,7 +1310,7 @@ create_package() { msg2 "$(gettext "Compressing package...")" local fullver=$(get_full_version) - local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 [[ -f $pkg_file ]] && rm -f "$pkg_file" @@ -1446,12 +1464,9 @@ install_package() { local fullver pkg pkglist for pkg in ${pkgname[@]}; do - fullver=$(get_full_version $pkg) - if [[ -f $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT} ]]; then - pkglist+=" $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT}" - else - pkglist+=" $PKGDEST/${pkg}-${fullver}-any${PKGEXT}" - fi + local fullver=$(get_full_version $pkg) + local pkgarch=$(get_pkg_arch $pkg) + pkglist+=" $PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}" done if ! run_pacman -U $pkglist; then @@ -2239,8 +2254,8 @@ fi if (( ! SPLITPKG )); then fullver=$(get_full_version) - if [[ -f $PKGDEST/${pkgname}-${fullver}-${CARCH}${PKGEXT} \ - || -f $PKGDEST/${pkgname}-${fullver}-any${PKGEXT} ]] \ + pkgarch=$(get_pkg_arch) + if [[ -f $PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT} ]] \ && ! (( FORCE || SOURCEONLY || NOBUILD )); then if (( INSTALL )); then warning "$(gettext "A package has already been built, installing existing package...")" @@ -2256,8 +2271,8 @@ else somepkgbuilt=0 for pkg in ${pkgname[@]}; do fullver=$(get_full_version $pkg) - if [[ -f $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT} \ - || -f $PKGDEST/${pkg}-${fullver}-any${PKGEXT} ]]; then + pkgarch=$(get_pkg_arch $pkg) + if [[ -f $PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT} ]]; then somepkgbuilt=1 else allpkgbuilt=0 -- 1.7.9.3

1 0

[pacman-dev] [PATCH] makepkg: append pkgbase to BUILDDIR if specified
by Allan McRae 09 Mar '12

09 Mar '12

This means multiple packages can be build using the same BUILDDIR without their source files all ending up extracted in the same directory. Fixes FS#28417. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 89cd118..8763ffb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2061,8 +2061,6 @@ if [[ ! -w $BUILDDIR ]]; then plain "$(gettext "Aborting...")" exit 1 fi -srcdir="$BUILDDIR/src" -pkgdir="$BUILDDIR/pkg" PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined @@ -2159,6 +2157,14 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} epoch=${epoch:-0} +if [[ $BUILDDIR = "$startdir" ]]; then + srcdir="$BUILDDIR/src" + pkgdir="$BUILDDIR/pkg" +else + srcdir="$BUILDDIR/$pkgbase/src" + pkgdir="$BUILDDIR/$pkgbase/pkg" +fi + if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" -- 1.7.9.3

1 0