- Pacman-dev - lists.archlinux.org

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

24 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 fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 (commit) from 21caf8730f9d089e351bf73b8bfd46b316c518a9 (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 fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 22 14:25:24 2009 +1000 makepkg: allow passing arguments with spaces Currently makepkg takes the commandline arguments, assigns them to a variable and passes that variable to the next makepkg call (within fakeroot). Use a comination of quotes and arrays in this process to ensure any arguments passed within quotes and containing spaces stay as a single argument during the second makepkg call. Thanks to Dan for figuring out how to get this working. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] Update .gitignore and remove autotools files
by Laszlo Papp 24 Oct '09

24 Oct '09

Too big patch, see the attachment You can see my project after the refactored build system, it's easier, smaller, clear, and git friendlier :) http://git.berlios.de/cgi-bin/gitweb.cgi?p=aurman;a=tree;h=5c71d00964f7a4c7… Best Regards, Laszlo Papp

2 2

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

24 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 21caf8730f9d089e351bf73b8bfd46b316c518a9 (commit) from 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

24 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 7f0f319a3e7c471a41482ba620f74423ef3f9a94 (commit) via 0bc961a8be1adc1dabc4089d7f67a95cb603f450 (commit) via 21caf8730f9d089e351bf73b8bfd46b316c518a9 (commit) via 748bc8ebd41f5553c139c530358a72a83def7126 (commit) via 013fc9a7952bd93f451fecafa937a73c5c492a73 (commit) via 1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9 (commit) via 6ed7d001f6783907d762514dab0741f98d22d715 (commit) via c6095e103240589895ebdd4b3789c960cb897ed5 (commit) from 3758ccbb524b502cc6162324f1b953215b6b970e (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 7f0f319a3e7c471a41482ba620f74423ef3f9a94 Merge: 0bc961a8be1adc1dabc4089d7f67a95cb603f450 21caf8730f9d089e351bf73b8bfd46b316c518a9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Oct 24 10:10:15 2009 -0500 Merge branch 'maint' commit 0bc961a8be1adc1dabc4089d7f67a95cb603f450 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 20 23:25:38 2009 -0500 Reduce unnecessary get_name() function calls alpm_pkg_get_name() gives us little benefit in backend code besides a NULL check on the package passed in; we could do that ourself if necessary. By changing to direct references in the cases where we are sure we have a valid package, we save a function call each time we need a package name. This function can't be inlined because it is externally accessible. This cuts the calls to get_name() from 1.3 million times in a pacman -Qu operation to around 2400. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 748bc8ebd41f5553c139c530358a72a83def7126 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Fri Oct 23 17:11:39 2009 +0200 makepkg: use tput for terminal-safe colored and bold text Suggested-by: Dan McGee <dan(a)archlinux.org> 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 013fc9a7952bd93f451fecafa937a73c5c492a73 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Fri Oct 23 17:11:38 2009 +0200 makepkg: define escape sequences globally In doing so, it is possible to get rid of all the tests for colored messages except for one global one. 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 1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 16:06:42 2009 +0200 makepkg: check for non-empty pkgbase instead of pkgname pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. 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 6ed7d001f6783907d762514dab0741f98d22d715 Author: Heiko Baums <heiko(a)baums-on-web.de> Date: Wed Oct 21 23:46:47 2009 +0200 pacdiff : add diffsearchpath option Xav: added doc Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6095e103240589895ebdd4b3789c960cb897ed5 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 19:13:36 2009 +0200 makepkg: remove empty .part files after a failed download 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> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff | 8 +++++- lib/libalpm/package.c | 6 ++-- scripts/makepkg.sh.in | 53 ++++++++++++++++++++---------------------------- 3 files changed, 31 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: define escape sequences globally
by Cedric Staniewski 24 Oct '09

24 Oct '09

In doing so, it is possible to get rid of all the tests for colored messages except for one global one. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..2a3d22d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,7 +72,6 @@ IGNOREARCH=0 HOLDVER=0 PKGFUNC=0 SPLITPKG=0 -COLORMSG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. @@ -84,47 +83,27 @@ PACMAN_OPTS= plain() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf " ${mesg}\n" "$@" >&2 - fi + printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;32m==>\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> ${mesg}\n" "$@" >&2 - fi + printf "${GREEN}==>${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg2() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;34m ->\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf " -> ${mesg}\n" "$@" >&2 - fi + printf "${BLUE} ->${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } warning() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;33m==> $(gettext "WARNING:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 - fi + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } error() { local mesg=$1; shift - if [ $COLORMSG -eq 1 ]; then - printf "\033[1;31m==> $(gettext "ERROR:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 - else - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 - fi + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF_BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } @@ -1576,7 +1555,16 @@ fi # check if messages are to be printed using color if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then - COLORMSG=1 + readonly ALL_OFF="\033[1;0m" \ + BOLD="\033[1;1m" + readonly ALL_OFF_BOLD="${ALL_OFF}${BOLD}" \ + RED="${BOLD}\033[1;31m" \ + BLUE="${BOLD}\033[1;34m" \ + GREEN="${BOLD}\033[1;32m" \ + YELLOW="${BOLD}\033[1;33m" +else + unset ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW + readonly ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW fi # override settings with an environment variable for batch processing -- 1.6.5.1

2 8

[pacman-dev] [PATCH 4/4] build: split acinclude.m4
by Laszlo Papp 23 Oct '09

23 Oct '09

The automake manual recommends against acinclude.m4: "The first possibility (the historical practice) is to list all your macros in `acinclude.m4'. This file will be included in `aclocal.m4' when you run `aclocal', and its macro(s) will henceforth be visible to `autoconf'. However if it contains numerous macros, it will rapidly become difficult to maintain, and it will be almost impossible to share macros between packages." Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- m4/gcc-inline.m4 | 19 +++++++++++++++++++ m4/gcc-ssp.m4 | 19 +++++++++++++++++++ m4/gcc-ssplib.m4 | 17 +++++++++++++++++ m4/gcc-visibility.m4 | 19 +++++++++++++++++++ 4 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 m4/gcc-inline.m4 create mode 100644 m4/gcc-ssp.m4 create mode 100644 m4/gcc-ssplib.m4 create mode 100644 m4/gcc-visibility.m4 diff --git a/m4/gcc-inline.m4 b/m4/gcc-inline.m4 new file mode 100644 index 0000000..e58a225 --- /dev/null +++ b/m4/gcc-inline.m4 @@ -0,0 +1,19 @@ +dnl GCC_GNU89_INLINE_CC +dnl checks -fgnu89-inline with the C compiler, if it exists then defines +dnl ENABLE_GNU89_INLINE_CC in both configure script and Makefiles +AC_DEFUN([GCC_GNU89_INLINE_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([for -fgnu89-inline], + gnu89_inline_cv_cc, + [ gnu89_inline_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fgnu89-inline" + AC_TRY_COMPILE(,, gnu89_inline_cv_cc=yes, gnu89_inline_cv_cc=no) + CFLAGS="$gnu89_inline_old_cflags" + ]) + if test $gnu89_inline_cv_cc = yes; then + AC_DEFINE([ENABLE_GNU89_INLINE_CC], 1, [Define if gnu89 inlining semantics should be used.]) + fi + AM_CONDITIONAL([ENABLE_GNU89_INLINE_CC], test "x$gnu89_inline_cv_cc" = "xyes") + fi +]) diff --git a/m4/gcc-ssp.m4 b/m4/gcc-ssp.m4 new file mode 100644 index 0000000..1924bd1 --- /dev/null +++ b/m4/gcc-ssp.m4 @@ -0,0 +1,19 @@ +dnl GCC_STACK_PROTECT_CC +dnl checks -fstack-protector-all with the C compiler, if it exists then updates +dnl CFLAGS and defines ENABLE_SSP_CC +AC_DEFUN([GCC_STACK_PROTECT_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector-all], + ssp_cv_cc, + [ssp_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector-all" + AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no) + CFLAGS="$ssp_old_cflags" + ]) + if test $ssp_cv_cc = yes; then + CFLAGS="$CFLAGS -fstack-protector-all" + AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) + fi + fi +]) diff --git a/m4/gcc-ssplib.m4 b/m4/gcc-ssplib.m4 new file mode 100644 index 0000000..ef51d38 --- /dev/null +++ b/m4/gcc-ssplib.m4 @@ -0,0 +1,17 @@ +dnl GCC_STACK_PROTECT_LIB +dnl adds -lssp to LIBS if it is available +dnl ssp is usually provided as part of libc, but was previously a separate lib +dnl It does not hurt to add -lssp even if libc provides SSP - in that case +dnl libssp will simply be ignored. +AC_DEFUN([GCC_STACK_PROTECT_LIB],[ + AC_CACHE_CHECK([whether libssp exists], ssp_cv_lib, + [ssp_old_libs="$LIBS" + LIBS="$LIBS -lssp" + AC_TRY_LINK(,, ssp_cv_lib=yes, ssp_cv_lib=no) + LIBS="$ssp_old_libs" + ]) + if test $ssp_cv_lib = yes; then + LIBS="$LIBS -lssp" + fi +]) + diff --git a/m4/gcc-visibility.m4 b/m4/gcc-visibility.m4 new file mode 100644 index 0000000..84a5347 --- /dev/null +++ b/m4/gcc-visibility.m4 @@ -0,0 +1,19 @@ +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 +AC_DEFUN([GCC_VISIBILITY_CC],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([whether ${CC} accepts -fvisibility=internal], + visibility_cv_cc, + [visibility_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=internal" + AC_TRY_COMPILE(,, visibility_cv_cc=yes, visibility_cv_cc=no) + CFLAGS="$visibility_old_cflags" + ]) + if test $visibility_cv_cc = yes; then + AC_DEFINE([ENABLE_VISIBILITY_CC], 1, [Define if symbol visibility C support is enabled.]) + fi + AM_CONDITIONAL([ENABLE_VISIBILITY_CC], test "x$visibility_cv_cc" = "xyes") + fi +]) -- 1.6.5

1 0

[pacman-dev] [PATCH 3/4] build: add missing ACLOCAL_AMFLAGS
by Laszlo Papp 23 Oct '09

23 Oct '09

In configure.ac we have AC_CONFIG_MACRO_DIR([m4]), which ideally also wants ACLOCAL_AMFLAGS in Makefile.am per automake's suggestion. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2f5e7a7..5f5e436 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib if WANT_DOC SUBDIRS += doc -- 1.6.5

1 0

[pacman-dev] [PATCH 2/4] Fix some autoreconf warnings
by Laszlo Papp 23 Oct '09

23 Oct '09

Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- autoclean.sh | 36 +----------------------------------- autogen.sh | 6 ++---- configure.ac | 3 ++- 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 73675f8..0841ef1 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -1,37 +1,3 @@ #!/bin/sh -xu -[ -f Makefile ] && make distclean -rm -rf autom4te.cache -rm -f {Makefile.in,Makefile} -rm -f {config.h.in,config.h} -rm -f config.status -rm -f configure -rm -f stamp* -rm -f aclocal.m4 -rm -f compile -rm -f libtool - -rm -f lib/libalpm/{Makefile.in,Makefile} -rm -f src/util/{Makefile.in,Makefile} -rm -f src/pacman/{Makefile.in,Makefile} -rm -f scripts/{Makefile.in,Makefile} -rm -f etc/{Makefile.in,Makefile} -rm -f etc/pacman.d/{Makefile.in,Makefile} -rm -f etc/abs/{Makefile.in,Makefile} -rm -f pactest{,/tests}/{Makefile.in,Makefile} -rm -f contrib/{Makefile.in,Makefile} -rm -f doc/{Makefile.in,Makefile} - -rm -f pactest/*.pyc -rm -f doc/html/*.html -rm -f doc/man3/*.3 - -rm -f po/{Makefile.in,Makefile} -rm -f po/POTFILES -rm -f po/stamp-po -rm -f po/*.gmo - -rm -f lib/libalpm/po/{Makefile.in,Makefile} -rm -f lib/libalpm/po/POTFILES -rm -f lib/libalpm/po/stamp-po -rm -f lib/libalpm/po/*.gmo +git clean -x -d -f diff --git a/autogen.sh b/autogen.sh index 964fe5f..d59ea6c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,4 @@ #!/bin/sh -xu -aclocal -autoheader -automake --foreign -autoconf +autoreconf -fi; +rm -Rf autom4te.cache; diff --git a/configure.ac b/configure.ac index dada0dd..959eb7d 100644 --- a/configure.ac +++ b/configure.ac @@ -53,11 +53,12 @@ m4_define([pacman_version], # Autoconf initialization AC_INIT([pacman], [pacman_version], [pacman-dev(a)archlinux.org] +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" -- 1.6.5

1 0

[pacman-dev] [PATCH] makepkg: use tput for terminal-safe colored and bold text
by Cedric Staniewski 23 Oct '09

23 Oct '09

Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a3d22d..f7d1fc8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -28,7 +28,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed +# getopt (util-linux), gettext, grep, gzip, openssl, sed, tput (ncurses) # gettext initialization export TEXTDOMAIN='pacman' @@ -1555,13 +1555,13 @@ fi # check if messages are to be printed using color if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then - readonly ALL_OFF="\033[1;0m" \ - BOLD="\033[1;1m" + readonly ALL_OFF="$(tput sgr0)" \ + BOLD="$(tput bold)" readonly ALL_OFF_BOLD="${ALL_OFF}${BOLD}" \ - RED="${BOLD}\033[1;31m" \ - BLUE="${BOLD}\033[1;34m" \ - GREEN="${BOLD}\033[1;32m" \ - YELLOW="${BOLD}\033[1;33m" + RED="${BOLD}$(tput setaf 1)" \ + BLUE="${BOLD}$(tput setaf 4)" \ + GREEN="${BOLD}$(tput setaf 2)" \ + YELLOW="${BOLD}$(tput setaf 3)" else unset ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW readonly ALL_OFF ALL_OFF_BOLD BOLD RED BLUE GREEN YELLOW -- 1.6.5.1

1 1

[pacman-dev] [PATCH] makepkg: Add EXTRAVERSION field to package filenames
by Anders Bergh 23 Oct '09

23 Oct '09

>From 92f67cdcff4cbec3c5c9d6b0ca17a6f71fdf87b9 Mon Sep 17 00:00:00 2001 From: Anders Bergh <anders1(a)gmail.com> Date: Fri, 23 Oct 2009 00:11:05 +0200 Subject: [PATCH] makepkg: Add EXTRAVERSION field to package filenames. This is intended for packages compiled to run on another operating system than Linux, such as cygwin or Darwin. It is set using --with-pkg-extra-version. The package filename format is as follows: {name}-{version}-{rel}-{extraversion}{arch}{ext} Signed-off-by: Anders Bergh <anders1(a)gmail.com> --- configure.ac | 6 ++++++ etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index dada0dd..30c25fb 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,11 @@ AC_ARG_WITH(db-ext, AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) +# Help line for extra version field +AC_ARG_WITH(pkg-extra-version, + AS_HELP_STRING([--with-pkg-extra-version=ver], [add extra version field to package filenames]), + [EXTRAVERSION=$withval], [EXTRAVERSION=]) + # Help line for buildscript filename AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), @@ -378,6 +383,7 @@ ${PACKAGE_NAME}: source pkg extension : ${SRCEXT} database extension : ${DBEXT} build script name : ${BUILDSCRIPT} + extra version : ${EXTRAVERSION} Compilation options: Run make in doc/ dir : ${wantdoc} diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..a16f71e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -103,5 +103,6 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) # PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' +EXTRAVERSION='@EXTRAVERSION@' # vim: set ft=sh ts=2 sw=2 et: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..219d59e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -158,12 +158,12 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [ -n "$pkgname" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-build.log"* if [ "$PKGFUNC" -eq 1 ]; then - rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-package.log"* elif [ "$SPLITPKG" -eq 1 ]; then for pkg in ${pkgname[@]}; do - rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-package.log"* done fi fi @@ -730,7 +730,7 @@ run_function() { local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}-$pkgfunc.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -1015,7 +1015,7 @@ create_package() { *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac - local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" + local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${PKGARCH}${EXT}" local ret=0 @@ -1121,10 +1121,10 @@ install_package() { local pkglist for pkg in ${pkgname[@]}; do - if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then - pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT} ]; then + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" else - pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" + pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" fi done @@ -1721,8 +1721,8 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then - if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ + if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" \ + -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" $ \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1737,8 +1737,8 @@ else allpkgbuilt=1 somepkgbuilt=0 for pkg in ${pkgname[@]}; do - if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}${CARCH}${PKGEXT}" \ + -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${EXTRAVERSION}any${PKGEXT}" $ ]; then somepkgbuilt=1 else allpkgbuilt=0 -- 1.6.5.1

2 3

[pacman-dev] [PATCH] Fix a small typo in alpm_list.c
by Laszlo Papp 23 Oct '09

23 Oct '09

Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- It's not a big patch, but maybe it counts. lib/libalpm/alpm_list.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 17bdfdf..a395540 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -616,7 +616,7 @@ static int ptr_cmp(const void *p, const void *q) /** * @brief Find an item in a list. * - * Search for the item whos data matches that of the `needle`. + * Search for the item whose data matches that of the `needle`. * * @param needle the data to search for (== comparison) * @param haystack the list -- 1.6.5

1 0

[pacman-dev] [PATCH] makepkg: use tput for terminal-safe colored and bold text
by Cedric Staniewski 23 Oct '09

23 Oct '09

Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- I do not know if this patch is usefull at all, because I do not notice any change. Just grabbed this from Dan's TODO list and wanted to play a bit with tput. scripts/makepkg.sh.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..a64a867 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -85,7 +85,7 @@ PACMAN_OPTS= plain() { local mesg=$1; shift if [ $COLORMSG -eq 1 ]; then - printf "\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 + printf "$(tput bold) ${mesg}$(tput sgr0)\n" "$@" >&2 else printf " ${mesg}\n" "$@" >&2 fi @@ -94,7 +94,7 @@ plain() { msg() { local mesg=$1; shift if [ $COLORMSG -eq 1 ]; then - printf "\033[1;32m==>\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 + printf "$(echo -e "bold\nsetaf 2" | tput -S)==>$(echo -e "sgr0\nbold" | tput -S) ${mesg}$(tput sgr0)\n" "$@" >&2 else printf "==> ${mesg}\n" "$@" >&2 fi @@ -103,7 +103,7 @@ msg() { msg2() { local mesg=$1; shift if [ $COLORMSG -eq 1 ]; then - printf "\033[1;34m ->\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 + printf "$(echo -e "bold\nsetaf 4" | tput -S) ->$(echo -e "sgr0\nbold" | tput -S) ${mesg}$(tput sgr0)\n" "$@" >&2 else printf " -> ${mesg}\n" "$@" >&2 fi @@ -112,7 +112,7 @@ msg2() { warning() { local mesg=$1; shift if [ $COLORMSG -eq 1 ]; then - printf "\033[1;33m==> $(gettext "WARNING:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 + printf "$(echo -e "bold\nsetaf 3" | tput -S)==> $(gettext "WARNING:")$(echo -e "sgr0\nbold" | tput -S) ${mesg}$(tput sgr0)\n" "$@" >&2 else printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 fi @@ -121,7 +121,7 @@ warning() { error() { local mesg=$1; shift if [ $COLORMSG -eq 1 ]; then - printf "\033[1;31m==> $(gettext "ERROR:")\033[1;0m\033[1;1m ${mesg}\033[1;0m\n" "$@" >&2 + printf "$(echo -e "bold\nsetaf 1" | tput -S)==> $(gettext "ERROR:")$(echo -e "sgr0\nbold" | tput -S) ${mesg}$(tput sgr0)\n" "$@" >&2 else printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 fi -- 1.6.5.1

3 8

[pacman-dev] [PATCH] makepkg: improve removal of installed dependencies
by Allan McRae 23 Oct '09

23 Oct '09

Compare a list of packages on the system before and after dependency resolution in order to get a complete list of packages to remove. This allows makepkg to remove packages installed due to provides. Bail in cases where packages that were on the system originally have been removed as there is a risk of breaking the system when removing the new packages Fixes FS#15144 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9862304..d47d57b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,8 +27,8 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed +# bsdtar (libarchive), bzip2, coreutils, diff (diffutils), fakeroot, +# find (findutils), getopt (util-linux), gettext, grep, gzip, openssl, sed # gettext initialization export TEXTDOMAIN='pacman' @@ -402,7 +402,6 @@ handle_deps() { } resolve_deps() { - # $pkgdeps is a GLOBAL variable, used by remove_deps() local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 @@ -412,7 +411,6 @@ resolve_deps() { fi if handle_deps $deplist; then - pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" [ -z "$deplist" ] && return $R_DEPS_SATISFIED @@ -429,28 +427,34 @@ resolve_deps() { return $R_DEPS_MISSING } -# fix flyspray bug #5923 remove_deps() { - # $pkgdeps is a GLOBAL variable, set by resolve_deps() [ "$RMDEPS" -eq 0 ] && return - [ -z "$pkgdeps" ] && return - local dep depstrip deplist - deplist="" - for dep in $pkgdeps; do - depstrip="${dep%%[<=>]*}" - deplist="$deplist $depstrip" - done + current_pkglist=($(pacman -Qq)) + + # check for packages removed during dependency install (e.g. due to conflicts) + # removing all installed packages is risky in this case + if [ $(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | \ + grep "<" | wc -l) -gt 0 ]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 + fi + + local deplist=($(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | grep ">")) + deplist=(${deplist[@]#>}) + [ ${#deplist[@]} -eq 0 ] && return msg "Removing installed dependencies..." local ret=0 if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? + sudo pacman $PACMAN_OPTS -Rn ${deplist[@]} || ret=$? else - pacman $PACMAN_OPTS -Rns $deplist || ret=$? + pacman $PACMAN_OPTS -Rn ${deplist[@]} || ret=$? fi - # Fixes FS#10039 - exit cleanly as package has built successfully + # exit cleanly as package has built successfully if [ $ret -ne 0 ]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 @@ -1856,14 +1860,13 @@ if [ "$SOURCEONLY" -ne 0 ]; then exit 0 fi -# fix flyspray bug #5973 if [ "$NODEPS" -eq 1 -o "$NOBUILD" -eq 1 -o "$REPKG" -eq 1 ]; then # no warning message needed for nobuild, repkg if [ "$NODEPS" -eq 1 ]; then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p pacman) ]; then - unset pkgdeps # Set by resolve_deps() and used by remove_deps() + original_pkglist=($(pacman -Qq)) # required by remove_deps deperr=0 msg "$(gettext "Checking Runtime Dependencies...")" -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: also clean cache if no character was entered at the prompt
by Cedric Staniewski 22 Oct '09

22 Oct '09

If no character was entered, the preselected option (= the capital) should be assumed; just as pacman it does. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..3b29b31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1600,7 +1600,7 @@ if [ "$CLEANCACHE" -eq 1 ]; then echo -n "$(gettext "[Y/n]")" read answer answer="${answer^^}" - if [ "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then + if [ -z "$answer" -o "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then rm "$SRCDEST"/* if [ $? -ne 0 ]; then error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" -- 1.6.5.1

4 12

[pacman-dev] [PATCH] makepkg: allow specifying subsets of packages to build
by Allan McRae 22 Oct '09

22 Oct '09

This allows makepkg to only build a specified subset of packages from a split PKGBUILD. This is very useful in combination with the -R flag or when bumping the pkgrel of a single package. Fixes FS#15956. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ec02875..043ad40 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -148,6 +148,10 @@ Options remote builder, or a tarball upload. Because integrity checks are verified, all source files of the package need to be present or downloadable. +*\--pkg <`list`>*:: + Only build listed packages from a split package. The use of quotes is + necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 309211b..880b90a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,6 +72,7 @@ IGNOREARCH=0 HOLDVER=0 PKGFUNC=0 SPLITPKG=0 +PKGLIST="" COLORMSG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -1243,6 +1244,15 @@ check_sanity() { done fi + if [ -n "${PKGLIST[@]}" ]; then + for pkg in ${PKGLIST[@]}; do + if ! in_array $pkg ${pkgname[@]}; then + error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" + return 1 + fi + done + fi + return 0 } @@ -1466,6 +1476,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo @@ -1502,7 +1513,7 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,skipinteg" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" @@ -1540,6 +1551,7 @@ while true; do -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; + --pkg) shift; PKGLIST=$1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --skipinteg) SKIPINTEG=1 ;; @@ -1722,6 +1734,11 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} +if [ -n "${PKGLIST[@]}" ]; then + unset pkgname + pkgname="${PKGLIST[@]}" +fi + if [ "$SPLITPKG" -eq 0 ]; then if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: allow passing arguments with spaces
by Allan McRae 22 Oct '09

22 Oct '09

Currently makepkg takes the commandline arguments, assigns them to a variable and passes that variable to the next makepkg call (within fakeroot). Use a comination of quotes and arrays in this process to ensure any arguments passed within quotes and containing spaces stay as a single argument during the second makepkg call. Thanks to Dan for figuring out how to get this working. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e10eef..309211b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1496,7 +1496,7 @@ if [ ! $(type -t gettext) ]; then } fi -ARGLIST=$@ +ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" @@ -1916,9 +1916,9 @@ else msg "$(gettext "Entering fakeroot environment...")" if [ -n "$newpkgver" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -F "${ARGLIST[@]}" || exit $? fi fi fi -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: remove .part file after a failed download
by Cedric Staniewski 22 Oct '09

22 Oct '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..f6b87c2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() { dlcmd="$dlcmd \"$url\"" fi - eval $dlcmd || return $? + eval $dlcmd + local ret=$? + if [ $ret -gt 0 ]; then + rm -f -- "$dlfile" + return $ret + fi # rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

6 19

[pacman-dev] bash argument passing help
by Allan McRae 21 Oct '09

21 Oct '09

Hi all, This problem has been doing my head in... First a minimal example that reflects how makepkg does things: --one.sh-- #!/bin/bash echo "pass 1:" for arg in "$@"; do echo $arg done echo ARGLIST="$@" ./two.sh $ARGLIST --end one.sh-- --two.sh-- #!/bin/bash echo "pass 2:" for arg in "$@"; do echo $arg done --end two.sh-- then run: ./one.sh -f -h "foo bar" pass 1: -f -h foo bar pass 2: -f -h foo bar Note how in pass two, foo and bar are no longer in the one line. Of course, passing ./two.sh "$@" works, but the argument parsing in makepkg clears that, hence the need to save it to ARGLIST. Any ideas? Allan

3 7

[pacman-dev] [PATCH] makepkg: allow specifying subsets of packages to build
by Allan McRae 21 Oct '09

21 Oct '09

This allows makepkg to only build a specified subset of packages from a split PKGBUILD. This is very useful in combination with the -R flag or when bumping the pkgrel of a single package. Fixes FS#15956. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- As always, my changes to the documenation could be improved. Suggestions welcome. doc/makepkg.8.txt | 5 +++++ scripts/makepkg.sh.in | 26 +++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ec02875..8c68143 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -148,6 +148,11 @@ Options remote builder, or a tarball upload. Because integrity checks are verified, all source files of the package need to be present or downloadable. +*\--pkg <`list`>*:: + Builds only the listed packages. Useful in combination with package + splitting. The use quotes is necessary when specifying multiple + packages. e.g. `--pkg "pkg1 pkg3"` + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e10eef..c3672b1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,6 +72,7 @@ IGNOREARCH=0 HOLDVER=0 PKGFUNC=0 SPLITPKG=0 +PKGLIST="" COLORMSG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -1243,6 +1244,15 @@ check_sanity() { done fi + if [ -n "$PKGLIST" ]; then + for pkg in ${PKGLIST[@]}; do + if ! in_array $pkg ${pkgname[@]}; then + error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" + return 1 + fi + done + fi + return 0 } @@ -1466,6 +1476,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo @@ -1496,13 +1507,13 @@ if [ ! $(type -t gettext) ]; then } fi -ARGLIST=$@ +ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,skipinteg" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" @@ -1540,6 +1551,7 @@ while true; do -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; + --pkg) shift; PKGLIST=$1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --skipinteg) SKIPINTEG=1 ;; @@ -1722,6 +1734,11 @@ fi pkgbase=${pkgbase:-${pkgname[0]}} +if [ -n "$PKGLIST" ]; then + unset pkgname + pkgname="${PKGLIST[@]}" +fi + if [ "$SPLITPKG" -eq 0 ]; then if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ @@ -1914,11 +1931,10 @@ else fi msg "$(gettext "Entering fakeroot environment...")" - if [ -n "$newpkgver" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -F "${ARGLIST[@]}" || exit $? fi fi fi -- 1.6.5.1

2 2

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

21 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 3758ccbb524b502cc6162324f1b953215b6b970e (commit) from 6c635d76a042add78f65f732928c2f10c2e5567a (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 3758ccbb524b502cc6162324f1b953215b6b970e Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 21 13:40:17 2009 +1000 makepkg: fix testing for built package presence Commit c7e4d10d introduced a small error in the testing of whether a package is already built. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Reduce unnecessary get_name() function calls
by Dan McGee 21 Oct '09

21 Oct '09

alpm_pkg_get_name() gives us little benefit in backend code besides a NULL check on the package passed in; we could do that ourself if necessary. By changing to direct references in the cases where we are sure we have a valid package, we save a function call each time we need a package name. This function can't be inlined because it is externally accessible. This cuts the calls to get_name() from 1.3 million times in a pacman -Qu operation to around 2400. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/package.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 572b863..83a2fb8 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -573,7 +573,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) } pmpkg_t *cachepkg = i->data; if(_alpm_dep_edge(cachepkg, pkg)) { - const char *cachepkgname = alpm_pkg_get_name(cachepkg); + const char *cachepkgname = pkg->name; reqs = alpm_list_add(reqs, strdup(cachepkgname)); } } @@ -896,7 +896,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) { pmpkg_t *pkg1 = (pmpkg_t *)p1; pmpkg_t *pkg2 = (pmpkg_t *)p2; - return(strcmp(alpm_pkg_get_name(pkg1), alpm_pkg_get_name(pkg2))); + return(strcmp(pkg1->name, pkg2->name)); } /* Test for existence of a package in a alpm_list_t* @@ -915,7 +915,7 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) for(lp = haystack; lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) { + if(info && strcmp(info->name, needle) == 0) { return(info); } } -- 1.6.5.1

1 0

[pacman-dev] [PATCH] makepkg: fix testing for built package presence
by Allan McRae 21 Oct '09

21 Oct '09

Commit c7e4d10d introduced a small error in the testing of whether a package is already built. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 989b252..7e10eef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1724,7 +1724,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ + -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" \) \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1740,7 +1740,7 @@ else somepkgbuilt=0 for pkg in ${pkgname[@]}; do if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" \) ]; then somepkgbuilt=1 else allpkgbuilt=0 -- 1.6.5.1

1 0

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

21 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 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (commit) from da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

21 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 6c635d76a042add78f65f732928c2f10c2e5567a (commit) via c7e4d10df378ec12e9e47bb05120778ea98015e1 (commit) via 2020e6297b021946c31c1e46b6ede3c4734ef85d (commit) via 2c2596177d88a60cbef8154927f847ca214aadd0 (commit) via 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 (commit) via 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c (commit) via 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b (commit) via da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (commit) from f9582c7df223e1eb4078e6db4e2d35dc0f2bf9be (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 6c635d76a042add78f65f732928c2f10c2e5567a Merge: c7e4d10df378ec12e9e47bb05120778ea98015e1 5ffc1ad3cdb1ec252739c62c9d614aba468bb22c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 20 22:29:20 2009 -0500 Merge branch 'maint' commit c7e4d10df378ec12e9e47bb05120778ea98015e1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 12 00:13:16 2009 +1000 makepkg: allow overriding arch in split packages This allows building a mixture of binary and arch=any packages. Fixes FS#15955. The value of CARCH is no longer overridden to "any" in when arch=any is used and the assigning of the "any" arch is delayed to during the packaging stage. Adjustments were required to fix installing and checking for pre-built packages of varing arches. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2020e6297b021946c31c1e46b6ede3c4734ef85d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 22:32:22 2009 +1000 makepkg: allow overriding pkgver and pkgrel in split packages Fixing a single package within a split package requires the overriding or pkgrel. In very rare (but existing) cases, it is useful to override pkgver. Partial fix for FS#15955. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c2596177d88a60cbef8154927f847ca214aadd0 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Oct 12 23:05:36 2009 +0200 dload.c : clear sigaction flag to make valgrind happy This fixes the following valgrind warning : ==26831== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc04 is on thread 1's stack ==26831== ==26831== Syscall param rt_sigaction(act->sa_restorer) points to uninitialised byte(s) ==26831== at 0x4282547: __libc_sigaction (in /lib/libc-2.10.1.so) ==26831== by 0x403C693: download_internal (dload.c:152) ==26831== by 0x403D0E4: _alpm_download_single_file (dload.c:311) ==26831== by 0x4033B72: alpm_db_update (be_files.c:319) ==26831== by 0x805205E: pacman_sync (sync.c:257) ==26831== by 0x804EE54: main (pacman.c:1120) ==26831== Address 0xbec6cc08 is on thread 1's stack ==26831== Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d67d9b16c53fe70c1b7149b5a6bfbbf17522ba3 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Oct 20 15:44:00 2009 +0200 makepkg, repo-add: replace external commands with bash substitutions where possible This also removes the awk dependency from makepkg and repo-add. 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 4281a1a7f2d24cfcf0997122cc75c216a17f3e5b Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Sat Oct 17 23:12:19 2009 +0200 Size handling was changed in fgets() functions Pacman's fgets function in the API used hardcoded numbers to identify the size. This is not good practice, so replace them with sizeof handling. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 3 ++ doc/PKGBUILD.5.txt | 6 ++-- lib/libalpm/be_files.c | 49 +++++++++++++------------- lib/libalpm/dload.c | 1 + lib/libalpm/trans.c | 3 +- po/el.po | 8 ++-- po/zh_CN.po | 4 +- scripts/makepkg.sh.in | 91 +++++++++++++++++++++++++++-------------------- scripts/repo-add.sh.in | 6 ++- src/pacman/util.c | 3 +- 10 files changed, 98 insertions(+), 76 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] zh_CN issues in makepkg
by Allan McRae 20 Oct '09

20 Oct '09

Hi, Currently makepkg can not run in zh_CN due to (at least) this translated string: msgid "Extracting %s with %s" msgstr "正在使用 %2$s 解压缩 %1$s" The issue is due to bash not being able to handle positional parameters (1$ and 2$) as "$" are special characters to bash. Is there a way to translate this string without changing the order of the strings? Allan

2 2