- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: canonicalize paths from environmental variables
by Allan McRae 05 Oct '10

05 Oct '10

This prevents circular symlinks and weird final package locations when using commands like 'PKGDEST="." makepkg'. Fixes FS#20922. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9bcd446..ccf4213 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1410,6 +1410,19 @@ run_split_packaging() { done } +# Canonicalize a path if it exists +canonicalize_path() { + local path=$1; + + if [[ -d $path ]]; then + cd $path + path=$(pwd) + cd - &>/dev/null + fi + + echo $path +} + # getopt like parser parse_options() { local short_options=$1; shift; @@ -1615,10 +1628,10 @@ while true; do shift done -#preserve environment variables -_PKGDEST=${PKGDEST} -_SRCDEST=${SRCDEST} -_SRCPKGDEST=${SRCPKGDEST} +# preserve environment variables and canonicalize path +[[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) +[[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) +[[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(canonicalize_path ${SRCPKGDEST}) # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -- 1.7.3.1

4 5

Re: [pacman-dev] Groups. Again.
by Xavier 04 Oct '10

04 Oct '10

Hi list Jakob and I have been going back and forth about where groups handlings should be, in backend or frontend, and how alpm interface should look like. It turns out Jakob has several arguments for the group backend solution, and he spent quite some time working on it, improving and fixing things. This solution fixes several flaws that pacman currently has without drastically changing the code. There are just two disappointing aspects that Jakob covered below in bad news. Also there are still some points I would like to see improved, but more aesthetic than real issues, so low priority. I was going to cover them here, but this will just confuse things and would deserve its own topic/discussion. Jakob Gruber wrote: > Hi Xavier, > > here is yet another revision of the group patches. > > http://github.com/schuay/pacman-arch/commits/group_backend > > This time it should be easier to see what is actually being done. > The commit messages aren't final, I can elaborate on them if the > patches are accepted. > > Changes from the last time (as far as I can remember): > > * use sync_pkg directly for group members and explicitly check if > package is ignored > * use a temporary alpm_list_t instead of a temporary pmgrp_t > * altered few more function signatures to use 'const char *' instead > of 'char *' > * skip to next repo if current repo/group contains only packages > already processed in another repo > > Now to the bad news: > > The repo name ( = db name) is passed to the 'Install whole content > from ...' callback but not to 'group ....:: Members: pkg1 pkg2'. > This results in the following output: http://pastebin.com/LpG0MKSc > This is a little inconsistent, but it's still clear what's going on > IMO. What do you think, is this acceptable? > > Found out yesterday evening that clyde handles new callback values > rather ungracefully. It aborts when it encounters unknown callback > enum values (see > http://github.com/Kiwi/clyde/blob/master//lualpm.c#L2032) It does > the same for all callback enums, pmtransevt, pmloglevel, ... > I opened an issue on their github site about it. This sucks, but I > think it's a bad decision by the clyde developers and should be > changed by them. > > Cheers, > Jakob

4 8

[pacman-dev] [PATCH] makepkg: canonicalize paths from environmental variables
by Allan McRae 04 Oct '10

04 Oct '10

This prevents circular symlinks and weird final package locations when using commands like 'PKGDEST="." makepkg'. Fixes FS#20922. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that this adds readlink as a dependency to makepkg. That is provided by coreutils which is essential anyway so I do not think this is an issue. scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 01d73f8..9c85d21 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1616,10 +1616,10 @@ while true; do shift done -#preserve environment variables -_PKGDEST=${PKGDEST} -_SRCDEST=${SRCDEST} -_SRCPKGDEST=${SRCPKGDEST} +# preserve environment variables and canonicalize path +[[ -n ${PKGDEST} ]] && _PKGDEST=$(readlink -f ${PKGDEST}) +[[ -n ${SRCDEST} ]] && _SRCDEST=$(readlink -f ${SRCDEST}) +[[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(readlink -f ${SRCPKGDEST}) # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -- 1.7.3

5 11

[pacman-dev] [PATCH] makepkg: improve srcdir check and add pkgdir
by Allan McRae 02 Oct '10

02 Oct '10

The checking of the package for $srcdir references was overly sensitive and gave a lot of what appear to be false positives with binary files (in particular with debugging symbols kept). Restrict the search for $srcdir to non-binary files as this should still catch the majority of configuration issues the check was initially designed to catch. Also, add a similar check for $pkgdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed1380d..01d73f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -972,10 +972,15 @@ check_package() { fi done - # check for references to the build directory - if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then + # check for references to the build and package directory + local filelist=$(find "${pkgdir}" -type f) + if grep -q -I "${srcdir}" $filelist; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi + if grep -q -I "${pkgdir}" $filelist; then + warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + fi + } create_package() { -- 1.7.3

6 16

[pacman-dev] [PATCH] makepkg: remove STRIP_DIRS
by Allan McRae 29 Sep '10

29 Sep '10

For binary packages, the majority of the time used in the debugs symbol stripping process is the actual stripping of the binaries/libraries and not the testing of which files to strip. This allows more complete stripping of packages that install to "non-standard" paths that would not be generally included in makepkg.conf. Any performance hit that may be apparent for (_large_) "arch=('any')" packages can readily be avoided by disabling stripping in the PKGBUILD options array. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 7 ------- etc/makepkg.conf.in | 4 +--- scripts/makepkg.sh.in | 4 ++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 753b179..4700d9c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -160,13 +160,6 @@ Options that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. -**STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**:: - If `strip` is specified in the OPTIONS array, this variable will - instruct makepkg where to look to for files to strip. If you build - packages that are located in opt/, you may need to add the directory - to this array. *NOTE:* Do not add the leading slash to the directory - name. - **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: If `purge` is specified in the OPTIONS array, this variable will instruct makepkg which files to remove from the package. This is diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..c795432 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -61,7 +61,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages @@ -82,8 +82,6 @@ STRIP_STATIC="@STRIP_STATIC@" MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index de24338..ed1380d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -874,13 +874,13 @@ tidy_install() { done fi - if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then + if [[ $(check_option strip) = y ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" local binary - find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do + find . -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip $STRIP_SHARED "$binary";; -- 1.7.3

2 1

[pacman-dev] python-2.7 and pacman test-suite
by Allan McRae 28 Sep '10

28 Sep '10

Just a heads up that the test-suite does not enjoy python-2.7... Total = 200 Pass = 82 ( 41.00%) Expected Fail = 6 ( 3.00%) Unexpected Pass = 2 ( 1.00%) Fail = 110 ( 55.00%) Although, we do get two bug fixes for free! Allan

4 9

[pacman-dev] autoconf-2.68 introduces a warning
by Allan McRae 28 Sep '10

28 Sep '10

Autoconf-2.68 gives us this warning with pacman: > ./autogen.sh + aclocal configure.ac:128: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... acinclude.m4:265: _LT_AC_SYS_LIBPATH_AIX is expanded from... acinclude.m4:3807: AC_LIBTOOL_PROG_LD_SHLIBS is expanded from... acinclude.m4:2583: _LT_AC_LANG_C_CONFIG is expanded from... acinclude.m4:2582: AC_LIBTOOL_LANG_C_CONFIG is expanded from... acinclude.m4:54: AC_LIBTOOL_SETUP is expanded from... acinclude.m4:37: _AC_PROG_LIBTOOL is expanded from... acinclude.m4:30: AC_PROG_LIBTOOL is expanded from... configure.ac:128: the top level ... The relevant upstream commit is: http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=1e604ecf I am not likely to fix this in the near future so if someone else wants to submit a patch... Allan

3 7

[pacman-dev] [PATCH 2/9] Check for python-2.7
by Allan McRae 28 Sep '10

28 Sep '10

Add python-2.7 to the list of checked versions of python and add a check for a python2 binary before resorting to the unversioned python binary. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- To be applied after Rémy's fix. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 2a6ab08..e709fc4 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL -AC_CHECK_PROGS([PYTHON], [python2.6 python2.5 python], [false]) +AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) # find installed gettext AM_GNU_GETTEXT([external]) -- 1.7.3

1 0

[pacman-dev] [PATCH 0/5] Group handling
by Jakob Gruber 27 Sep '10

27 Sep '10

This patch series adds support for manual group member selection during 'pacman -S <group>' operations (FS#19853). It also fixes FS#19854, adds 2 tests for FS#19854 and FS#15141, and corrects the existing test for FS#20221 (all of these are related to groups). Also available at http://github.com/schuay/pacman-arch/commits/group_backend I'm fairly unfamiliar with both C and the pacman codebase, so please check these patches thoroughly. Jakob Gruber (5): Tests: Adjust sync023 to correctly test FS#20221 Tests: Sync group which includes ignored pkgs Tests: '-S repo/group' syntax Reimplement advanced group handling Split group handling into separate function lib/libalpm/alpm.h | 11 ++++- lib/libalpm/sync.c | 91 +++++++++++++++++++++++++++++---------- src/pacman/callback.c | 21 +++++++++ src/pacman/util.c | 12 ++++- test/pacman/tests/ignore007.py | 21 +++++++++ test/pacman/tests/sync023.py | 7 ++- test/pacman/tests/sync024.py | 23 ++++++++++ 7 files changed, 154 insertions(+), 32 deletions(-) create mode 100644 test/pacman/tests/ignore007.py create mode 100644 test/pacman/tests/sync024.py -- 1.7.3

3 13

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-74-gf7895cc
by dan＠archlinux.org 27 Sep '10

27 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, master has been updated via f7895cc188e221c064aac475908a09d2f50b8d38 (commit) via dff06a817016996f414b547fa8db011436bbc63f (commit) via 900605912b32d08ece7a3e80e4c6b258485676b7 (commit) via 28c662e7a422314475cca61663695dd31fd86546 (commit) via 879fed50985e511bba153c94d133f376e8f96484 (commit) via f489e969f0ca65fe210678844fabddd29a7597e1 (commit) via 413508c6fa54f465cdcf021a59ee7e6a38d5b1e7 (commit) via af31fd6494994fa76f26b94423109b4b21a1f663 (commit) via 541f183cd680737d638fdb2fa5e46aa824cd5f3f (commit) via d2ff8f4b962b34bb4a9f07f8d7823e65bba0958f (commit) via fd38319106789e2239d2d31208e463aad8e11a8e (commit) from d201d1f312308b91eff78cb20a148146c3f1188c (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 f7895cc188e221c064aac475908a09d2f50b8d38 Merge: dff06a8 fd38319 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 27 09:24:28 2010 -0500 Merge branch 'maint' commit dff06a817016996f414b547fa8db011436bbc63f Merge: 9006059 f489e96 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 27 09:21:02 2010 -0500 Merge branch 'build-system' commit 900605912b32d08ece7a3e80e4c6b258485676b7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 27 16:04:10 2010 +1000 Add FORTIFY_SOURCE support 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> commit 28c662e7a422314475cca61663695dd31fd86546 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 27 15:30:39 2010 +1000 Add wrapper around asprintf calls 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> commit 879fed50985e511bba153c94d133f376e8f96484 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 8 11:54:33 2010 +1000 repo-add: make --quiet output more quiet Fixes FS#20403. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f489e969f0ca65fe210678844fabddd29a7597e1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 23 09:10:47 2010 -0500 Update build system (automake, autoconf, libtool) Unfortunately this patch is hard to split up into smaller chunks. Our build system and the associated automake/autoconf/libtool macros has been left untouched for a while, and could use a refresher. * Upgrade ltmain.sh to the latest version * Move away from a huge acinclude.m4 directory to using individual files in the m4/ subdirectory, suggested by upstream automake documentation * Update all macros to their latest available version * Adjust Makefile.am and autogen.sh to accommodate m4/ subdirectory Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 413508c6fa54f465cdcf021a59ee7e6a38d5b1e7 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 23 09:08:28 2010 -0500 Update more supplementary build scripts Signed-off-by: Dan McGee <dan(a)archlinux.org> commit af31fd6494994fa76f26b94423109b4b21a1f663 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 27 17:54:55 2010 -0500 Update config.guess and config.sub Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 541f183cd680737d638fdb2fa5e46aa824cd5f3f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 27 17:50:22 2010 -0500 Clean up root .gitignore We had a few files listed in here that we have checked in to our repo, which doesn't make a whole lot of sense. Also alphabetize the list while we are at it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2ff8f4b962b34bb4a9f07f8d7823e65bba0958f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 27 17:43:00 2010 -0500 Update gettext Makefiles to 0.18 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fd38319106789e2239d2d31208e463aad8e11a8e Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 15 23:36:57 2010 +1000 bacman: unify package creation with makepkg 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 27 +- Makefile.am | 2 + acinclude.m4 | 4895 +-------------- autogen.sh | 2 +- config.guess | 255 +- config.sub | 159 +- configure.ac | 3 +- contrib/bacman | 44 +- depcomp | 116 +- install-sh | 237 +- lib/libalpm/po/Makefile.in.in | 167 +- ltmain.sh |14812 ++++++++++++++++++++++++----------------- m4/gettext.m4 | 383 ++ m4/iconv.m4 | 214 + m4/intlmacosx.m4 | 51 + m4/lib-ld.m4 | 110 + m4/lib-link.m4 | 774 +++ m4/lib-prefix.m4 | 224 + m4/libtool.m4 | 7831 ++++++++++++++++++++++ m4/ltoptions.m4 | 369 + m4/ltsugar.m4 | 123 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 98 + m4/nls.m4 | 32 + m4/po.m4 | 449 ++ m4/progtest.m4 | 92 + missing | 49 +- mkinstalldirs | 5 +- po/Makefile.in.in | 167 +- scripts/repo-add.sh.in | 1 + src/pacman/util.c | 38 +- src/pacman/util.h | 1 + 32 files changed, 20353 insertions(+), 11400 deletions(-) mode change 100644 => 100755 ltmain.sh create mode 100644 m4/gettext.m4 create mode 100644 m4/iconv.m4 create mode 100644 m4/intlmacosx.m4 create mode 100644 m4/lib-ld.m4 create mode 100644 m4/lib-link.m4 create mode 100644 m4/lib-prefix.m4 create mode 100644 m4/libtool.m4 create mode 100644 m4/ltoptions.m4 create mode 100644 m4/ltsugar.m4 create mode 100644 m4/ltversion.m4 create mode 100644 m4/lt~obsolete.m4 create mode 100644 m4/nls.m4 create mode 100644 m4/po.m4 create mode 100644 m4/progtest.m4 hooks/post-receive -- The official pacman repository

1 0