- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Introduce restrict option
by Allan McRae 08 Dec '08

08 Dec '08

The restrict option, combined with the RESTRICTED_FILES variable, allows makepkg to automatically remove common confliting files (e.g. /usr/share/info/dir). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 8 ++++++++ etc/makepkg.conf.in | 7 +++++-- scripts/makepkg.sh.in | 8 ++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 18dbf35..84e8192 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -125,6 +125,9 @@ Options *zipman*;; Compress manual (man and info) pages with gzip. + *restrict*;; + Remove restricted files from the package. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: @@ -150,6 +153,11 @@ Options to this array. *NOTE:* Do not add the leading slash to the directory name. +**RESTRICTED_FILES=(**usr/{,share}/info/dir ...**)**:: + If "restrict" is specified in the OPTIONS array, this variable will + instruct makepkg which files to remove from the package. This is + useful for index files that are added to by multiple packages. + **PKGDEST=**"/path/to/folder":: If this value is not set, packages will by default be placed in the current directory (location of the linkman:PKGBUILD[5]). Many people diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 82722be..545a215 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -58,7 +58,7 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip !docs libtool emptydirs zipman) +# Default: OPTIONS=(strip !docs libtool emptydirs zipman restrict) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -66,8 +66,9 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages with gzip +#-- restrict: Remove files sepecified below from package # -OPTIONS=(strip !docs libtool emptydirs zipman) +OPTIONS=(strip !docs libtool emptydirs zipman restrict) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -77,6 +78,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) +#-- Files to be removed from all packages +RESTRICTED_FILES=(usr/{,share}/info/dir) ######################################################################### # PACKAGE OUTPUT diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bf6524d..ea27883 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -41,7 +41,7 @@ confdir='@sysconfdir@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'restrict') other_options=('ccache' 'distcc' 'makeflags' 'force') readonly -a packaging_options other_options @@ -792,7 +792,6 @@ tidy_install() { done fi - if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" local binary @@ -818,6 +817,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if [ "$(check_option restrict)" = "y" -a -n "RESTRICTED_FILES" ]; then + msg2 "$(gettext "Removing restricted files...")" + rm -f ${RESTRICTED_FILES[@]} + fi + if [ "$(check_option emptydirs)" = "n" ]; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete -- 1.6.0.4

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-59-gbd62827
by dan＠archlinux.org 08 Dec '08

08 Dec '08

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 bd628274cc8db81704860e69894fcd217c2068d0 (commit) via 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d (commit) via 818fae320f22ea758765a55b3a3a98e2f0a66a45 (commit) via 69be73f68cc770ddcbe388af96e32f8bba7886f7 (commit) via 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (commit) via 59776ef306935399b2bf1e9cbdd7a7bfa6df1b49 (commit) via b373b1d16b6235bef2e34a9a21e043418222a813 (commit) from 61c6552862345cb155903cd1566f1cef5c527a94 (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 bd628274cc8db81704860e69894fcd217c2068d0 Merge: 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 7 22:12:17 2008 -0600 Merge branch 'maint' commit 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Thu Dec 4 21:03:31 2008 -0600 Update Italian translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 818fae320f22ea758765a55b3a3a98e2f0a66a45 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 6 23:32:34 2008 -0600 makepkg: ensure PKGBUILD does not contain CRLF characters Do a simple check before sourcing the file to ensure we are a valid bash script. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69be73f68cc770ddcbe388af96e32f8bba7886f7 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 14 03:08:52 2008 +1000 makepkg: several small bits of tidying 1. Do not warn people about missing arch if they are using --ignorearch. 2. Remove unneed reference to bug report about using fakeroot as little as possible. We want to do that, bug report of not. 3. Removes superfluous warning given when building as root. The user has already used the "--asroot" flag. 4. Move comment about skipping warning message to above where it occurs 5. Do not warn about skipping source retreval, integrety checks and extraction when using --repackage 6. Do not warn about skipping build when using --repackage 7. Move comment about fakeroot usage to above test condition Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pactree | 3 +- doc/PKGBUILD.5.txt | 2 +- doc/repo-add.8.txt | 4 +- po/it.po | 141 +++++++++++++++++++++++-------------------------- scripts/makepkg.sh.in | 41 +++++++-------- 5 files changed, 90 insertions(+), 101 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-25-g78cf32e
by dan＠archlinux.org 08 Dec '08

08 Dec '08

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 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (commit) via 59776ef306935399b2bf1e9cbdd7a7bfa6df1b49 (commit) via b373b1d16b6235bef2e34a9a21e043418222a813 (commit) from a1f7c83dbf3bce492163362d2896e3a4176be616 (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: contrib/pactree | 3 +-- doc/PKGBUILD.5.txt | 2 +- doc/repo-add.8.txt | 4 ++-- scripts/makepkg.sh.in | 4 ++++ 4 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] PKGBUILD.proto - Take2
by Jud 07 Dec '08

07 Dec '08

Hi, Edit: Take2, changed the install line Dan suggested I send this to the pacman-dev list. After completing some research and asking alot of questions I present some minor changes to PKGBUILD.proto supplied as a .diff to be merged after your approval. I believe it helps the intended audience create a better PKGBUILD in less time according to the latest Arch Packaging Standards. Cheers Jud Inline: --- PKGBUILD.proto 2008-12-05 23:32:33.000005000 +1000 +++ PKGBUILD.proto.new 2008-12-07 13:49:43.889569135 +1000 @@ -3,13 +3,15 @@ # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. + # Contributor: Your Name <youremail(a)domain.com> + pkgname=NAME -pkgver=VERSION +pkgver=VERSION # Note: if pkgver is '0.99-10' then use an underscore, i.e. '0.99_10' pkgrel=1 pkgdesc="" -arch=() -url="" +url="http://ADDRESS/" +arch=('i686' 'x86_64') license=('GPL') groups=() depends=() @@ -20,17 +22,13 @@ replaces=() backup=() options=() -install= -source=($pkgname-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' +install=${pkgname}.install +source=(http://ADDRESS/TO/FILE/${pkgname}-${pkgver}.tar.gz) +md5sums=() # Generate with 'makepkg -g' build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr + cd ${srcdir}${pkgname}-${pkgver} + ./configure --prefix=usr make || return 1 - make DESTDIR="$pkgdir/" install + make DESTDIR=${pkgdir} install || return 1 } - -# vim:set ts=2 sw=2 et:

5 6

[pacman-dev] bzip2 package compression
by Mark Constable 07 Dec '08

07 Dec '08

I changed these in /etc/makepkg.conf to bz2 variants ages ago and assumed that the resulting packages would be bzip2 compressed. When I double checked the packages they were still only gzip compressed even though the extension was tar.bz2. Everything works so I didn't pick it up but I'd be interested in the bandwidth saving from bzip2 compression. PKGEXT='.pkg.tar.bz2' SRCEXT='.src.tar.bz2' DB_COMPRESSION='bz2' Is there a reason that a -cjf is not used in makepkg ? % grep bsdtar /usr/bin/makepkg cmd="bsdtar -x -f $file" ;; if ! bsdtar -czf "$pkg_file" $comp_files *; then bsdtar -xOf "$old_file" .PKGINFO > "$pkginfo" || continue if ! bsdtar -czLf "$pkg_file" ${pkgname}; then --markc

2 3

[pacman-dev] [Fwd: [arch-general] PKGBUILD and DOS line endings]
by Allan McRae 07 Dec '08

07 Dec '08

Should we be handling this issue? Allan -------- Original Message -------- Subject: [arch-general] PKGBUILD and DOS line endings Date: Sat, 6 Dec 2008 15:32:26 +0100 From: Alessandro Doro <ordo.ad(a)gmail.com> Reply-To: General Discusson about Arch Linux <arch-general(a)archlinux.org> To: arch-general(a)archlinux.org I found in AUR a PKGBUILD with DOS line endings. See what happens: $ makepkg : command not found ==> ERROR: An unknown error has occured. Exiting... makepkg simply sources "$BUILDSCRIPT" and bash treats '\r' literally. The PKGBUILD maintainer is surely to be blamed and I don't think that `makepkg' should try to catch this error (sorry for some innocent user). Just wanted to expose this "feature". bye

3 2

[pacman-dev] PKGBUILD.proto
by Jud 06 Dec '08

06 Dec '08

Hi, Dan suggested I send this to the pacman-dev list. After completing some research and asking alot of questions I present some minor changes to PKGBUILD.proto supplied as a .diff to be merged after your approval. I believe it helps the intended audience create a better PKGBUILD in less time according to the latest Arch Packaging Standards. Cheers Jud Inline: --- PKGBUILD.proto 2008-12-05 23:32:33.000005000 +1000 +++ PKGBUILD.proto.new 2008-12-05 23:37:45.374547000 +1000 @@ -3,13 +3,15 @@ # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. -# Contributor: Your Name <youremail(a)domain.com> + +# Contributor: Your Name <youremail(a)domain.com> # Use dots only to reduce spam + pkgname=NAME -pkgver=VERSION +pkgver=VERSION # Note: if pkgver is '0.99-10' then use an underscore, i.e. '0.99_10' pkgrel=1 pkgdesc="" -arch=() -url="" +url="http://ADDRESS/" +arch=('i686' 'x86_64') license=('GPL') groups=() depends=() @@ -20,17 +22,13 @@ replaces=() backup=() options=() -install= -source=($pkgname-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' +install=(${pkgname}.install) +source=(http://ADDRESS/TO/FILE/${pkgname}-${pkgver}.tar.gz) +md5sums=() # Generate with 'makepkg -g' build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr + cd ${srcdir}${pkgname}-${pkgver} + ./configure --prefix=usr make || return 1 - make DESTDIR="$pkgdir/" install + make DESTDIR=${pkgdir} install || return 1 } - -# vim:set ts=2 sw=2 et:

4 3

[pacman-dev] [PATCH] makepkg: save and restore shell options before and after build()
by Dan McGee 05 Dec '08

05 Dec '08

Fix the issue uncovered by FS#12344. In this instance, the dotglob shopt was being set in the build() function but never cleared, causing issues in the remaining parts of the makepkg script. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cc255c..25e4cc8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -675,6 +675,8 @@ run_build() { # ensure all necessary build variables are exported export CFLAGS CXXFLAGS MAKEFLAGS CHOST + # save our shell options so build() can't override what we need + local $shellopts=$(shopts -p) local ret=0 if [ "$LOGGING" = "1" ]; then @@ -695,6 +697,8 @@ run_build() { else build 2>&1 || ret=$? fi + # reset our shell options + eval "$shellopts" if [ $ret -gt 0 ]; then error "$(gettext "Build Failed.")" -- 1.6.0.4

3 4

[pacman-dev] [translation] Update Italian translation
by Giovanni Scafora 04 Dec '08

04 Dec '08

Hi guys, there is an update Italian translation of pacman. Thanks. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

1 0

[pacman-dev] [PATCH] contirb/pactree: fix option parsing
by Allan McRae 04 Dec '08

04 Dec '08

The option parsing was catching any "-d" in an arguement so packages with this in their name did not work. Also removed commented code line that appears to be inserted during testing Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/pactree | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/contrib/pactree b/contrib/pactree index d9fa8b3..df53671 100755 --- a/contrib/pactree +++ b/contrib/pactree @@ -208,11 +208,10 @@ for (( n=0 ; n < $len_options ; n++ )); do continue fi - if [[ "${options[$n]}" =~ -d[[:digit:]]* || "${options[$n]}" == "--depth" ]]; then + if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then max_depth="${options[$n]#-d}" elif [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then -# if [ ${options[$((n+1))]} -eq ${options[$((n+1))]} 2>/dev/null ]; then max_depth="${options[$((n+1))]}" unset options[$((n+1))] ((++n)) -- 1.6.0.4

2 1