- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] stripping binaries in makepkg
by Sven-Hendrik Haase 27 Sep '10

27 Sep '10

I'd also like an answer to this. Why not do away with the individual directories? Locating the binaries even in a fairly large package will be fairly quick in any case. -- Sven-Hendrik

5 8

[pacman-dev] [PATCH 03/10] Add FORTIFY_SOURCE support
by Allan McRae 27 Sep '10

27 Sep '10

Adds a check for the minimum mainline GCC version for FORTIFY_SOURCE support and enables -D_FORTIFY_SOURCE=2 by default when building with --enable-debug. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- acinclude.m4 | 23 +++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1524a3d..80b0ba0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4910,6 +4910,29 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ fi ]) +dnl GCC_FORTIFY_SOURCE_CC +dnl checks -D_FORTIFY_SOURCE with the C compiler, if it exists then updates +dnl CFLAGS +AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_MSG_CHECKING(for FORTIFY_SOURCE support) + AC_TRY_COMPILE([#include <features.h>], [ + int main() { + #if !(__GNUC_PREREQ (4, 1) ) + #error No FORTIFY_SOURCE support + #endif + return 0; + } + ], [ + AC_MSG_RESULT(yes) + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + ], [ + AC_MSG_RESULT(no) + ]) + fi +]) + dnl GCC_VISIBILITY_CC dnl checks -fvisibility=internal with the C compiler, if it exists then dnl defines ENABLE_VISIBILITY_CC in both configure script and Makefiles diff --git a/configure.ac b/configure.ac index b4570f5..76e36c8 100644 --- a/configure.ac +++ b/configure.ac @@ -316,6 +316,7 @@ if test "x$debug" = "xyes" ; then # Check for -fstack-protector availability GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_CC + GCC_FORTIFY_SOURCE_CC CFLAGS="$CFLAGS -g -Wall -Werror" else AC_MSG_RESULT(no) -- 1.7.3

1 0

[pacman-dev] [PATCH 02/10] Add wrapper around asprintf calls
by Allan McRae 27 Sep '10

27 Sep '10

Not checking the return value of asprintf calls reuslts in a warning when using -D_FORTIRFY_SOURCE=2. This adds a simple wrapper around asprintf calls which checks the return value. Currently the check does nothing more than outputing a message to stderr on failure, but that is at least an improvement over silent failures. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 38 +++++++++++++++++++++++++++----------- src/pacman/util.h | 1 + 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index b0824cf..5b4b2e8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -531,10 +531,10 @@ void display_targets(const alpm_list_t *pkgs, int install) double mbsize = 0.0; mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), + pm_asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), mbsize); } else { - asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } targets = alpm_list_add(targets, str); @@ -545,7 +545,7 @@ void display_targets(const alpm_list_t *pkgs, int install) mbisize = isize / (1024.0 * 1024.0); if(install) { - asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); + pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); list_display(str, targets); free(str); printf("\n"); @@ -555,7 +555,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Installed Size: %.2f MB\n"), mbisize); } } else { - asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); + pm_asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); free(str); printf("\n"); @@ -589,14 +589,14 @@ static char *pkg_get_location(pmpkg_t *pkg) dburl = alpm_db_get_url(db); if(dburl) { char *pkgurl = NULL; - asprintf(&pkgurl, "%s/%s", dburl, alpm_pkg_get_filename(pkg)); + pm_asprintf(&pkgurl, "%s/%s", dburl, alpm_pkg_get_filename(pkg)); return(pkgurl); } case PM_OP_UPGRADE: return(strdup(alpm_pkg_get_filename(pkg))); default: string = NULL; - asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + pm_asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); return(string); } } @@ -647,7 +647,7 @@ void print_packages(const alpm_list_t *packages) char *size; double mbsize = 0.0; mbsize = pkg_get_size(pkg) / (1024.0 * 1024.0); - asprintf(&size, "%.2f", mbsize); + pm_asprintf(&size, "%.2f", mbsize); string = strreplace(temp, "%s", size); free(size); free(temp); @@ -777,6 +777,22 @@ int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) return(ret); } +int pm_asprintf(char **string, const char *format, ...) +{ + int ret = 0; + va_list args; + + /* print the message using va_arg list */ + va_start(args, format); + if(vasprintf(string, format, args) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to allocate string\n")); + ret = -1; + } + va_end(args); + + return(ret); +} + int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args) { int ret = 0; @@ -793,16 +809,16 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list /* print a prefix to the message */ switch(level) { case PM_LOG_DEBUG: - asprintf(string, "debug: %s", msg); + pm_asprintf(string, "debug: %s", msg); break; case PM_LOG_ERROR: - asprintf(string, _("error: %s"), msg); + pm_asprintf(string, _("error: %s"), msg); break; case PM_LOG_WARNING: - asprintf(string, _("warning: %s"), msg); + pm_asprintf(string, _("warning: %s"), msg); break; case PM_LOG_FUNCTION: - asprintf(string, _("function: %s"), msg); + pm_asprintf(string, _("function: %s"), msg); break; default: break; diff --git a/src/pacman/util.h b/src/pacman/util.h index d85ba7b..2e77b0c 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -62,6 +62,7 @@ int yesno(char *fmt, ...); int noyes(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); +int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -- 1.7.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, import-tars, created. ec1fc664c9e806b1850a637336ad7c56a8931962
by dan＠archlinux.org 23 Sep '10

23 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, import-tars has been created at ec1fc664c9e806b1850a637336ad7c56a8931962 (commit) - Log ----------------------------------------------------------------- commit ec1fc664c9e806b1850a637336ad7c56a8931962 Author: Judd Vinet <judd(a)archlinux.org> Date: Thu Feb 2 23:39:53 2006 +0000 Imported from pacman-2.9.8.tar.gz commit 1bcc87c3feb41dc8004c3d600e3a3501a4060b44 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Sep 16 18:22:02 2005 +0000 Imported from pacman-2.9.7.tar.gz commit de98f7004e712ae422af4a567c7df26c4579b0d6 Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Sep 11 23:18:42 2005 +0000 Imported from pacman-2.9.7-TEST3.tar.gz commit 3ba0d67cb14ba5d608df16eb447fe441956dbf8f Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Sep 7 07:03:50 2005 +0000 Imported from pacman-2.9.7-TEST2.tar.gz commit 08962d40c076e0343af724db6243c81cff2c7c25 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Aug 19 22:41:20 2005 +0000 Imported from pacman-2.9.7-TEST.tar.gz commit d05f0047a02a2b3b3f1a07c0feb980837a3496a3 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Jun 10 21:31:25 2005 +0000 Imported from pacman-2.9.6.tar.gz commit d48cc3bf5d0bc9aef5e816c81d3a0f6b8e2680c7 Author: Judd Vinet <judd(a)archlinux.org> Date: Tue Jan 11 23:14:16 2005 +0000 Imported from pacman-2.9.5.tar.gz commit ad39cd7bd6858841ebaa4809f151ba03c0e9f3bf Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Dec 20 01:37:08 2004 +0000 Imported from pacman-2.9.4.tar.gz commit f6b8ed22f40d422e2876be92b215187b5ff7b6e7 Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Dec 19 03:37:00 2004 +0000 Imported from pacman-2.9.3.tar.gz commit 4795965caf371a55285678e5860ae66e926ebd95 Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Sep 25 18:03:03 2004 +0000 Imported from pacman-2.9.2.tar.gz commit deff79c76c96ea1fd1f3e9eb682a9f9572a9e58e Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Sep 25 00:15:56 2004 +0000 Imported from pacman-2.9.1.tar.gz commit 4ffc53b3398ae845183f991a56207459256cc9e9 Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Sep 18 18:37:34 2004 +0000 Imported from pacman-2.9.tar.gz commit afc0d9a3c45b70edd948ce0be4a5e81d4da00c7e Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Aug 23 06:52:47 2004 +0000 Imported from pacman-2.8.4.tar.gz commit ad87360a71927f2afb3f91f13005b3c477f82acf Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Aug 4 06:49:31 2004 +0000 Imported from pacman-2.8.3.tar.gz commit 62913fba63000dd9a7f1ff12c6cd40362ad56f3a Author: Judd Vinet <judd(a)archlinux.org> Date: Thu Jul 22 17:11:19 2004 +0000 Imported from pacman-2.8.2.tar.gz commit 75ace390f7f497300adb59b3597f1cec2f31c21f Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Jul 17 01:55:28 2004 +0000 Imported from pacman-2.8.1.tar.gz commit f6661379c68b541115efe25285965bbd4eb32d25 Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Jul 3 04:25:48 2004 +0000 Imported from pacman-2.8.tar.gz commit a2ee533f84aa858df5710d799c52b7d06a77b1de Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Apr 30 03:37:13 2004 +0000 Imported from pacman-2.7.9.tar.gz commit 4ad864462043c61d19861e4b7cacf6610ae9ce7f Author: Judd Vinet <judd(a)archlinux.org> Date: Thu Apr 29 19:43:18 2004 +0000 Imported from pacman-2.7.8.tar.gz commit 4cb6a179b3b23fff7208628438d59783e9e65dfc Author: Judd Vinet <judd(a)archlinux.org> Date: Thu Apr 15 05:05:54 2004 +0000 Imported from pacman-2.7.7.tar.gz commit d7c17ff1ccf5ff1c5297545b0fad858e6a116492 Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Apr 4 06:32:24 2004 +0000 Imported from pacman-2.7.6.tar.gz commit 88c73d4d65d7f3fd7bd9a9777f6816d5896cfa4a Author: Judd Vinet <judd(a)archlinux.org> Date: Tue Mar 2 04:49:15 2004 +0000 Imported from pacman-2.7.5.tar.gz commit a11fb0b581356b23b343683302e201ff7dfcfe48 Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Feb 18 07:09:00 2004 +0000 Imported from pacman-2.7.4.tar.gz commit 617b904b26037fac6296eb44fb36cfadfdaf27ec Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Feb 7 20:37:00 2004 +0000 Imported from pacman-2.7.3.tar.gz commit 6d4c666a8e10cd1f531abc6d34593cf5802adab4 Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Jan 4 17:53:32 2004 +0000 Imported from pacman-2.7.2.tar.gz commit 68e24b947ea7da1e5e4c2e48109df737e8cda4f0 Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Dec 21 01:34:32 2003 +0000 Imported from pacman-2.7.1.tar.gz commit f54a888a1facfd8f086d6414260be5f1b991a66b Author: Judd Vinet <judd(a)archlinux.org> Date: Tue Nov 25 02:02:36 2003 +0000 Imported from pacman-2.7.tar.gz commit 5aa3a24b17c5b1d2b43274e530259dab7711b9b0 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Oct 17 04:18:01 2003 +0000 Imported from pacman-2.6.4.tar.gz commit 24b934e8868e1162c44ee06b2cb2990b6a434a98 Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Oct 1 23:14:37 2003 +0000 Imported from pacman-2.6.3.tar.gz commit 16f42002ecc15d135cb444a36d84251ce015d34c Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Sep 29 00:58:58 2003 +0000 Imported from pacman-2.6.2.tar.gz commit 9d9ffa6cecb7d1a5e875c9d39fb3f4a0580c52df Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Sep 15 04:58:02 2003 +0000 Imported from pacman-2.6.1.tar.gz commit f8bfe729e49fe5d7fd7df80733ad3d2d1c61160d Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Sep 3 02:09:29 2003 +0000 Imported from pacman-2.6.tar.gz commit ffe1d50cff3e1df8834f371e1b7a40fa2c703e9b Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Jul 12 00:06:30 2003 +0000 Imported from pacman-2.5.1.tar.gz commit 636c6411196ba415652ea3357c781cbe62afea6b Author: Judd Vinet <judd(a)archlinux.org> Date: Fri May 30 19:56:46 2003 +0000 Imported from pacman-2.5.tar.gz commit e9c6f3b2131217acb4191ed69bfc3f6efa53dfbf Author: Judd Vinet <judd(a)archlinux.org> Date: Sat Apr 19 22:31:38 2003 +0000 Imported from pacman-2.4.1.tar.gz commit 37e13ea2d0c0df564f00278ac68bf8a1e584bfd9 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Apr 11 16:58:50 2003 +0000 Imported from pacman-2.4.tar.gz commit 185ce5454e4afd11b1f90d7fe487b0ec3cb840c7 Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Mar 17 19:36:48 2003 +0000 Imported from pacman-2.3.2.tar.gz commit 0207fad046f76fc37c0fc7c8b6a157225024a3ed Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Mar 14 17:35:57 2003 +0000 Imported from pacman-2.3.1.tar.gz commit f2e50be2f5b15c1985f9fcfb7ee1374dd6e94927 Author: Judd Vinet <judd(a)archlinux.org> Date: Thu Feb 27 08:26:02 2003 +0000 Imported from pacman-2.3.tar.gz commit 9d9b0e8d2655f5430bf917452221400fc219a2d8 Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Dec 11 21:56:52 2002 +0000 Imported from pacman-2.2.tar.gz commit 6a654187b68d37211dc8af301e611ec4a7f132c4 Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Sep 16 05:22:13 2002 +0000 Imported from pacman-2.1.tar.gz commit 62a783a6bd7649ccd162e32278098080bf450c7b Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Aug 9 18:03:48 2002 +0000 Imported from pacman-2.0.tar.gz commit 20b746229368e1e24b2192529c1386438413998b Author: Judd Vinet <judd(a)archlinux.org> Date: Tue Apr 30 18:53:55 2002 +0000 Imported from pacman-1.23.tar.gz commit 4c3842d42ba448fde829fe3f7c058999daf5cbe2 Author: Judd Vinet <judd(a)archlinux.org> Date: Fri Apr 12 19:34:34 2002 +0000 Imported from pacman-1.22.tar.gz commit b656d1fe59b5f3d1903cde136a04499a7b419997 Author: Judd Vinet <judd(a)archlinux.org> Date: Wed Apr 3 08:40:12 2002 +0000 Imported from pacman-1.21.tar.gz commit 931506031bbf51051200b67f096fe02620e6fbf5 Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Mar 18 09:36:01 2002 +0000 Imported from pacman-1.2.tar.gz commit 8cf35f551fd9cf8dc92c9a7c86fd4485f9cec74a Author: Judd Vinet <judd(a)archlinux.org> Date: Sun Mar 10 22:34:15 2002 +0000 Imported from pacman-1.1.tar.gz commit d53b2011b1406a4784995f4043added5c04588ce Author: Judd Vinet <judd(a)archlinux.org> Date: Mon Feb 25 19:23:38 2002 +0000 Imported from pacman-1.0.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

2 2

Re: [pacman-dev] [PATCH 1/5] pacman-key: keyring management tool
by guillaume＠alaux.net 22 Sep '10

22 Sep '10

OK so hopefully this one will work nicely... === PATCH === diff --git a/doc/.gitignore b/doc/.gitignore index f047aaa..aebf7a0 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -3,6 +3,7 @@ libalpm.3 makepkg.8 makepkg.conf.5 pacman.8 +pacman-key.8 pacman.conf.5 repo-add.8 repo-remove.8 diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e656f6..5c84234 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -7,6 +7,7 @@ ASCIIDOC_MANS = \ pacman.8 \ makepkg.8 \ repo-add.8 \ + pacman-key.8 \ PKGBUILD.5 \ makepkg.conf.5 \ pacman.conf.5 \ @@ -18,6 +19,7 @@ HTML_MANPAGES = \ pacman.8.html \ makepkg.8.html \ repo-add.8.html \ + pacman-key.8.html \ PKGBUILD.5.html \ makepkg.conf.5.html \ pacman.conf.5.html \ @@ -38,6 +40,7 @@ EXTRA_DIST = \ pacman.8.txt \ makepkg.8.txt \ repo-add.8.txt \ + pacman-key.8.txt \ PKGBUILD.5.txt \ PKGBUILD-example.txt \ makepkg.conf.5.txt \ @@ -128,6 +131,7 @@ $(HTML_OTHER): asciidoc.conf pacman.8 pacman.8.html: pacman.8.txt makepkg.8 makepkg.8.html: makepkg.8.txt repo-add.8 repo-add.8.html: repo-add.8.txt +pacman-key.8 pacman-key.8.html: pacman-key.8.txt PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt new file mode 100644 index 0000000..6b70f80 --- /dev/null +++ b/doc/pacman-key.8.txt @@ -0,0 +1,76 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet: +///// +pacman-key(8) +============= + + +Name +---- +pacman-key - manage pacman's list of trusted keys + + +Synopsis +-------- +*pacman-key* [options] *command* ['arguments'] + + +Description +----------- +The script *pacman-key* manage *pacman*'s keyring, which is the collection of GnuPG keys used to check signed packages. +It provides the ability to import and export keys, fetch keys from keyservers and update the key trust database. + + +Options +------- +*\--config* 'file':: + Set an alternative configuration file to use (default is {sysconfdir}/pacman.conf) + +*\--gpgdir* 'directory':: + Set an alternative home directory for GnuPG (default is set in {sysconfdir}/pacman.conf) + + +Commands +------- +*-a*, *\--add* 'file ...':: + Add the key(s) contained in 'file'(s) to pacman's keyring. If a key already exists, update it. + +*\--adv* 'param ...':: + Use this option to issue particular GnuPG actions to pacman's keyring. This option should be used with care as it can modify pacman's trust in packages' signatures. + +*-d*, *\--del* 'keyid ...':: + Remove the key(s) identified by 'keyid'(s) from pacman's keyring + +*-e*, *\--export* ['keyid ...']:: + Export key(s) identified by 'keyid'(s) to STDOUT or all keys if no 'keyid' is specified + +*-f*, *\--finger* ['keyid ...']:: + List fingerprint(s) for specified 'keyid'(s) or for all if none is specified + +*\--help*:: + Displays this message + +*-l*, *\--list*:: + Equivalent to --list-sigs from GnuPG + +*-r*, *\--receive* 'keyserver' 'keyid ...':: + Fetch the 'keyid'(s) from the specified 'keyserver' URL + +*\--reload*:: + Reloads the keys from the keyring package + +*-t*, *\--trust* 'keyid':: + Set the trust level of the given key + +*-u*, *\--updatedb*:: + Equivalent to \--check-trustdb in GnuPG + +*-v*, *\--version*:: + Displays the current version + + +See Also +-------- +linkman:pacman.conf[5] + +include::footer.txt[]

2 1

Re: [pacman-dev] [PATCH 1/5] pacman-key: keyring management tool
by Martti Kühne 20 Sep '10

20 Sep '10

Hello list I believe, line 19 on the patch, copy-pasted from allan's suggestion misses a third person's 's' as it is usual in English... -The script *pacman-key* manage *pacman*'s keyring, which is the +The script *pacman-key* manages *pacman*'s keyring, which is the Just to add my oppinion in this. I'm very pleased to see this feature coming, since it was an issue in the archlinux.se mirror discussion where ppl were making fun of arch because of that. IMHO this is coming at the right time... :-) cheers! mar77i

1 0

[pacman-dev] stripping binaries in makepkg
by Florian Pritz 18 Sep '10

18 Sep '10

Hi, Why do we only strip binaries in $STRIP_DIRS and not every binary in the package? The current behavior fails with multilib unless you add usr/lib32 to the list, but I fail to see a good reason why we use a variable here. Scanning will probably be a bit slower, but that only holds true for big packages and normally those have huge compile times anyway. Can someone enlighten me please? -- Florian Pritz -- {flo,bluewind}@server-speed.net

1 0

[pacman-dev] [PATCH] PKGBUILD-example.txt: Remove superfluous "|| return 1".
by Lukas Fleischer 16 Sep '10

16 Sep '10

--- doc/PKGBUILD-example.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 7245228..99fd8c2 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -15,6 +15,6 @@ md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make make prefix=$pkgdir/usr install } -- 1.7.2.3

4 4

[pacman-dev] {Spam?} [PATCH] bacman: unify package creation with makepkg
by Allan McRae 15 Sep '10

15 Sep '10

Currently bacman always compresses with gzip now matter what PKGEXT is set to. Rework the entire package creation process to be similar to that in makepkg. This also make the explicit assumption that PKGEXT is defined in makepkg.conf. Thanks to Nelson Chan <khcha.n.el(a)gmail.com> for the original patch to fix the incorrect package compression. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index dfd53e8..6dd7839 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -87,7 +87,6 @@ fi pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" -pkg_ext=${PKGEXT:-'.pkg.tar.gz'} pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" @@ -164,13 +163,6 @@ fi pkg_size=$(du -sk | awk '{print $1 * 1024}') -if [ -f "$pkg_dir/install" ] ; then - cp "$pkg_dir/install" "$work_dir/.INSTALL" -fi -if [ -f $pkg_dir/changelog ] ; then - cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" -fi - # # .PKGINFO stuff # @@ -254,6 +246,17 @@ while read i; do esac done +comp_files=".PKGINFO" + +if [ -f "$pkg_dir/install" ] ; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" + comp_files+=" .INSTALL" +fi +if [ -f $pkg_dir/changelog ] ; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" + comp_files+=" .CHANGELOG" +fi + # # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL # @@ -265,8 +268,31 @@ chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null # echo "Generating the package..." +case "$PKGEXT" in + *tar.gz) EXT=${PKGEXT%.gz} ;; + *tar.bz2) EXT=${PKGEXT%.bz2} ;; + *tar.xz) EXT=${PKGEXT%.xz} ;; + *tar) EXT=${PKGEXT} ;; + *) echo "WARNING: '%s' is not a valid archive extension." \ + "$PKGEXT" ; EXT=$PKGEXT ;; +esac + +pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$? + +# when fileglobbing, we want * in an empty directory to expand to +# the null string rather than itself +shopt -s nullglob +# TODO: Maybe this can be set globally for robustness +shopt -s -o pipefail +bsdtar -cf - $comp_files * | +case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar) cat ;; +esac > ${pkg_file} || ret=$? + if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" -- 1.7.2.3

2 3

[pacman-dev] Fwd: [arch-general] Makepkg $(srcdir) detection and false-positives
by Allan McRae 15 Sep '10

15 Sep '10

Forwarding to pacman-dev. The idea seems reasonable to me as this check was mainly to catch bad paths in configuration files. Allan -------- Original Message -------- Subject: [arch-general] Makepkg $(srcdir) detection and false-positives Date: Fri, 27 Aug 2010 08:58:28 +0100 From: Nathan Wayde <kumyco(a)konnichi.com> Reply-To: General Discussion about Arch Linux <arch-general(a)archlinux.org> Organization: Konnichi Computing To: General Discusson about Arch Linux <arch-general(a)archlinux.org> I'm not sure if this is the correct ML or not but whatever I'll post here anyway. I was just reading the ML where the quest? to finding why makepkg warns about $srcdir was brought up and a simple grep -R... seemed to be the method of detection. Anyway it reminded me of another message on the topic last week i think where someone said that it would warn on files with debugging symbols... TL;DR makepkg does a grep -q to decide if a package contains files that reference $(srcdir), this is inadequate as it causes a false-positive on files that contain debugging symbols. This can be eliminated by specifying the option `-I` a.k.a `--binary-files=without-match` to grep which makes prevents grep from matching binary files. Rationale: the only paths that binary files should contain based on buildtime setting are path such as '/usr/share/xyz'. If the pkgbuild *accidentally* uses a variable that resolves with $srcdir in it then I'd argue that the pkgbuild is broken and will most likely break the application in other ways and will be caught before sharing the pkgbuild. I can't be the only one that tests their packages before uploading to the AUR right? On another note, shouldn't there also be a check for $pkgdir. The only cases of this that I've ran into myself have been a reference to $pkgdir causing all sorts of nonsense such as broken symlinks and incorrect resource paths.

1 0