From 084d0a37c8d0f1a991ce22ccc6d8c3dd8ca12a33 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2012 22:14:47 -0500 Subject: (scripted) fix file permission breakage introduced in commit d62bd1 I did this with this command: git diff d62bd1^..d62bd1 | egrep '^old mode ' -C1 \ | tr '\n' ' ' | sed 's/diff --git/\n&/g' \ | sed -r 's|^diff --git a/([^ ]*) b/([^ ]*) old mode 100([0-9]*) new mode 100([0-9]*)|chmod \3 ./\1|' \ | bash The first line finds all of the file-permission changes in the commit. The second line squashes some newlines to get one line per file. This line is in the format: diff --git a/FILE b/FILE old mode OLDMODE new mode NEWMODE The third line extracts the values from those lines and transforms the line into: chmod FILE ./OLDMODE The fourth line (obviously) just executes the output. --- social/puppet/PKGBUILD | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 social/puppet/PKGBUILD (limited to 'social/puppet/PKGBUILD') diff --git a/social/puppet/PKGBUILD b/social/puppet/PKGBUILD old mode 100755 new mode 100644 -- cgit v1.2.3 From 8461d2ac3e9abbe1254ab7d2518d6ae1662d7030 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Dec 2012 00:42:45 -0500 Subject: handle duplicates between social and pcr --- pcr/libnatpmp-from-social-repo/PKGBUILD | 29 ++++++++++++++++++ social/facter/PKGBUILD | 24 --------------- social/libnatpmp/PKGBUILD | 29 ------------------ social/mednafen-wip/PKGBUILD | 31 -------------------- social/puppet/PKGBUILD | 52 --------------------------------- social/puppet/puppet | 45 ---------------------------- social/puppet/puppet.conf | 30 ------------------- social/puppet/puppet.install | 46 ----------------------------- social/puppet/puppetmaster | 45 ---------------------------- social/python2-cheetah/Changelog | 6 ---- social/python2-cheetah/PKGBUILD | 33 --------------------- social/ruby-shadow/PKGBUILD | 22 -------------- ~emulatorman/mednafen-wip/PKGBUILD | 31 -------------------- 13 files changed, 29 insertions(+), 394 deletions(-) create mode 100644 pcr/libnatpmp-from-social-repo/PKGBUILD delete mode 100644 social/facter/PKGBUILD delete mode 100644 social/libnatpmp/PKGBUILD delete mode 100755 social/mednafen-wip/PKGBUILD delete mode 100644 social/puppet/PKGBUILD delete mode 100755 social/puppet/puppet delete mode 100644 social/puppet/puppet.conf delete mode 100644 social/puppet/puppet.install delete mode 100755 social/puppet/puppetmaster delete mode 100644 social/python2-cheetah/Changelog delete mode 100644 social/python2-cheetah/PKGBUILD delete mode 100644 social/ruby-shadow/PKGBUILD delete mode 100755 ~emulatorman/mednafen-wip/PKGBUILD (limited to 'social/puppet/PKGBUILD') diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD new file mode 100644 index 000000000..ded1e6ca5 --- /dev/null +++ b/pcr/libnatpmp-from-social-repo/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Pierre Bourdon + +pkgname=libnatpmp +pkgver=20120821 +pkgrel=1 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr/libnatpmp.html" +license=('BSD') +depends=('glibc') +makedepends=() +source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALLPREFIX="$pkgdir/usr" \ + INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install + + # Needed by some packages + install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/facter/PKGBUILD b/social/facter/PKGBUILD deleted file mode 100644 index 877572abb..000000000 --- a/social/facter/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Thomas S Hatch -# Contributor: Dave Simons - -pkgname=facter -pkgver=1.6.0 -pkgrel=1 -pkgdesc="A library for collecting facts about your system." -arch=("any") -url="http://puppetlabs.com/projects/facter/" -license=("Apache") -depends=("ruby") -options=(!emptydirs) -source=(http://puppetlabs.com/downloads/facter/facter-$pkgver.tar.gz) -md5sums=('bf7e384bf247935e973cfd7bf5592dfe') - -package() { - cd $srcdir/facter-$pkgver - - ruby ./install.rb \ - --destdir=$pkgdir \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin - -} diff --git a/social/libnatpmp/PKGBUILD b/social/libnatpmp/PKGBUILD deleted file mode 100644 index ded1e6ca5..000000000 --- a/social/libnatpmp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Pierre Bourdon - -pkgname=libnatpmp -pkgver=20120821 -pkgrel=1 -pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -arch=('i686' 'x86_64' 'mips64el') -url="http://miniupnp.free.fr/libnatpmp.html" -license=('BSD') -depends=('glibc') -makedepends=() -source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALLPREFIX="$pkgdir/usr" \ - INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install - - # Needed by some packages - install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/mednafen-wip/PKGBUILD b/social/mednafen-wip/PKGBUILD deleted file mode 100755 index e7330795b..000000000 --- a/social/mednafen-wip/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Hans-Kristian Arntzen -# Contributor: Angel 'angvp' Velasquez -# Contributor: kagan -# Contributor (Parabola): André Silva - -pkgname=mednafen-wip -pkgver=0.9.22 -pkgrel=1 -pkgdesc="A command-line multi-system gaming emulator, WIP version" -url="http://mednafen.sourceforge.net/" -license=(GPL) -arch=('i686' 'x86_64') -depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') -conflicts=('mednafen') -provides=('mednafen') -source=('http://forum.fobby.net/index.php?t=getfile&id=362&') -sha1sums=('609d3915f4b65f6a7e77441d26efd744f3149981') - -build() -{ - cd $srcdir/mednafen - ./configure --prefix=/usr - make -} - -package() -{ - cd $srcdir/mednafen - make DESTDIR=$pkgdir install -} diff --git a/social/puppet/PKGBUILD b/social/puppet/PKGBUILD deleted file mode 100644 index 10338bea0..000000000 --- a/social/puppet/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Puppet: Installer: Arch -# Maintainer: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson -# Contributor: Dave Simons - -pkgname=puppet -pkgver=2.7.1 -pkgrel=1 -pkgdesc="A system for automating system administration tasks." -arch=("any") -url="http://puppetlabs.com/projects/puppet/" -license=("Apache") -depends=("ruby" "ruby-shadow" "facter") -backup=("etc/puppet/puppet.conf") -options=(emptydirs) -install="puppet.install" -source=("http://puppetlabs.com/downloads/puppet/puppet-$pkgver.tar.gz" - "puppet" - "puppetmaster" - "puppet.conf") -md5sums=('7a0346758af0222dc5e2b2b1a99c44ec' - '59dbf39e251bc4877e7604a5876c642d' - '4c507c580cb28d7a5adc9ea6b3626657' - 'a6c0ce2eb12d62fdd3421aa9dff3477d') - -package() { - cd $srcdir/puppet-$pkgver - - # Install - ruby ./install.rb \ - --destdir=$pkgdir \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --mandir=/usr/share/man - - # Set up vim and emacs - install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim - install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim - install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el - install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el - - # Configuration and rc scripts - install -d $pkgdir/etc/{puppet,rc.d} - install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf - - install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet - install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster - - # Move pi to prevent file conflict - mv $pkgdir/usr/bin/pi $pkgdir/usr/bin/puppet-pi -} diff --git a/social/puppet/puppet b/social/puppet/puppet deleted file mode 100755 index 4126be850..000000000 --- a/social/puppet/puppet +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -DAEMON=$(type -p puppetd) - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/puppet ] && . /etc/conf.d/puppet - -PID=$(pidof -xo %PPID $DAEMON) -case "$1" in - start) - stat_busy "Starting Puppet Daemon" - if [ -z "$PID" ]; then - [ -f /var/run/puppet.pid ] && rm -f /var/run/puppet.pid - $DAEMON $PUPPETD_ARGS - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -xo %PPID $DAEMON) - echo $PID > /var/run/puppet.pid - add_daemon puppet - stat_done - fi - ;; - stop) - stat_busy "Stopping Puppet Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon puppet - rm -f /var/run/puppet.pid - stat_done - fi - ;; - restart) - $0 stop - if [ ! -z $PID ]; then - while ps -p $PID > /dev/null; do sleep 1; done - fi - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/puppet/puppet.conf b/social/puppet/puppet.conf deleted file mode 100644 index 169f28b3b..000000000 --- a/social/puppet/puppet.conf +++ /dev/null @@ -1,30 +0,0 @@ -[main] - # The Puppet log directory. - # The default value is '$vardir/log'. - logdir = /var/log/puppet - - # Where Puppet PID files are kept. - # The default value is '$vardir/run'. - rundir = /var/run/puppet - - # Where SSL certificates are kept. - # The default value is '$confdir/ssl'. - ssldir = $vardir/ssl - factpath=$vardir/lib/facter - pluginsync=true - - -[agent] - # The file in which puppetd stores a list of the classes - # associated with the retrieved configuratiion. Can be loaded in - # the separate ``puppet`` executable using the ``--loadclasses`` - # option. - # The default value is '$confdir/classes.txt'. - classfile = $vardir/classes.txt - - # Where puppetd caches the local configuration. An - # extension indicating the cache format is added automatically. - # The default value is '$confdir/localconfig'. - localconfig = $vardir/localconfig - -#[master] diff --git a/social/puppet/puppet.install b/social/puppet/puppet.install deleted file mode 100644 index 928df566b..000000000 --- a/social/puppet/puppet.install +++ /dev/null @@ -1,46 +0,0 @@ -# Puppet: Installer: Arch -# Maintainer: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson - -pre_install() { - getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null - getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet -d /var/lib/puppet -s /sbin/nologin -c "Puppet" puppet &>/dev/null || : -} - -pre_upgrade() { - pre_install - usermod -d /var/lib/puppet puppet &>/dev/null || : -} - -post_install() { - : -} - -pre_remove() { -if [ -f /var/run/puppetmasterd.pid ]; then - PIDOF=$(pidof -xo %PPID puppetmasterd) - PIDFILE=$(cat /var/run/puppetmasterd.pid) - if [ $PIDOF -eq $PIDFILE ]; then - /etc/rc.d/puppetmaster stop - fi -fi - -if [ -f /var/run/puppetd.pid ]; then - PIDOF=$(pidof -xo %PPID puppetd) - PIDFILE=$(cat /var/run/puppetd.pid) - if [ $PIDOF -eq $PIDFILE ]; then - /etc/rc.d/puppet stop - fi -fi -} - -post_remove() { - # Remove user and group - userdel puppet -} - -op=$1 -shift - -$op "$@" diff --git a/social/puppet/puppetmaster b/social/puppet/puppetmaster deleted file mode 100755 index 8b3971053..000000000 --- a/social/puppet/puppetmaster +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -DAEMON=$(type -p puppetmasterd) - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/puppetmaster ] && . /etc/conf.d/puppetmaster - -PID=$(pidof -xo %PPID $DAEMON) -case "$1" in - start) - stat_busy "Starting Puppet Master Daemon" - if [ -z "$PID" ]; then - [ -f /var/run/puppetmaster.pid ] && rm -f /var/run/puppetmaster.pid - $DAEMON $PUPPETMASTER_ARGS - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -xo %PPID $DAEMON) - echo $PID > /var/run/puppetmaster.pid - add_daemon puppetmaster - stat_done - fi - ;; - stop) - stat_busy "Stopping Puppet Master Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon puppetmaster - rm -f /var/run/puppetmaster.pid - stat_done - fi - ;; - restart) - $0 stop - if [ ! -z $PID ]; then - while ps -p $PID > /dev/null; do sleep 1; done - fi - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/python2-cheetah/Changelog b/social/python2-cheetah/Changelog deleted file mode 100644 index 9acc7834a..000000000 --- a/social/python2-cheetah/Changelog +++ /dev/null @@ -1,6 +0,0 @@ -2012-01-31 Julien Nicoulaud - - * 2.4.4-4 : - Add changelog. - Remove unneeded shebang modification. - diff --git a/social/python2-cheetah/PKGBUILD b/social/python2-cheetah/PKGBUILD deleted file mode 100644 index 34ce863a8..000000000 --- a/social/python2-cheetah/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Julien Nicoulaud -# Contributor: James Rayner -# Contributor: Todd Maynard -# Source: https://github.com/nicoulaj/archlinux-packages -pkgname=python2-cheetah -pkgver=2.4.4 -pkgrel=4 -pkgdesc="A Python-powered template engine and code generator" -arch=(i686 x86_64) -url="http://www.cheetahtemplate.org" -license=(custom) -depends=(python2 python-markdown) -makedepends=(python2-distribute) -optdepends=('python2-pygments: for the CodeHighlighter filter') -provides=(cheetah python-cheetah) -conflicts=(cheetah python-cheetah) -changelog=Changelog -source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz) -md5sums=('853917116e731afbc8c8a43c37e6ddba') - -build() { - cd "${srcdir}/Cheetah-${pkgver}" - python2 setup.py build -} - -package() { - msg "Install..." - cd "${srcdir}/Cheetah-${pkgver}" - python2 setup.py install --root="${pkgdir}" || return 1 - - msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..." - install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/social/ruby-shadow/PKGBUILD b/social/ruby-shadow/PKGBUILD deleted file mode 100644 index ec243aaea..000000000 --- a/social/ruby-shadow/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Maintainer: Thomas S Hatch -pkgname=ruby-shadow -pkgver=1.4.9 -pkgrel=4 -pkgdesc="Interface for shadow passwords for Ruby" -arch=(i686 x86_64) -depends=('ruby') -license=('publicdomain') -url=('https://github.com/thatch45/ruby-shadow') -source=("https://github.com/downloads/thatch45/ruby-shadow/$pkgname-$pkgver.tar.gz") -md5sums=('63ee20d3f0cb456dc2a50107124c64d9') - -build() { - cd $srcdir/shadow-$pkgver - ruby extconf.rb - make -} - -package() { - cd $srcdir/shadow-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/~emulatorman/mednafen-wip/PKGBUILD b/~emulatorman/mednafen-wip/PKGBUILD deleted file mode 100755 index a405d2ceb..000000000 --- a/~emulatorman/mednafen-wip/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Hans-Kristian Arntzen -# Contributor: Angel 'angvp' Velasquez -# Contributor: kagan -# Contributor (Parabola): André Silva - -pkgname=mednafen-wip -pkgver=0.9.21 -pkgrel=1 -pkgdesc="A command-line multi-system gaming emulator, WIP version" -url="http://mednafen.sourceforge.net/" -license=(GPL) -arch=('i686' 'x86_64') -depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') -conflicts=('mednafen') -provides=('mednafen') -source=('http://forum.fobby.net/index.php?t=getfile&id=358&') -sha1sums=('983c349ca991190363b713ac8abf7ae78b081a21') - -build() -{ - cd $srcdir/mednafen - ./configure --prefix=/usr - make -} - -package() -{ - cd $srcdir/mednafen - make DESTDIR=$pkgdir install -} -- cgit v1.2.3