- Arch-projects - lists.archlinux.org

[arch-projects] [ABS] [PATCH] Merge bzr, git, hg and svn into a generic proto
by Maxime Gauduin 01 Nov '13

01 Nov '13

Having separate prototypes for each VCS type is no longer relevant since Pacman 4.1. Having a generic prototype for regular, bzr, git hg and svn packages makes more sense. Left cvs, and darcs protos untouched as they are not yet supported in Pacman. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 64 ------------------------- prototypes/PKGBUILD-git.proto | 64 ------------------------- prototypes/PKGBUILD-hg.proto | 65 ------------------------- prototypes/PKGBUILD-svn.proto | 63 ------------------------ prototypes/PKGBUILD.proto | 108 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto create mode 100644 prototypes/PKGBUILD.proto diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto deleted file mode 100644 index 81f145f..0000000 --- a/prototypes/PKGBUILD-bzr.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from Bazaar sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-bzr -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('bzr') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_bzrtrunk=BZRURL -_bzrmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to Bazaar server...." - - if [[ -d "$_bzrmod" ]]; then - cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" - msg "The local files are updated." - else - bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" - fi - - msg "Bazaar checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_bzrmod-build" - cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build" - cd "$srcdir/$_bzrmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_bzrmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto deleted file mode 100644 index 05b721b..0000000 --- a/prototypes/PKGBUILD-git.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from GIT sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-git -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('git') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_gitroot=GITURL -_gitname=MODENAME - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_gitname-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto deleted file mode 100644 index 8474533..0000000 --- a/prototypes/PKGBUILD-hg.proto +++ /dev/null @@ -1,65 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from Mercurial(hg) sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-hg -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('mercurial') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_hgroot=HGURL -_hgrepo=REPONAME - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - cd "$srcdir/$_hgrepo-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_hgrepo-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto deleted file mode 100644 index aff5ca9..0000000 --- a/prototypes/PKGBUILD-svn.proto +++ /dev/null @@ -1,63 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from SVN sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-svn -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('subversion') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_svntrunk=SVNURL -_svnmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to SVN server...." - - if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") - else - svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" - fi - - msg "SVN checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_svnmod-build" - svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD.proto b/prototypes/PKGBUILD.proto new file mode 100644 index 0000000..5ad5699 --- /dev/null +++ b/prototypes/PKGBUILD.proto @@ -0,0 +1,108 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +source=('SRC_NAME::SRC_URL') + +# SRC_NAME: Use to change the source name if needed +# Example: +# source=("$pkgname-$pkgver.tar.gz::http://www.foobar.com/foobar.tar.gz") + +noextract=() +md5sums=() # Generate with 'makepkg -g' + +################################################################################ +################################# VCS specific ################################# +################################################################################ + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. +# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines for more +# information on packaging from VCS sources. + +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +md5sums=('SKIP') + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +pkgver() { + cd "$srcdir" + +# Bazaar + printf "%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/-/./g')" + +# Git, no tags available + printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "%s" "$(svnversion | tr -d 'A-z')" + +# Fallback + printf "%s" "$(date +%Y%m%d)" +} + +################################################################################ + +prepare() { + cd "$srcdir" + patch -Np1 ../foo.patch + patch -Np0 ../bar.patch +} + +build() { + cd "$srcdir" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- 1.8.4

3 5

[arch-projects] [devtools][PATCH] checkpkg: Only match .so at end of filenames for soname check
by Eric Bélanger 29 Oct '13

29 Oct '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkpkg.in b/checkpkg.in index 4d2a905..4a46df3 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -74,7 +74,7 @@ for _pkgname in "${pkgname[@]}"; do if diff "$TEMPDIR/filelist-$_pkgname"{-old,} | grep '\.so' &>/dev/null; then mkdir -p "$TEMPDIR/pkg" bsdtar -x -C "$TEMPDIR" -f "$pkgfile" #> /dev/null - diff "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do + comm -13 <(sort "$TEMPDIR/filelist-$_pkgname-old") <(sort "$TEMPDIR/filelist-$_pkgname") | grep .so$ | while read i; do echo "${i}: " "$(objdump -p "$TEMPDIR/$i" | grep SONAME)" done else -- 1.8.4.1

1 0

[arch-projects] [netctl][PATCH] Set-up authentication settings for mobile_ppp
by Normal Ra 28 Oct '13

28 Oct '13

Unfortunately, my ISP only accepts PAP authentication and as a result of PPPD's natural behaviour, I am rendered unable to connect with my USB 3G modem onto the network. This patch is supposed to introduce a new configuration option for the 'mobile_ppp' connection type: Auth= It is an array of authentication methods, those prefaced with '!' will become 'refuse-opt', and otherwise will become 'require', in the resulting 'options' file. Something I've patched up that works, cheers! --- diff --git a/docs/examples/mobile_ppp b/docs/examples/mobile_ppp index f3b0b8a..02be7a4 100644 --- a/docs/examples/mobile_ppp +++ b/docs/examples/mobile_ppp @@ -10,6 +10,9 @@ Connection=mobile_ppp # Use DNS provided by the peer (default: true) #UsePeerDNS=true +# Force authentication method +#Auth=('pap') + # The user and password are not always required #User='example(a)yourprovider.com' #Password='very secret' diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index b1ccde1..5b05ec7 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -361,6 +361,12 @@ type: 'UsePeerDNS=':: Use the DNS provided by the peer (defaults to `true') +'Auth=':: + Define disallowed and allowed authentication methods. + Those prefaced with ! will be refused, and specified will be + required. E.g. `Auth=('!chap' 'eap')' will refuse CHAP, but require + EAP. + 'User=' and 'Password=':: The username and password to connect with. These are unset by default, as they are often not required. diff --git a/src/lib/connections/mobile_ppp b/src/lib/connections/mobile_ppp index b966390..daac9e5 100644 --- a/src/lib/connections/mobile_ppp +++ b/src/lib/connections/mobile_ppp @@ -13,6 +13,10 @@ quote_word() { mobile_ppp_up() { local cfg local chat + local auth_require=('chap' 'mppe' 'mppe-40' 'mppe-128' 'mschap' \ + 'mschap-v2' 'eap' 'pap') + local auth_refuse=('chap' 'mschap' 'mschap-v2' 'eap' 'pap') + mkdir -p "$STATE_DIR/mobile_ppp.${Interface}.${Profile}/" chmod 700 "$STATE_DIR/mobile_ppp.${Interface}.${Profile}/" @@ -48,6 +52,21 @@ EOF echo "usepeerdns" >> "${cfg}" fi + # Generate authentication settings + for opt in ${Auth[@]}; do + for authmeth in ${auth_require[@]}; do + if [[ $opt = "$authmeth" ]]; then + echo "require-$authmeth" >> "${cfg}" + fi + done + + for authmeth in ${auth_refuse[@]}; do + if [[ $opt = "!$authmeth" ]]; then + echo "refuse-$authmeth" >> "${cfg}" + fi + done + done + # Writes username and password echo "noauth" >> "${cfg}" echo "hide-password" >> ${cfg} --

2 2

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20131020-2-g7524bec
by pierre＠archlinux.org 27 Oct '13

27 Oct '13

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 devtools repository". The branch, master has been updated via 7524bec6d930992876611f6c901852d8ae0d7ab0 (commit) via 70309118ab1d082bf12dfd39c3068f5fdd6662dc (commit) from 164f5b758d56ce36ac8b087c1d55b8719555711f (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 7524bec6d930992876611f6c901852d8ae0d7ab0 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Wed Oct 23 23:24:45 2013 -0400 checkpkg: Fix soname check The bsdtar options were in the incorrect order and objdump couldn't find the files. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit 70309118ab1d082bf12dfd39c3068f5fdd6662dc Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Wed Oct 23 23:34:12 2013 -0400 checkpkg: Create symlinks to old packages in $TEMPDIR instead of $PWD Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: checkpkg.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.3-10-gde41bbd
by jouke＠archlinux.org 27 Oct '13

27 Oct '13

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 "Network control utility based on systemd". The branch, master has been updated via de41bbd471cbac5ef1a9da20fe990a5bd7d4b271 (commit) via 120d94020aed8d8b5e1b76dc7ee03fa062fab26c (commit) via 2f1ef4d9f87af7112c6bbb7c53bbe7bafe3ef8b1 (commit) via 7c4329462e411c110b8dded92cc4b0d935e1e95d (commit) via 8a414978b39e784fdabf6895985acc0e054d235c (commit) via 755c8d5afdaca08ca1732765f30370f752259d4b (commit) via ab8953024be9f6f7d5f98886894917a8a8fdd452 (commit) via 5930a6eebc67b9665ea5d6133306a71030cd94a0 (commit) via f50656d00cac5125b0fd8ae7dbfa314b83597ad4 (commit) via 0c85a0d981c403a438e671af510a733a319b1b97 (commit) from 127976c75b294865571c3367f3d8e2e25262f2e7 (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 de41bbd471cbac5ef1a9da20fe990a5bd7d4b271 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Oct 26 10:45:17 2013 +0200 wifi-menu: ask for a name for the new profile Some abuse of the stack, but that should be no problem: the user has to enter around 10000 existing profile names which (s)he does not want to overwrite before a stack overflow occurs. Feature suggested by: Paul Bienkowski <opatutlol(a)aol.com> commit 120d94020aed8d8b5e1b76dc7ee03fa062fab26c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Oct 23 13:31:38 2013 +0200 Overhaul of ppp connection types - Refactorization of option file generation - Introduction of optional additional pppd options file specification - Introduction of unit specification option for pppoe connections commit 2f1ef4d9f87af7112c6bbb7c53bbe7bafe3ef8b1 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Oct 23 01:20:54 2013 +0200 beautify error output Also: tag error messages as systemd error messages when the messages are not directed to the terminal. commit 7c4329462e411c110b8dded92cc4b0d935e1e95d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Oct 23 01:12:48 2013 +0200 Add a connection type for dummy interfaces commit 8a414978b39e784fdabf6895985acc0e054d235c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 23:58:11 2013 +0200 Set a global restrictive umask Netctl files can potentially contain passwords or execute code as root. commit 755c8d5afdaca08ca1732765f30370f752259d4b Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 23:37:20 2013 +0200 Minor rfkill refactorization Testing whether transmission is blocked at all is now possible through [[ -n $(rf_status "$Interface" "$RFKill") ]] commit ab8953024be9f6f7d5f98886894917a8a8fdd452 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 17:10:23 2013 +0200 Allow limiting the frequencies to scan (FS#37032) This is especially useful to enforce connecting in the 5 GHz band. commit 5930a6eebc67b9665ea5d6133306a71030cd94a0 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 16:51:00 2013 +0200 Increase default DHCP timeout New timeout is 30 seconds, which equals the current dhcpcd default. commit f50656d00cac5125b0fd8ae7dbfa314b83597ad4 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 16:47:21 2013 +0200 Better detection of hex keys Hex WEP keys are of even length, ASCII keys are of odd length. Using this information we make wifi-menu work better for WEP networks. commit 0c85a0d981c403a438e671af510a733a319b1b97 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Oct 21 15:11:39 2013 +0200 Specify the local side of a tunnel early (FS#36711) Needed in case the remote side of a tunnel is set to 'any'. ----------------------------------------------------------------------- Summary of changes: docs/examples/mobile_ppp | 3 - docs/netctl.profile.5.txt | 25 ++++++- src/lib/connections/README | 3 + src/lib/connections/{tunnel => dummy} | 14 ++-- src/lib/connections/mobile_ppp | 118 +++++++++++----------------------- src/lib/connections/pppoe | 90 +++++++++++++------------- src/lib/connections/tunnel | 7 +- src/lib/connections/tuntap | 7 +- src/lib/connections/wireless | 4 +- src/lib/globals | 11 +++- src/lib/ip | 6 +- src/lib/rfkill | 37 +++++++---- src/lib/wpa | 10 ++- src/netctl-auto | 4 +- src/wifi-menu | 16 +++++ 15 files changed, 179 insertions(+), 176 deletions(-) copy src/lib/connections/{tunnel => dummy} (52%) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools][PATCH] checkpkg: Fix soname check
by Eric Bélanger 24 Oct '13

24 Oct '13

The bsdtar options were in the incorrect order and objdump couldn't find the files. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index ef46399..02c6543 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -73,9 +73,9 @@ for _pkgname in "${pkgname[@]}"; do if diff "$TEMPDIR/filelist-$_pkgname"{-old,} | grep '\.so' &>/dev/null; then mkdir -p "$TEMPDIR/pkg" - bsdtar -C "$TEMPDIR" xf ../"$pkgfile" #> /dev/null + bsdtar x -C "$TEMPDIR" -f "$pkgfile" #> /dev/null diff "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do - echo "${i}: " "$(objdump -p "$i" | grep SONAME)" + echo "${i}: " "$(objdump -p "$TEMPDIR/$i" | grep SONAME)" done else msg "No soname differences for $_pkgname." -- 1.8.4.1

2 2

[arch-projects] [netctl][PATCH] Minor rfkill refactorization
by Jouke Witteveen 24 Oct '13

24 Oct '13

Testing whether transmission is blocked at all is now possible through [[ -n $(rf_status "$Interface" "$RFKill") ]] Signed-off-by: Jouke Witteveen <j.witteveen(a)gmail.com> --- src/lib/connections/wireless | 4 ++-- src/lib/rfkill | 37 ++++++++++++++++++++++++------------- src/netctl-auto | 4 ++-- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless index 870af51..88ca3e3 100644 --- a/src/lib/connections/wireless +++ b/src/lib/connections/wireless @@ -19,7 +19,7 @@ wireless_up() { : ${TimeoutWPA:=15} if [[ $RFKill ]]; then - enable_rf "$Interface" "$RFKill" || return 1 + rf_enable "$Interface" "$RFKill" || return 1 fi # Kill any lingering WPA supplicants @@ -73,7 +73,7 @@ wireless_down() { wpa_stop "$Interface" bring_interface_down "$Interface" || return 1 if [[ $RFKill ]]; then - disable_rf "$Interface" "$RFKill" + rf_disable "$Interface" "$RFKill" fi } diff --git a/src/lib/rfkill b/src/lib/rfkill index e388f08..3f841f3 100644 --- a/src/lib/rfkill +++ b/src/lib/rfkill @@ -4,7 +4,7 @@ ## Determine the system interface of an rfkill device # $1: interface name # $2: rfkill name -get_rf_path() { +rf_get_path() { local interface=$1 rfkill_name=${2:-auto} path if [[ $rfkill_name == "auto" ]]; then @@ -26,33 +26,44 @@ get_rf_path() { return 1 } -## Unblock transmission through a wireless device +## Determine the blocking status of an rfkill device # $1: interface name # $2: rfkill name -enable_rf() { - local interface=$1 rfkill=$2 path hard soft +rf_status() { + local path + path=$(rf_get_path "$@") || return 1 - path=$(get_rf_path "$interface" "$rfkill") || return 1 - read hard < "$path/hard" - read soft < "$path/soft" + if (( $(< "$path/hard" ) )); then + echo "hard" + elif (( $(< "$path/soft" ) )); then + echo "soft" + fi +} - if (( hard )); then +## Unblock transmission through a wireless device +# $1: interface name +# $2: rfkill name +rf_enable() { + case $(rf_status "$@") in + hard) report_error "Transmission is hard-blocked on interface '$interface'" return 1 - elif (( soft )); then + ;; + soft) report_debug "$FUNCNAME: echo 0 > '$path/soft'" echo 0 > "$path/soft" timeout_wait 1 '(( ! $(< "$path/soft") ))' - fi + ;; + esac } ## Block transmission through a wireless device # $1: interface name # $2: rfkill name -disable_rf() { - local interface=$1 rfkill=$2 path +rf_disable() { + local path + path=$(rf_get_path "$@") || return 1 - path=$(get_rf_path "$interface" "$rfkill") || return 1 report_debug "$FUNCNAME: echo 1 > '$path/soft'" echo 1 > "$path/soft" timeout_wait 1 '(( $(< "$path/soft") ))' diff --git a/src/netctl-auto b/src/netctl-auto index 7519325..5cf104b 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -177,7 +177,7 @@ start() { source "$PROFILE_DIR/interfaces/$interface" fi if [[ $RFKill ]]; then - enable_rf "$interface" "$RFKill" || return 1 + rf_enable "$interface" "$RFKill" || return 1 fi @@ -227,7 +227,7 @@ stop() { fi timeout_wait 1 '! wpa_is_active "$interface"' || wpa_stop "$interface" ip link set dev "$interface" down - [[ $RFKill ]] && disable_rf "$interface" "$RFKill" + [[ $RFKill ]] && rf_disable "$interface" "$RFKill" return 0 } -- 1.8.4.1

1 1

[arch-projects] [devtools][PATCH 2/2] checkpkg: Create symlinks to old packages in $TEMPDIR instead of $PWD
by Eric Bélanger 24 Oct '13

24 Oct '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index 02c6543..870d543 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -58,15 +58,15 @@ for _pkgname in "${pkgname[@]}"; do if [[ $pkgurl = file://* ]]; then ln -s "${pkgurl#file://}" "${pkgurl##file://*/}" elif [[ -f "$PKGDEST/$oldpkg" ]]; then - ln -s "$PKGDEST/$oldpkg" "$oldpkg" + ln -s "$PKGDEST/$oldpkg" "$TEMPDIR/$oldpkg" elif [[ -f "$STARTDIR/$oldpkg" ]]; then - ln -s "$STARTDIR/$oldpkg" "$oldpkg" + ln -s "$STARTDIR/$oldpkg" "$TEMPDIR/$oldpkg" else - curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" + curl -fsLC - --retry 3 --retry-delay 3 -o "$TEMPDIR/$oldpkg" "$pkgurl" fi fi - bsdtar tf "$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old" + bsdtar tf "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old" bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname" sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" -- 1.8.4.1

1 0

[arch-projects] [netctl][PATCH] Better detection of hex keys
by Jouke Witteveen 23 Oct '13

23 Oct '13

Hex WEP keys are of even length, ASCII keys are of odd length. Using this information we make wifi-menu work better for WEP networks. Signed-off-by: Jouke Witteveen <j.witteveen(a)gmail.com> --- src/lib/wpa | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/wpa b/src/lib/wpa index d79fdbe..ff6d9ab 100644 --- a/src/lib/wpa +++ b/src/lib/wpa @@ -219,11 +219,15 @@ wpa_make_config_block() { wep) echo "key_mgmt=NONE" echo "wep_tx_keyidx=0" - echo "wep_key0=$(wpa_quote "$Key")" + if (( ${#Key} % 2 == 0 )) && [[ "$key" = +([[:xdigit:]]) ]]; then + echo "wep_key0=$Key" + else + echo "wep_key0=$(wpa_quote "$Key")" + fi ;; wpa) echo "proto=RSN WPA" - if [[ "${#Key}" -eq 64 ]]; then + if [[ "${#key}" -eq 64 && "$key" = +([[:xdigit:]]) ]]; then echo "psk=$Key" else echo "psk=$(wpa_quote "$Key")" -- 1.8.4.1

2 8

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-13-g95b2c16
by dreisner＠archlinux.org 21 Oct '13

21 Oct '13

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 mkinitcpio repository". The branch, master has been updated via 95b2c16f44f02ac264686651cf1aa207c65cb93a (commit) from 344c27a8b56a4aa8bd168f98285165c3fc87cba3 (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 95b2c16f44f02ac264686651cf1aa207c65cb93a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 11 08:13:41 2013 -0400 lsinitcpio: separate decompression from archive reading This essentially reverts 306dcbd7b21f8a680 which foolishly assumes that kernel and libarchive decompression support stay in sync. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lsinitcpio | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0