diff options
Diffstat (limited to '~lukeshu')
14 files changed, 230 insertions, 15 deletions
diff --git a/~lukeshu/etckeeper/.gitignore b/~lukeshu/etckeeper/.gitignore new file mode 100644 index 000000000..b4a9ca909 --- /dev/null +++ b/~lukeshu/etckeeper/.gitignore @@ -0,0 +1 @@ +etckeeper-0.63/ diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD index e243f29f0..a359500b5 100644 --- a/~lukeshu/etckeeper/PKGBUILD +++ b/~lukeshu/etckeeper/PKGBUILD @@ -5,7 +5,7 @@ pkgname=etckeeper pkgver=0.63 -pkgrel=2.1 +pkgrel=2.3 pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." arch=('any') backup=('etc/etckeeper/etckeeper.conf') @@ -15,7 +15,7 @@ provides=('etckeeper') depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') -source=("etckeeper-$pkgver.tar::git://git.kitenet.net/etckeeper#${pkgver}" +source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" etckeeper-archlinux.conf) build() { @@ -33,5 +33,5 @@ package() { make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install } -md5sums=('0373375e93cb7122bb0ae4749e63c0d9' +md5sums=('SKIP' '99d8d2838f49fa0f2f21c9e37948100d') diff --git a/~lukeshu/md/PKGBUILD b/~lukeshu/md/PKGBUILD new file mode 100644 index 000000000..7f74aaa2c --- /dev/null +++ b/~lukeshu/md/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=("md" "emacs-mdmua") +pkgver=0.81 +pkgrel=4 +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') + +makedepends=(python-distribute) + +#__gitbranch=1d69744 # This is the commit that is 0.81 +__gitbranch=455b6b4 # this is currently HEAD (has bugfixes) +source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}") + +build() { + cd "${srcdir}/nicferrier-md-${__gitbranch}" + + # fix typo + sed -i 's/pyprofyfs/pyproxyfs/' setup.py +} + +package_md() { + pkgdesc="A maildir client and library." + depends=('python' 'python-pyproxyfs') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +package_emacs-mdmua() { + pkgdesc="An Emacs mail user agent (MUA) build around md." + pkgver='0.72' + depends=("md=0.81" 'emacs>=24') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + cd useragents/emacs + install -d ${pkgdir}/usr/share/emacs/site-lisp + install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp +} + +md5sums=('452727348df2f51d7eddade709aceb1c') diff --git a/~lukeshu/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD index 5cbab45dc..885e06f0e 100755 --- a/~lukeshu/codeanalyst/PKGBUILD +++ b/~lukeshu/not-working/codeanalyst/PKGBUILD @@ -5,14 +5,13 @@ # The docs claim that the fork is just for adding support for # processors that aren't upstream yet (at the time, they are now that # 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well: -# * AMD also added a bunch of CodeAnalyst-specific code. Also some of -# the external. +# * AMD also added a bunch of CodeAnalyst-specific code. # * Several external variables/types have different names; the API is # incompatible. # * [extra]/oprofile-0.9.7-3 only includes about half of the headers. pkgbase=CodeAnalyst -pkgname=codeanalyst +pkgname=(codeanalyst codeanalyst-cakm) pkgver=3.3.18.0361 _pkgver="${pkgver//./_}" pkgrel=4.1 @@ -20,20 +19,24 @@ pkgdesc="AMD performance profiler. Includes a fork of oprofile." url="http://developer.amd.com/tools/${pkgbase}/" arch=('i686' 'x86_64') license=('GPL') -depends=('gcc' 'sudo' 'qt>=4.1' 'oprofile' 'libdwarf') +depends=('gcc' 'qt>=4.1' 'libdwarf') makedepends=('linux-headers' 'elfutils' 'findutils' 'file') -provides=('oprofile=0.9.6cvs') -conflicts=('oprofile') options=('!strip') install=codeanalyst.install source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz" 'gcc47.patch' 'skipSetup.patch' + 'kernel3.4.patch' 'codeanalyst.sudo' 'codeanalyst.desktop' 'codeanalyst.svg') build() { + build_codeanalyst + build_codeanalyst-cakm +} + +build_codeanalyst() { cd "${srcdir}/${pkgbase}-${_pkgver}-Public" patch -Np1 -i "${srcdir}/gcc47.patch" patch -Np1 -i "${srcdir}/skipSetup.patch" @@ -46,7 +49,18 @@ build() { make } -package() { +build_codeanalyst-cakm() { + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm + cp -r kernel2.6.38 kernel3.4 + cd kernel3.4 + patch -Np1 -i "${srcdir}/kernel3.4.patch" + make +} + +package_codeanalyst() { + provides=('oprofile=0.9.6cvs') + conflicts=('oprofile') + cd "${srcdir}/${pkgbase}-${_pkgver}-Public" make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial @@ -59,9 +73,19 @@ package() { install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop" } +package_codeanalyst-cakm() { + pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko" + depends=(codeanalyst) + provides=() + + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4 + install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko" +} + md5sums=('f1e29bc7c7da259df228ce59281ee1d7' '063d0fc9680641a92ce5e310ffe1c9c0' 'ce549e59c4a5916fd19e8d085e863627' + '3a5d820a43a0360d561bb0c4d67d9735' '3cc8f64fe84c5a886d0172ee8d99f690' '3a18d3f7fb01f199a8ed5ae2908c18e4' '1822a4157b82904b82e72fc1e9bcbd42') diff --git a/~lukeshu/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop index 56d54f884..56d54f884 100755 --- a/~lukeshu/codeanalyst/codeanalyst.desktop +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop diff --git a/~lukeshu/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install index 8edb4adc2..6ed1ac841 100755 --- a/~lukeshu/codeanalyst/codeanalyst.install +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.install @@ -1,5 +1,5 @@ post_install() { - getent group amdca &>/dev/null || /usr/bin/groupadd amdca &>/dev/null + getent group amdca &>/dev/null || groupadd amdca &>/dev/null echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group" echo " ie: gpasswd -a USERNAME amdca" @@ -24,9 +24,6 @@ post_install() { } post_remove() { - if getent group amdca &>/dev/null; then - groupdel amdca - fi - + getent group amdca &>/dev/null && groupdel amdca &>/dev/null update-desktop-database -q } diff --git a/~lukeshu/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo index 1c3173bdb..1c3173bdb 100755 --- a/~lukeshu/codeanalyst/codeanalyst.sudo +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo diff --git a/~lukeshu/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg index 8febf725b..8febf725b 100755 --- a/~lukeshu/codeanalyst/codeanalyst.svg +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.svg diff --git a/~lukeshu/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch index dfec4a0c4..dfec4a0c4 100755 --- a/~lukeshu/codeanalyst/gcc47.patch +++ b/~lukeshu/not-working/codeanalyst/gcc47.patch diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch new file mode 100644 index 000000000..589abc800 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/kernel3.4.patch @@ -0,0 +1,72 @@ +diff -ru kernel2.6.38/Makefile kernel3.4/Makefile +--- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400 +@@ -1,6 +1,6 @@ + TARGET = oprofile.ko + +-MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile) ++MDIR = arch/x86/oprofile + + DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \ + event_buffer.o oprofile_files.o \ +@@ -16,7 +16,8 @@ + CURRENT = $(shell uname -r) + ARCH = $(if $(shell uname -m | grep x86_64),64,32) + KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386) +-KDIR = /lib/modules/$(CURRENT)/build ++SYS_KDIR = /lib/modules/$(CURRENT)/build ++KDIR = $(PWD)/../build + PWD = $(shell pwd) + DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR) + USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0) +@@ -39,6 +40,8 @@ + all: default + + default: ++ rm -rf $(KDIR) ++ cp -r $(SYS_KDIR)/ $(KDIR) + make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH) + + install: +@@ -52,13 +55,12 @@ + + uninstall: + @echo "... Restore original oprofile.ko." +- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) ++ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) + + clean: + rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c + + prebuild: + cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko +- + +--include $(KDIR)/Rules.make ++-include $(SYS_KDIR)/Rules.make +Only in kernel3.4/: modules.order +Only in kernel3.4/: Module.symvers +diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c +--- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400 +@@ -16,7 +16,6 @@ + #include <linux/notifier.h> + #include <linux/smp.h> + #include "oprofile.h" +-#include <linux/sysdev.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) + #include <linux/syscore_ops.h> + #endif +diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c +--- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400 +@@ -244,7 +244,7 @@ + return -ENOMEM; + root_inode->i_op = &simple_dir_inode_operations; + root_inode->i_fop = &simple_dir_operations; +- root_dentry = d_alloc_root(root_inode); ++ root_dentry = d_make_root(root_inode); + if (!root_dentry) { + iput(root_inode); + return -ENOMEM; +Only in kernel3.4/: .tmp_versions diff --git a/~lukeshu/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch index fdc9bf42f..fdc9bf42f 100755 --- a/~lukeshu/codeanalyst/skipSetup.patch +++ b/~lukeshu/not-working/codeanalyst/skipSetup.patch diff --git a/~lukeshu/python-pyproxyfs/PKGBUILD b/~lukeshu/python-pyproxyfs/PKGBUILD new file mode 100644 index 000000000..b24c5682a --- /dev/null +++ b/~lukeshu/python-pyproxyfs/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=pyproxyfs +pkgname=python-$_pkgname +pkgver=0.8 +pkgrel=1 +pkgdesc="A proxy filesystem interface with a native filesystem implementation and a very simple test in-memory filesystem." +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') +groups=() +depends=('python') +makedepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=(!emptydirs) +install= +source=("http://pypi.python.org/packages/source/P/PyProxyFS/PyProxyFS-0.8.tar.gz") + +package() { + cd "${srcdir}/PyProxyFS-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +md5sums=('34f769e669877a9fdcfe5f8f93912b88') diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD new file mode 100644 index 000000000..e2e053f11 --- /dev/null +++ b/~lukeshu/xcalib/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) +# adpoted from mOLOk since pkgver=0.7 + +pkgname=xcalib +pkgver=0.8 +pkgrel=4 +pkgdesc="A tiny monitor calibration loader for X.org" +arch=(i686 x86_64) +url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/" +license=('GPL') +depends=(libxxf86vm) +source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz + makefile-ldflags.patch) +md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7' + '6c74457011515dd1cc7f2474af761142') + +build() { + cd "$srcdir/$pkgname-$pkgver/" + patch -p0 < ../makefile-ldflags.patch + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/" + install -Dm755 xcalib $pkgdir/usr/bin/xcalib + + for i in README *.icc *.icm; do + install -Dm644 $i $pkgdir/usr/share/xcalib/$i + done +} diff --git a/~lukeshu/xcalib/makefile-ldflags.patch b/~lukeshu/xcalib/makefile-ldflags.patch new file mode 100644 index 000000000..275c4c3ea --- /dev/null +++ b/~lukeshu/xcalib/makefile-ldflags.patch @@ -0,0 +1,22 @@ +--- Makefile 2007-08-26 23:30:34.000000000 +0200 ++++ Makefile.new 2012-08-20 10:50:27.000000000 +0200 +@@ -50,16 +50,16 @@ + # low overhead version (internal parser) + xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" +- $(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm + + fglrx_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX +- $(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm + + win_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI + windres.exe resource.rc resource.o +- $(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o ++ $(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o + + install: + cp ./xcalib $(DESTDIR)/usr/local/bin/ |
