- Arch-dev-public - lists.archlinux.org

[arch-dev-public] [signoff] sudo-1.7.2p3-1
by Allan McRae 18 Feb '10

18 Feb '10

Upstream update. Signoff both, Allan

4 3

[arch-dev-public] [PATCH] we need to source the config file first
by Pierre Schmitz 18 Feb '10

18 Feb '10

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- misc-scripts/ftpdir-cleanup | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index 0d13805..6a69d72 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -5,8 +5,6 @@ if [ $# -ne 2 ]; then exit 1 fi -${CLEANUP_DRYRUN} && echo 'dry run mode is active' - reponame=$1 dest=$2 @@ -15,6 +13,8 @@ dest=$2 . "$(dirname $0)/../db-functions" . "$(dirname $0)/../config" +${CLEANUP_DRYRUN} && echo 'dry run mode is active' + ftppath_base="$FTP_BASE/$reponame/$FTP_OS_SUFFIX" for arch in ${ARCHES[@]}; do -- 1.7.0 -- Pierre Schmitz, https://users.archlinux.de/~pierre

1 0

[arch-dev-public] [PATCH] add dry run option to ftpdir-cleanup
by Pierre Schmitz 18 Feb '10

18 Feb '10

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- config | 1 + misc-scripts/ftpdir-cleanup | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config b/config index 6343bc0..8e582d9 100644 --- a/config +++ b/config @@ -5,6 +5,7 @@ FTP_OS_SUFFIX="os" SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" +CLEANUP_DRYRUN=false SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" STAGING="$HOME/staging" diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index f0f89a3..0d13805 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -5,6 +5,8 @@ if [ $# -ne 2 ]; then exit 1 fi +${CLEANUP_DRYRUN} && echo 'dry run mode is active' + reponame=$1 dest=$2 @@ -93,7 +95,7 @@ for arch in ${ARCHES[@]}; do for mf in $missfiles; do if [ -e "${ftppath_base}/any/${mf}" ]; then echo "Restoring missing 'any' symlink: ${mf}" - ln -s "../any/${mf}" "${ftppath}" + ${CLEANUP_DRYRUN} || ln -s "../any/${mf}" "${ftppath}" else MISSINGFILES="${MISSINGFILES} ${mf}" fi @@ -141,17 +143,17 @@ for arch in ${ARCHES[@]}; do fi if [ -n "${DELETEFILES}" ]; then - mv ${DELETEFILES} "$dest" + ${CLEANUP_DRYRUN} || mv ${DELETEFILES} "$dest" echo "" fi if [ -n "${DELETESYMLINKS}" ]; then - rm -f ${DELETESYMLINKS} + ${CLEANUP_DRYRUN} || rm -f ${DELETESYMLINKS} echo "" fi if [ -n "${EXTRAFILES}" ]; then - mv ${EXTRAFILES} "$dest" + ${CLEANUP_DRYRUN} || mv ${EXTRAFILES} "$dest" echo "" fi @@ -189,6 +191,6 @@ fi if [ -d "$ftppath_base/any" -a -n "${ARCHINDEPFILES}" ]; then cd "$ftppath_base/any" - mv ${ARCHINDEPFILES} "$dest" + ${CLEANUP_DRYRUN} || mv ${ARCHINDEPFILES} "$dest" echo "" fi -- 1.7.0 -- Pierre Schmitz, https://users.archlinux.de/~pierre

1 0

[arch-dev-public] [PATCH] Support xz compressed packages
by Pierre Schmitz 17 Feb '10

17 Feb '10

This simple patch allows us to slowly migrate to xz compressed packages. New packages have to be xz compressed while old ones may keep their current compression until they will be replaced by an update. The *.pkg.tar.* naming scheme has to be kept. I also removed the convert-to-any which we don't need. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- config | 3 +- convert-to-any | 71 ------------------------------------------- cron-jobs/create-filelists | 2 +- cron-jobs/sourceballs | 4 +- db-move | 4 +- misc-scripts/ftpdir-cleanup | 7 ++-- 6 files changed, 10 insertions(+), 81 deletions(-) delete mode 100755 convert-to-any diff --git a/config b/config index 92def37..7132d0b 100644 --- a/config +++ b/config @@ -12,7 +12,8 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" -PKGEXT=".pkg.tar.gz" +# has to match .pkg.tar.* +PKGEXT=".pkg.tar.xz" SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array diff --git a/convert-to-any b/convert-to-any deleted file mode 100755 index 53d1a7b..0000000 --- a/convert-to-any +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# -# Converts an existing architecture-independent package -# for i686 or x86_64 into a package with "arch = any" -# - -# -- Abhishek Dasgupta <abhidg(a)gmail.com> - -[ "$UID" = "" ] && UID=$(uid) -OUTDIR="$(pwd)" -WORKDIR="/tmp/convert-to-any.$UID" - -if [ $# -ne 1 ]; then - echo "Syntax: $(basename $0) <package-file>" - exit 1 -fi - -. "$(dirname $0)/db-functions" -. "$(dirname $0)/config" - -cleanup() { - trap '' 0 2 - rm -rf "$WORKDIR" - [ "$1" ] && exit $1 -} - -ctrl_c() { - echo "Interrupted" >&2 - cleanup 0 -} - -die() { - echo "$*" >&2 - cleanup 1 -} - -mkdir -p "$WORKDIR/build" - -oldpkgname="$1" - -if [ -z "$oldpkgname" ]; then - die "convert-to-any: which package to convert?" -fi - -pkg="$(basename $oldpkgname)" -newpkgname=$(echo $pkg | sed "s/-$i686\|x86_64$$PKGEXT/-any$PKGEXT/") - -if ! cp "$oldpkgname" "$WORKDIR/build/$pkg"; then - die "convert-to-any: failed to copy package to $WORKDIR" -fi -pushd "$WORKDIR/build" >/dev/null - -# Conversion of i686 package into "any" package. -mkdir -p package -if ! fakeroot bsdtar xf "$pkg" -C package; then - die "convert-to-any: error in extracting $oldpkgname" -fi - -sed -i "s/arch = $i686\|x86_64$/arch = any/g" package/.PKGINFO -pushd package >/dev/null -case "$newpkgname" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; - *) die "$newpkgname does not have a valid archive extension." ;; -esac -fakeroot bsdtar c${TAR_OPT}f "$OUTDIR/$newpkgname" .PKGINFO * -popd >/dev/null - -popd >/dev/null -cleanup diff --git a/cron-jobs/create-filelists b/cron-jobs/create-filelists index c9d7db9..62e72c1 100755 --- a/cron-jobs/create-filelists +++ b/cron-jobs/create-filelists @@ -44,7 +44,7 @@ for repo in $repos; do fi # create file lists - for pkg in $repodir/*${PKGEXT}; do + for pkg in $repodir/*.pkg.tar.*; do pkgname="$(getpkgname "$pkg")" pkgver="$(getpkgver "$pkg")" tmppkgdir="${TMPDIR}/${repodir}/${pkgname}-${pkgver}" diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index b7a4885..f08d349 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -47,11 +47,11 @@ for repo in $repos; do continue fi cd $ftppath - for pkg in *$PKGEXT; do + for pkg in *.pkg.tar.*; do [ -f "$pkg" ] || continue pkgbase=$(getpkgbase $pkg) srcpath="$srcbase/" - srcpkg="${pkg//$PKGEXT/$SRCEXT}" + srcpkg="${pkg//.pkg.tar.*/$SRCEXT}" srcpkg="${srcpkg//-$arch/}" srcpkgname="${srcpkg%-*-*$SRCEXT}" srcpkgbase="${srcpkg/$srcpkgname/$pkgbase}" diff --git a/db-move b/db-move index efd54e0..3539a47 100755 --- a/db-move +++ b/db-move @@ -58,7 +58,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then . "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT" for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + _pkgfile="$i-$pkgver-$pkgrel-$_arch.pkg.tar.*" if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then die "error: package file '$_pkgfile' not found in repo '$repofrom'" fi @@ -107,7 +107,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then #use '*' to move the old DB too mv $repoto$DBEXT* $ftppath_to/$architecture for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + _pkgfile="$i-$pkgver-$pkgrel-$_arch.pkg.tar.*" if [ "${_arch}" == "any" ]; then mv ${_pkgfile} $ftppath_to/any ln -s ../any/${_pkgfile} $ftppath_to/$architecture/ diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index f0f89a3..62eec9f 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -51,7 +51,6 @@ for arch in ${ARCHES[@]}; do for pkg in $TMPDIR/*; do filename=$(grep -A1 '^%FILENAME%$' "${pkg}/desc" | tail -n1) - [ -z "${filename}" ] && filename="${pkg}${PKGEXT}" if [ ! -e "${filename}" ]; then MISSINGFILES="${MISSINGFILES} ${filename}" @@ -69,7 +68,7 @@ for arch in ${ARCHES[@]}; do fi done - for pkg in *$PKGEXT; do + for pkg in *.pkg.tar.*; do if [ ! -e "$pkg" ]; then continue fi @@ -161,8 +160,8 @@ ARCHINDEPFILES="" if [ -d "$ftppath_base/any" ]; then cd "$ftppath_base/any" - for pkg in *$PKGEXT; do - [ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.gz" + for pkg in *.pkg.tar.*; do + [ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.*" found=0 #check for any existing symlinks for arch in ${ARCHES[@]}; do -- 1.6.6.1 Pierre Schmitz, https://users.archlinux.de/~pierre

6 30

[arch-dev-public] [signoff] devtools 0.9.1
by Pierre Schmitz 17 Feb '10

17 Feb '10

Am Samstag, 13. Februar 2010 00:18:30 schrieb Eric Bélanger: > I found the cause of this error. This error happens when the CacheDir > is undefined. The chroot_mount function in mkarchroot then fails to > create the cache_dir directory. It should be fixed by the commit to > give cache_dir a default value. Thanks, that explains a lot. I have put 0.9.1 into [testing] fixing this issue and being a little more verbose when an action might take longer (like svn commit) -- Pierre Schmitz, https://users.archlinux.de/~pierre

6 23

[arch-dev-public] [PATCH 1/2] remove unused script
by Pierre Schmitz 16 Feb '10

16 Feb '10

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- convert-to-any | 71 -------------------------------------------------------- 1 files changed, 0 insertions(+), 71 deletions(-) delete mode 100755 convert-to-any diff --git a/convert-to-any b/convert-to-any deleted file mode 100755 index 53d1a7b..0000000 --- a/convert-to-any +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# -# Converts an existing architecture-independent package -# for i686 or x86_64 into a package with "arch = any" -# - -# -- Abhishek Dasgupta <abhidg(a)gmail.com> - -[ "$UID" = "" ] && UID=$(uid) -OUTDIR="$(pwd)" -WORKDIR="/tmp/convert-to-any.$UID" - -if [ $# -ne 1 ]; then - echo "Syntax: $(basename $0) <package-file>" - exit 1 -fi - -. "$(dirname $0)/db-functions" -. "$(dirname $0)/config" - -cleanup() { - trap '' 0 2 - rm -rf "$WORKDIR" - [ "$1" ] && exit $1 -} - -ctrl_c() { - echo "Interrupted" >&2 - cleanup 0 -} - -die() { - echo "$*" >&2 - cleanup 1 -} - -mkdir -p "$WORKDIR/build" - -oldpkgname="$1" - -if [ -z "$oldpkgname" ]; then - die "convert-to-any: which package to convert?" -fi - -pkg="$(basename $oldpkgname)" -newpkgname=$(echo $pkg | sed "s/-$i686\|x86_64$$PKGEXT/-any$PKGEXT/") - -if ! cp "$oldpkgname" "$WORKDIR/build/$pkg"; then - die "convert-to-any: failed to copy package to $WORKDIR" -fi -pushd "$WORKDIR/build" >/dev/null - -# Conversion of i686 package into "any" package. -mkdir -p package -if ! fakeroot bsdtar xf "$pkg" -C package; then - die "convert-to-any: error in extracting $oldpkgname" -fi - -sed -i "s/arch = $i686\|x86_64$/arch = any/g" package/.PKGINFO -pushd package >/dev/null -case "$newpkgname" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; - *) die "$newpkgname does not have a valid archive extension." ;; -esac -fakeroot bsdtar c${TAR_OPT}f "$OUTDIR/$newpkgname" .PKGINFO * -popd >/dev/null - -popd >/dev/null -cleanup -- 1.6.6.1 -- Pierre Schmitz, https://users.archlinux.de/~pierre

1 0

[arch-dev-public] Let's agree on a common coding style
by Pierre Schmitz 15 Feb '10

15 Feb '10

Hi all, while looking at our devtools, other scripts we have written together and even PKGBUILDs, you will see as much different types of indention, bracing etc. as there are authors. This always annoyed me and as I just watched Greg's talk at fosdem about committing kernel patches I'll go ahead and will start with devtools. I would suggest to use this coding style: * indent with tabs * tabs have 8 characters * don't use more than 132 columns * opening braces are top right, closing are bottom left: function foo() { echo bar } * if and for statements are like this: if true; then do something else do something else fi for i in a b c; do echo $i done * use single quotes if a string does not parseable content We could also talk about using `` or $(); source vs. .; $foo vs. ${bar} etc.. But that's probably too much. Greetings, Pierre -- Pierre Schmitz, https://users.archlinux.de/~pierre

6 14

[arch-dev-public] devtools and db-scripts plans
by Allan McRae 15 Feb '10

15 Feb '10

Hi all, There has been talk about what is needed/wanted for the future of devtools and db-scripts but not much done lately. So I thought I would get together a list of ideas so we could perhaps do a coding sprint to implement them. Here is what I have got so far: devtools - split-PKGBUILDs with (supported in future pacman): -> both binary and arch=any packages -> overridden pkgver -> overridden pkgrel (and only selected sub-packages) - support for xz compression (nothing needed?) db-scripts - support for xz compression transition (e.g. in clean-up script) - support for single "package" directory with symlinks to repos - allow db-move to handle multiple packages (or add a script to help moving from community-testing) - delta support... Any others? Allan

7 12

[arch-dev-public] Files database, potential changes
by Dan McGee 15 Feb '10

15 Feb '10

So right now we have our create-filelists cronjob in the dbscripts pumping out files databases. This is great, except that the file is a lot less useful to automated processes than you would think. If you hadn't guessed yet, I'm trying to get this stuff back in the website. I have it working about 90% locally but the last 10% is the key. The problem stems from our old single-arch, no-any packages mentality. The files DB simply doesn't have enough information to match up a *complete* package specification with its files due to these busted assumptions. Although we can parse the pkgname and pkgver from the directory names in the zip, we have no idea what is an 'any' package and what is an arch-specific package. Since every package is unique on the tuple of (pkgname, repo, arch), we are missing one of the three components here in this database. One thought is to actually implement the hack into create-filelists as I currently do when parsing the files DB: if type == 'files' and fname == 'files': # we don't have desc to provide us with name/version here, # so we need to do some of the work on our own. dirname = os.path.split(tarinfo.name)[0] tpkg.write('%NAME%\n') tpkg.write('-'.join(dirname.split('-')[:-2])) tpkg.write('\n\n%VERSION%\n') tpkg.write('-'.join(dirname.split('-')[-2:])) tpkg.write('\n\n%ARCH%\n') tpkg.write('i686\n') These are the required attributes to get a full package spec. Does anyone object to placing a desc file inside the files database holding this information to make it easier for tools to work with our multi-architecture ecosystem these days? Or if you have a better idea than the above, I would of course be up for that as well. -Dan

4 3

[arch-dev-public] signoff: vi 050325-2
by Paul Mattal 15 Feb '10

15 Feb '10

This fix just adds a patch to increase the TUBECOLS and TUBESIZE such that vi will work on larger terminals with default settings/variables set. Those of use with large console widths have been excited about this fix: http://bugs.archlinux.org/task/15844 Please signoff both arches. I've tested myself on each arch, so need one more on each arch. - P

3 3