- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.2-169-g8de0631
by dan＠archlinux.org 09 Mar '12

09 Mar '12

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 8de0631edbd1fd7681f6a924f5e166621328c13f (commit) via 1a8c3e52d70bfa21ba108aa77179adf90401949d (commit) via f34864cc9e4e755f2add7581419f4ec1c2525fe0 (commit) via 4773c6b66ef618f4c6345a99d9c246045e9c723b (commit) via 5c404268d965d9ca012e4819ac0c2f289a4c768c (commit) via bc311a24ce536fbf30cc2356a62b08a6c0938ea9 (commit) via 8d26df5ee53d9fb4d2c7be97b7f099e3e8402186 (commit) via 708a227578a8d27bb84dd150fec9c2ebc1afd117 (commit) via 82abe079ab67bb39c6276105449a2d553bf31660 (commit) via 09a93b2e0e8d603328c484a92cad90a1558c6f89 (commit) via e85e77e6f9f0979a16d69cd93ee6ea35583e9bfb (commit) via 00f29cbc14ec24f1e432eadaf35742857285a01a (commit) via 6a636b2b6ec92046b010b7a4a593d3aabe253ef8 (commit) via 1fe6cabc4d3868510427e32b60c9aa869886acab (commit) via 4ffa0401d22347332d663f1d400e182d5a181ea2 (commit) via cb64fbeac41308ee8c46384a126195a1fd75a361 (commit) via ea7fc8962a819a04237876995140363a818202d4 (commit) via fbfcd8665086f71b65370e919105194111b4b5f1 (commit) via 986e99a613605985f64f0e3e4c2635717931f77d (commit) via 4b384b7f0b0e840e09e3bffd2dbb59b88bdd4864 (commit) via d1151b5ab9c407732ded462a0fe0259dea8dcc2a (commit) from 687f7b6ba833db836d8d8387c5b728238b0eac5d (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 8de0631edbd1fd7681f6a924f5e166621328c13f Merge: f34864c 1a8c3e5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 8 18:08:15 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/be_package.c commit f34864cc9e4e755f2add7581419f4ec1c2525fe0 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 20 15:02:38 2012 +1000 Simplify package validation info output for sync packages Unify the output for local and sync packages by only printing a list of possible validation types for sync packages. This also has the advantage of not printing the very long sha256 checksum which line wrapped on a standard width terminal. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4773c6b66ef618f4c6345a99d9c246045e9c723b Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 20 14:24:35 2012 +1000 Remove _alpm_csum The enum alpm_pkgvalidation_t is essentially a more generic version of _alpm_csum, so use it instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c404268d965d9ca012e4819ac0c2f289a4c768c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 18 16:31:37 2012 +1000 Add information on how an installed package was validated When installing a package, store information on which validation method was used and output this on "pacman -Qi" operations. e.g. Validated By : SHA256 Sum Possible values are Unknown, None, MD5 Sum, SHA256 Sum, Signature. Dan: just a few very minor tweaks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bc311a24ce536fbf30cc2356a62b08a6c0938ea9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Feb 29 21:56:40 2012 -0500 makepkg: use array instead of string Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8d26df5ee53d9fb4d2c7be97b7f099e3e8402186 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Feb 29 21:55:44 2012 -0500 makepkg: avoid use of eval in run_pacman Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 708a227578a8d27bb84dd150fec9c2ebc1afd117 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Feb 15 00:01:45 2012 -0500 makepkg: enforce decimal format for pkgrel Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 82abe079ab67bb39c6276105449a2d553bf31660 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 25 15:57:29 2012 +1000 Point python shebangs at python2 Python PEP-394 states that all python code should point at the python2 or python3 symlinks at maintain cross-distro compatibility. Note that this does not matter when calling these scripts using "make check" as they are explictly called using the detected python version. As this only affects manually calling these scripts, I have not had configure/make replace the shebangs. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 09a93b2e0e8d603328c484a92cad90a1558c6f89 Author: Christian Hesse <mail(a)earthworm.de> Date: Sat Feb 11 19:48:59 2012 +1000 makepkg: allow specifying compression options Adds the ability to override the commands used to compressing compiled and source packages. This is useful for those wanting to use alternative implementations of the compression tools or non-default compression options. Allan: documented options in man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e85e77e6f9f0979a16d69cd93ee6ea35583e9bfb Author: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Date: Mon Jul 18 01:54:06 2011 +0200 Hook new optdepend structures up No new behaviour introduced, everything should work exactly as before. Dan: refactored to use the single alpm_depend_t structure. Signed-off-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 00f29cbc14ec24f1e432eadaf35742857285a01a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 13:34:48 2011 -0600 Allow alpm_depend_t to have a description This is the first step in parsing and handling optdepends. There is no behavior change introduced in this commit; however, depends that contain a ": " string will now be parsed as having a description and it will be stored in the depend structure. Later patches will utilize this new field as appropriate. This is heavily based on the work of Benedikt, who did something similar but introduced a new type for this rather than only a new field to the existing type. Heavily-influenced-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a636b2b6ec92046b010b7a4a593d3aabe253ef8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Mar 3 13:02:25 2012 -0600 pacman-optimize: standardize on openssl usage, only touch local/ The rest of our scripts have been using `openssl dgst` rather than tools like `md5sum` for some time, so convert this one too. We also make the following other adjustments: * Use a `find -print0 | xargs -0` pipeline so paths with spaces and or newlines don't totally kill us. * Ensure the files we write out contain only paths relative to the database root, where we know the filenames should all be sane. * Remove use of `diff`, this was the only time we used it in scripts and we can get a cheap substitute by comparing file checksums instead. * Only touch the local/ part of the database. It makes little sense to do anything to the sync/ directory anymore as they are compressed single files that should be regularly written out in full and won't be fragmented on any sane filesystem. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +- doc/makepkg.conf.5.txt | 4 + doc/pacman-key.8.txt | 5 - etc/makepkg.conf.in | 10 ++ lib/libalpm/alpm.h | 18 ++++- lib/libalpm/be_local.c | 49 +++++++++++- lib/libalpm/be_package.c | 64 ++++++++++---- lib/libalpm/be_sync.c | 26 ++++++- lib/libalpm/deps.c | 44 +++++++--- lib/libalpm/package.c | 15 +++- lib/libalpm/package.h | 4 +- lib/libalpm/po/it.po | 76 +++++++++-------- lib/libalpm/sync.c | 10 ++- lib/libalpm/util.c | 6 +- lib/libalpm/util.h | 7 +-- scripts/makepkg.sh.in | 46 ++++++----- scripts/pacman-key.sh.in | 39 --------- scripts/pacman-optimize.sh.in | 45 +++++----- scripts/po/it.po | 185 +++++++++++++++++++---------------------- scripts/po/sk.po | 10 +- scripts/po/uk.po | 23 +++-- scripts/repo-add.sh.in | 6 +- src/pacman/package.c | 48 +++++++++-- src/pacman/po/de.po | 42 +++++----- src/pacman/po/en_GB.po | 41 ++++++---- src/pacman/po/fi.po | 18 ++-- src/pacman/po/fr.po | 45 +++++----- src/pacman/po/it.po | 127 ++++++++++++++++------------- src/pacman/po/lt.po | 171 +++++++++++++++++++------------------- src/pacman/po/pacman.pot | 22 ++--- src/pacman/po/pt_BR.po | 62 +++++++------- src/pacman/po/uk.po | 41 +++++----- src/pacman/sync.c | 71 ++++++++++------ src/pacman/util.c | 79 +++++++++++++++--- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/util.py | 2 +- 42 files changed, 858 insertions(+), 623 deletions(-) hooks/post-receive -- The official pacman repository

1 0