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

[arch-dev-public] [devtools] [PATCH] read {SRC, PKG}DEST from user makepkg.conf
by Andrea Scarpino 28 Jun '10

28 Jun '10

makechrootpkg does not read SRCDEST and PKGDEST if they are set in ~/.makepkg.conf -- Andrea `bash` Scarpino Arch Linux Developer

5 11

[arch-dev-public] [PATCH 1/3] sourceballs: Make cleanup more efficient
by Eric Bélanger 28 Jun '10

28 Jun '10

Moved all cleanup related code in sourceballs-cleanup script and moved, now common, functions in db-functions. The cleanup script is now ran after all the new sourceballs have been fetched. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- cron-jobs/sourceballs | 2 + db-functions | 21 ++++++++ misc-scripts/make-sourceball | 54 --------------------- misc-scripts/sourceballs-cleanup | 95 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 54 deletions(-) create mode 100755 misc-scripts/sourceballs-cleanup diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index b7a4885..ccb00ad 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -89,4 +89,6 @@ if [ -n "$FAILED_PKGS" ]; then echo -e $FAILED_PKGS | sed "s| |\n|g" | sort -u >> "$srcbase/failed.txt" fi +$dirname/../misc-scripts/sourceballs-cleanup + cleanup diff --git a/db-functions b/db-functions index a4cffd7..ecf53d9 100644 --- a/db-functions +++ b/db-functions @@ -126,4 +126,25 @@ chk_license() { return 1 } +pkgname_from_src() { + local tmp + tmp=${1##*/} + tmp=${tmp%$SRCEXT} + for a in ${ARCHES[@]}; do + tmp=${tmp%-$a} + done + tmp=${tmp%-any} + echo ${tmp%-*-*} +} + +pkgver_from_src() { + tmp=${1##*/} + tmp=${tmp%$SRCEXT} + for a in ${ARCHES[@]}; do + tmp=${tmp%-$a} + done + tmp=${tmp%-any} + echo $tmp | sed 's|.*-$.*-.*$$|\1|g' +} + # vim: set ts=4 sw=4 noet ft=sh: diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 8899fca..610d7f1 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -40,27 +40,6 @@ die() { cleanup 1 } -pkgname_from_src() { - local tmp - tmp=${1##*/} - tmp=${tmp%$SRCEXT} - for a in ${ARCHES[@]}; do - tmp=${tmp%-$a} - done - tmp=${tmp%-any} - echo ${tmp%-*-*} -} - -pkgver_from_src() { - tmp=${1##*/} - tmp=${tmp%$SRCEXT} - for a in ${ARCHES[@]}; do - tmp=${tmp%-$a} - done - tmp=${tmp%-any} - echo $tmp | sed 's|.*-$.*-.*$$|\1|g' -} - create_srcpackage() { if [ -d "$1" ]; then pushd "$1" >/dev/null @@ -94,38 +73,6 @@ create_srcpackage() { fi } -remove_old() { - if [ -d "$1" ]; then - pushd "$1" >/dev/null - PKGVERS="" - for repo in *; do - cd "$repo" - . "$BUILDSCRIPT" - PKGVERS="$PKGVERS $pkgver-$pkgrel" - cd .. - done - - for srcpkg in "$srcpath/$packagename-"*; do - [ -f "$srcpkg" ] || continue - if [ "$(pkgname_from_src $srcpkg)" == "$packagename" ]; then - skip=0 - pver="$(pkgver_from_src $srcpkg)" - for v in $PKGVERS; do - if [ "$v" = "$pver" ]; then - skip=1 - break - fi - done - if [ $skip -ne 1 ]; then - mv "$srcpkg" $SOURCE_CLEANUP_DESTDIR - fi - fi - done - - popd >/dev/null - fi -} - trap ctrl_c 2 trap cleanup 0 1 @@ -135,7 +82,6 @@ set_umask cd "$WORKDIR" if /usr/bin/svn export -q "$SVNREPO/$packagename" $packagename; then - remove_old "$packagename/repos/" create_srcpackage "$packagename/repos/$reponame-$_arch" else die "\tPackage '$packagename' does not exist in repo '$reponame-$_arch'" diff --git a/misc-scripts/sourceballs-cleanup b/misc-scripts/sourceballs-cleanup new file mode 100755 index 0000000..0a1ac4d --- /dev/null +++ b/misc-scripts/sourceballs-cleanup @@ -0,0 +1,95 @@ +#!/bin/bash + +. "$(dirname $0)/../db-functions" +. "$(dirname $0)/../config" + +srcpath="$FTP_BASE/sources/" +logfile="$srcpath/cleanup.txt" + +LOCKFILE="/tmp/.sourceball-cleanup.lock" +WORKDIR="/tmp/sourceball-cleanup.$packagename.$UID" + +cleanup () { + restore_umask + rm -rf "$WORKDIR" + rm -f "$LOCKFILE" + exit 0 +} + +ctrl_c() { + echo "Interrupted" >&2 + cleanup 0 +} + +remove_old() { + if [ -d "$1" ]; then + pushd "$1" >/dev/null + PKGVERS="" + for repo in *; do + cd "$repo" + . "$BUILDSCRIPT" + PKGVERS="$PKGVERS $pkgver-$pkgrel" + cd .. + done + + for srcpkg in "$srcpath/$packagename-"*; do + [ -f "$srcpkg" ] || continue + if [ "$(pkgname_from_src $srcpkg)" == "$packagename" ]; then + skip=0 + pver="$(pkgver_from_src $srcpkg)" + for v in $PKGVERS; do + if [ "$v" = "$pver" ]; then + skip=1 + break + fi + done + if [ $skip -ne 1 ]; then + mv "$srcpkg" $SOURCE_CLEANUP_DESTDIR + fi + fi + done + + popd >/dev/null + fi +} + +if [ -f "$LOCKFILE" ]; then + owner="$(/usr/bin/stat -c %U $LOCKFILE)" + echo "error: source tarball generation is already in progress (started by $owner)" + exit 1 +fi + +trap cleanup 0 +trap ctrl_c 2 + +/bin/touch "$LOCKFILE" + +#adjust the nice level to run at a lower priority +/usr/bin/renice +10 -p $$ > /dev/null + +set_umask +/bin/mkdir -p "$WORKDIR" +cd "$WORKDIR" + +[ -e "$logfile" ] && /bin/mv "$logfile" "$logfile.old" +echo "Orphaned sourceballs:" > "$logfile" + +for sourceball in "$srcpath"/*$SRCEXT; do + packagename=$(basename $sourceball) + packagename=${packagename%-*-*$SRCEXT} + + if ! /usr/bin/svn export -q --force "$SVNREPO/$packagename" "$packagename" >/dev/null 2>&1 ; then + echo "$packagename : no longer in svn. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + elif [ -z "$(ls -A "$packagename/repos")" ]; then + echo "$packagename : no longer in repos but trunk is still in svn. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + elif ! source "$packagename/trunk/$BUILDSCRIPT" && chk_license ${license[@]}; then + echo "$packagename : source hosting no longer required by license. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + else + remove_old "$packagename/repos/" + fi +done + +cleanup 0 -- 1.6.6.1

4 10

[arch-dev-public] dbscripts pkg pools
by Aaron Griffin 22 Jun '10

22 Jun '10

Hello all, I've had these patches sitting around for a bit: http://code.phraktured.net/cgit.cgi/dbscripts/log/?h=pkgpools I'd like to see if someone else has the time to test them. I have tested them with the following procedure: * created ./testing/{staging,myrepo,packages,package-cleanup}/ with necessary subdirs * modified config to point to these paths * commented out all the SVN malarky in db-add/db-remove/ftpdir-cleanup/etc * changed get_repos_for_host() to return "myrepo" Testing: * Add a package to myrepo - Package file in packages/os/*/ - Relative symlink in myrepo/os/*/ - In myrepo DB * Remove package from repo 'foo' - Removed from myrepo DB * Run cron-jobs/ftpdir-cleanup - Symlink is removed from myrepo/os/*/ - Package file moved from packages/os/*/ to package-cleanup/ Anyone else want to verify this, or should I push it to master? Aside: Would it be a good idea to add a "svn" function which could: a) handle svn checkout failures (we don't, right now) b) be easily switched out for dry-run style testing

6 31

[arch-dev-public] [PATCH] commitpkg: add newline to make output look more orderly
by Eric Bélanger 22 Jun '10

22 Jun '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- commitpkg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/commitpkg b/commitpkg index bd8c450..9f0b8c6 100755 --- a/commitpkg +++ b/commitpkg @@ -104,7 +104,7 @@ done if [ "${arch[*]}" == 'any' ]; then if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then pushd ../repos/ >/dev/null - echo -n "removing $repo-i686 and $repo-x86_64..." + echo "removing $repo-i686 and $repo-x86_64..." svn rm $repo-i686 svn rm $repo-x86_64 svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname" -- 1.7.1

2 2

[arch-dev-public] kernel 2.6.34-1
by Tobias Powalowski 17 Jun '10

17 Jun '10

Hi guys, kernel 2.6.34 first test run ... Upstream changes: http://kernelnewbies.org/LinuxChanges Arch Linux bugfixes/feature requests: # added manpages and documents as separate package http://bugs.archlinux.org/task/17892 Arch Linux changes: - nouveau module moved into kernel tree, all nvidia binary packages include now a blacklist_nouveau.conf file, to avoid loading of nouveau module, instead of nvidia module. Broken binary modules: - fcpci,fcpcmcia,slmodem though no fix available yet. Enjoy have fun and give me feedback, greetings tpowa -- Tobias Powalowski Archlinux Developer & Package Maintainer (tpowa) http://www.archlinux.org tpowa(a)archlinux.org

5 6

[arch-dev-public] [signoff] pkg-config-0.25-1
by Allan McRae 07 Jun '10

07 Jun '10

Quick upstream release to fix a couple of bugs in 0.24. Signoff both, Allan

3 3

[arch-dev-public] [signoff] cryptsetup 1.1.2-1
by Thomas Bächler 02 Jun '10

02 Jun '10

Another minor upstream update. From the upstream announcement: === changes since version 1.1.1 === * Fix luksFormat/luksOpen reading passphrase from stdin and "-" keyfile. * Support --key-file/-d option for luksFormat. * Fix description of --key-file and add --verbose and --debug options to man page. * Add verbose log level and move unlocking message there. * Remove device even if underlying device disappeared (remove, luksClose). * Fix (deprecated) reload device command to accept new device argument. For changes in previous version please see Cryptsetup 1.1.1 Release Notes http://code.google.com/p/cryptsetup/wiki/Cryptsetup111

2 2

[arch-dev-public] [signoff] run-parts 3.2.3-1
by Pierre Schmitz 02 Jun '10

02 Jun '10

upstream update. Check if e.g. update-ca-certificates still works for you. -- Pierre Schmitz, https://users.archlinux.de/~pierre

2 1

[arch-dev-public] [signoff] kernel26-lts 2.6.32.12-1
by Tobias Powalowski 02 Jun '10

02 Jun '10

Hi guys, first try of lts bump to .32 series: - udev-compat is not needed anymore for this kernel - updated lts config to this kernel series - lzma compression is now used With this LTS release, i want to provide binary kernel modules too. Shall the binary modules be part of [core] then too, if the kernel26 module is there too? Thanks for feedback and input. Please signoff both arches, greetings tpowa -- Tobias Powalowski Archlinux Developer & Package Maintainer (tpowa) http://www.archlinux.org tpowa(a)archlinux.org

4 9

[arch-dev-public] [signoff] nfs-utils 1.2.2-3
by Andreas Radke 01 Jun '10

01 Jun '10

While I was changing my nfs server from NFSv3 to NFSv4 I've found our user mapping broken. Before idmapd gets started we need to make sure nfsd module is loaded. If the module is not loaded all files are mapped to nobody the guest account. We load it in the nfs-common init script now. This is also done the same way by Debian, Fedora and Gentoo. see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=490181 https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/235930 http://cvs.fedoraproject.org/viewvc/rpms/nfs-utils/F-13/nfs.init?revision=1… Now it's working on my server. Please signoff. -Andy

2 2