diff options
Diffstat (limited to 'abs/core')
1244 files changed, 40894 insertions, 31392 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index e872bcf..52303f9 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -5,9 +5,10 @@ conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-co pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted' - 'ddcxinfo' 'python-pexpect' 'python-netifaces' 'LinHES-timezone' + 'python-pexpect' 'python-netifaces' 'python-iplib' 'mythinstall>=2-10') -arch=('i686') +#LinHES-timezone +arch=('i686' 'x86_64') source=(mv_install.py mv_config.py @@ -19,7 +20,7 @@ source=(mv_install.py install_db_chroot.sh restore_default_settings.sh myth_settings_wrapper.sh - xconfig.sh + xconfig.sh timezip.py soundconfig.sh LinHES-release @@ -102,12 +103,12 @@ build() { #Copy in the branding stuff install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release - install -m 0755 issue $startdir/pkg/etc/issue + #install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('18af4fe481e1fc2ae02050026eb5cd27' +md5sums=('4ef6a2f04f5cb1777ac3772eeccdc78f' '16b98fcb3753ef6cfc35075c326d30e4' - 'e36da536dd651ef182e7642337889e77' + '2596460462cf6c889cf8f95485537b20' '985891a43f7c4c983eb2a362162f1a0f' '13172731c8b08d669336da31cece5775' '5a31addfbdc1154b05997f972a32fa33' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 2e60ab7..c7a002d3 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -129,7 +129,7 @@ def mdadm_assemble_all(): def copy_updates(): try: - MVROOT = os.environ["MV_ROOT"] + MVROOT = os.environ["MV_ROOT"].strip() except: logging.debug("MVROOT was not defined, using the default value") MVROOT = "/usr/MythVantage" @@ -475,20 +475,118 @@ def create_squashlist(): logging.debug(i) f.close() +def mount_for_copy_it(): + + image_mount='/image_mount/root' + try: + os.makedirs(image_mount) + except: + pass + image_mount='/image_mount/root' + + image_mount='/image_mount/usr/share' + try: + os.makedirs(image_mount) + except: + pass + + image_mount='/image_mount/lib/modules' + try: + os.makedirs(image_mount) + except: + pass + + image_mount='/image_mount/var/cache/pacman' + try: + os.makedirs(image_mount) + except: + pass + + image_mount='/image_mount/var/lib/pacman' + try: + os.makedirs(image_mount) + except: + pass + + fsimage='root-image' + cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/root' %(fsimage,fsimage) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Mount image root") + + fsimage='lib-modules' + cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/lib/modules' %(fsimage,fsimage) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Mount image lib-modules") + + fsimage='usr-share' + cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/usr/share' %(fsimage,fsimage) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Mount image usr share") + + fsimage='var-lib-pacman' + cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/var/lib/pacman' %(fsimage,fsimage) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Mount image var-lib-pacman") + + fsimage='var-cache-pacman' + cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/var/cache/pacman' %(fsimage,fsimage) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Mount image var-cahce-pacman") + + +def umount_for_copy_it(): + cmd='umount %s' %('/image_mount/lib/modules') + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("unMount image lib_modules") + + cmd='umount %s' %('/image_mount/usr/share') + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("unMount image usr_share") + + cmd='umount %s' %('/image_mount/root') + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("unMount image /") + + cmd='umount %s' %('/image_mount/var/cache/pacman') + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("unMount image var-cache-pacman") + + cmd='umount %s' %('/image_mount/var/lib/pacman') + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("unMount image var-lib-pacman") + + def copy_it(install_type): logging.info("______Transferring to disk______") + mount_for_copy_it() logging.debug( install_type) if ( install_type == "install"): logging.info("Transferring system") - cmd = " unsquashfs -f -d %s /.livesys/medium/larch/system.sqf" %(data_config.MOUNTPOINT) - #runcmd(cmd) - rc = runcmd(cmd)[0] - if rc != 0 : - error_out("Running unsquashfs") + cmdlist = ['rsync -avrp /image_mount/root/* /new_boot', + 'rsync -arvp /image_mount/lib/* /new_boot/lib/', + 'rsync -arvp /image_mount/usr /new_boot', + 'rsync -arvp /image_mount/var /new_boot'] + + #'rsync -arvp /image_mount/lib /new_boot', + + for cmd in cmdlist: + #runcmd(cmd) + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Running %s" %cmd) + - #logging.debug(cmd) - #cmdout=commands.getoutput(cmd) if ( install_type == "upgrade"): logging.info("Upgrading system") @@ -533,12 +631,10 @@ def copy_it(install_type): runcmd(cmd) cmd = "chmod +s %s/bin/mount" %(data_config.MOUNTPOINT) runcmd(cmd) - cmd = "rm %s/etc/*.larch*" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "rm %s/etc/mkinitcpio.d/larch*" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "rm %s/etc/rc.d/functions.d/*larch*" %(data_config.MOUNTPOINT) - runcmd(cmd) + apply_pristine() + post_process() + + umount_for_copy_it() logging.debug("__End of copy_it__") def create_fstab(extralines): @@ -636,6 +732,7 @@ def fstab_it(install_type): elif os.path.exists("/tmp/etc/fstab"): logging.debug(" Upgrade and not Knoppmyth, using old fstab") cp_and_log("/tmp/etc/fstab", fstabfile) + # Catch all for creating new fstab if not os.path.exists(data_config.MOUNTPOINT+"/etc"): os.makedirs(data_config.MOUNTPOINT+"/etc") @@ -735,11 +832,31 @@ def fstab_it(install_type): def grub_it(): logging.info("______Start of grub install______") + cmd = "chroot %s grub-install --target=i386-pc --recheck --debug /dev/%s" %(data_config.MOUNTPOINT,hostoptions["rootdisk"]) + logging.info("Running grub-install") + runcmd(cmd) + + cmd = " mkinitcpio -g %s/boot/initramfs-linux.img" %(data_config.MOUNTPOINT) + logging.info("Running mkinitcpio") + runcmd(cmd) + + + cmd="chroot %s grub-mkconfig -o /boot/grub/grub.cfg" %data_config.MOUNTPOINT + runcmd(cmd) + #rootuuid = find_uuid(hostoptions["rootpartition"]) + #cmd = " mkinitcpio -b %s -g %s/boot/kernel26.img" %(data_config.MOUNTPOINT, data_config.MOUNTPOINT) + #cmd = " mkinitcpio -g %s/boot/initramfs-linux.img" %(data_config.MOUNTPOINT) + #logging.info("Running mkinitcpio") + #runcmd(cmd) + +def grub_it1(): + logging.info("______Start of grub install______") cmd = " grub-install --recheck --no-floppy --root-directory=%s \"(hd0)\" " % data_config.MOUNTPOINT logging.info("Running grub-install") runcmd(cmd) rootuuid = find_uuid(hostoptions["rootpartition"]) cmd = " mkinitcpio -b %s -g %s/boot/kernel26.img" %(data_config.MOUNTPOINT, data_config.MOUNTPOINT) + cmd = " mkinitcpio -g %s/boot/initramfs-linux.img" %(data_config.MOUNTPOINT) logging.info("Running mkinitcpio") runcmd(cmd) logging.info("Adding root uuid to grub menu") @@ -755,6 +872,20 @@ def grub_it(): logging.debug(" Found kernel Root grubline:") logging.debug( templine) templine[2] = "root=/dev/disk/by-uuid/%s" %(rootuuid) + templine[1] = "/boot/vmlinuz-linux" + newline = '' + for i in templine: + newline+=i + newline+=" " + newline+="\n" + logging.debug(" New grub menu.lst line:") + logging.debug( newline) + newgrub.append(newline) + elif line.startswith("initrd"): + templine = line.split() + logging.debug(" Found initrd grubline:") + logging.debug( templine) + templine[1] = "/boot/initramfs-linux.img" newline = '' for i in templine: newline+=i @@ -823,7 +954,7 @@ def apply_new_auth(): logging.info("_____Applying Password updates_______") passfile = "/root/myth_user_call.out" try: - MVROOT = os.environ["MV_ROOT"] + MVROOT = os.environ["MV_ROOT"].strip() except: logging.debug("MVROOT was not defined, using the default value") MVROOT = "/usr/MythVantage" @@ -1030,10 +1161,48 @@ def restore_default_settings(): copy_updates() fix_permissions() +def apply_pristine(): + logging.info("_____Applying Pristine files_______") + if data_config.NOOPDEBUG == "FALSE": + cmd = "chroot " + data_config.MOUNTPOINT + " " + "tar -xvf /pristine.tar" + else: + cmd = "echo chroot " + data_config.MOUNTPOINT + " " + "tar -xvf /pristine.tar" + try: +# Using os.system because runcmd fails + logging.debug(cmd) + os.system(cmd) + except: + logging.debug("Applying pristine files failed %s", passfile) + logging.debug + + try: + removefile="%s/pristine.tar" %(data_config.MOUNTPOINT) + os.remove(removefile) + except OSError: + logging.debug(" Couldn't remove pristine.tar") + pass + +def post_process(): + logging.info("_____Post processing_______") + if data_config.NOOPDEBUG == "FALSE": + cmd = "chroot " + data_config.MOUNTPOINT + " " + "/root/.post_process/go.sh" + else: + cmd = "echo chroot " + data_config.MOUNTPOINT + " " + "/root/.post_process/go.sh" + try: +# Using os.system because runcmd fails + logging.debug(cmd) + os.system(cmd) + except: + logging.debug("Applying post_process_failed %s", passfile) + logging.debug + + + + def full_install(hostoptions): logging.info("______Start of full install______") try: - MVROOT = os.environ["MV_ROOT"] + MVROOT = os.environ["MV_ROOT"].strip() except: logging.debug(" MVROOT was not defined, using the default value") MVROOT = "/usr/MythVantage" @@ -1088,7 +1257,10 @@ def full_install(hostoptions): msg = "Configuring system" update_status(msg) progress(98) + mount_bind_chroot() grub_it() + umount_bind_chroot() + genlocale() special_hardware_check() # Configuring the system @@ -1118,7 +1290,7 @@ def full_install(hostoptions): logging.info("______Installing Database in CHROOT________") mysqldb("stop", '') mount_bind_chroot() - cmd = " chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) + cmd = "chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) logging.info("Running systemconfig in chroot") #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) @@ -1135,7 +1307,7 @@ def full_install(hostoptions): else: logging.info("______No database required, continuing configuration________") mount_bind_chroot() - cmd = " chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT) + cmd = "chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) # Need to check for to touch /tmp/.dbsysfailed #cmd = " chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT) @@ -1282,7 +1454,7 @@ def upgrade_mount_search(): def upgrade(hostoptions): try: - MVROOT = os.environ["MV_ROOT"] + MVROOT = os.environ["MV_ROOT"].strip() except: logging.debug("MVROOT was not defined, using the default value") MVROOT = "/usr/MythVantage" @@ -1385,23 +1557,23 @@ def upgrade(hostoptions): if ( systemconfig["SystemType"] == "Master_backend" or systemconfig["SystemType"] == "Standalone" ): if clean_upgrade() or not backup_sql_check(): logging.info("Installing new database") - cmd = " chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) + cmd = "chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) else: logging.info("Restoring database") - cmd = " chroot %s %s/bin/restore_km_db_chroot.sh %s|tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT, hostoptions["backupfile"]) + cmd = "chroot %s %s/bin/restore_km_db_chroot.sh %s|tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT, hostoptions["backupfile"]) runcmd(cmd) if os.path.exists("/tmp/etc/KnoppMyth-version"): - cmd = " chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t hostsettings " %(data_config.MOUNTPOINT, MVROOT) + cmd = "chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t hostsettings " %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) logging.debug("Correcting permissions because of km->linhes upgrade") - cmd = " chown -R mythtv:mythtv %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT) + cmd = "chown -R mythtv:mythtv %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT) runcmd(cmd) - cmd = " chown -R root:root %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT+"/backup") + cmd = "chown -R root:root %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT+"/backup") runcmd(cmd) else: - cmd = " chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT) + cmd = "chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) logging.info("Running systemconfig in chroot 2nd time") diff --git a/abs/core/LinHES-config/myth_user_call b/abs/core/LinHES-config/myth_user_call index 0914b03..1b8d315 100644 --- a/abs/core/LinHES-config/myth_user_call +++ b/abs/core/LinHES-config/myth_user_call @@ -1,174 +1,159 @@ -#!/bin/bash +#!/usr/bin/python2 +# -*- coding: utf-8 -*- #Wrapper script to manage USERNAME accounts + web security # myth_USERNAME_all -c add -u USERNAME # myth_USERNAME_all -c delete -u USERNAME # myth_USERNAME_all -c pass -u USERNAME -p pass # myth_USERNAME_all -c web -u USERNAME -p pass -INIT_CHECK=TRUE -FULL_CALL="$@" -function CHROOT_CHECK { - INIT=`ps -p 1 -o comm=` - if [ x$INIT = xrunit ] - then - CHROOT_NEEDED=FALSE - else - CHROOT_NEEDED=TRUE - fi -} - -function store_commands () { - echo "$FULL_CALL" >> /root/myth_user_call.out - chmod 600 /root/myth_user_call.out -} - - -function add_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to add user" - store_commands - else - echo "adding user $USERNAME" - useradd -m -s /bin/bash $USERNAME -G audio,video,optical,storage,users - usermod -a -G mythtv $USERNAME - - fi - -} - - -function del_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to delete user" - store_commands - else - echo "removing user $USERNAME" - userdel $USERNAME - fi - -} - - -function pass_change() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to change password" - store_commands - else - echo "changing password for $USERNAME" - echo $USERNAME:$PASSWORD | chpasswd - fi - -} - - -function web_security { - - grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user - if [ $? = 0 ] - then - #delete user - sed -i "/${USERNAME}\:/d" /etc/lighttpd/lighttpd.user - fi - echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user - -} - -function ARG_ERR() { - if [ x$OPTARG = "x" ] - then - echo "$SWITCH NEEDS AND ARG" - exit 11 - fi -} - - -function print_help { - - echo "Valid options are:" - echo " -c (add|delete|pass|web)" - echo " -u USERNAMEname" - echo " -p password" - exit 1 -} - -if [ $# -eq 0 ] -then - print_help -fi - -declare -r OPTSTRING="c:u:p:i" -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - - c) ARG_ERR - OPERATION=$OPTARG - ;; - u) ARG_ERR - USERNAME=$OPTARG - ;; - p) ARG_ERR - PASSWORD=$OPTARG - ;; - i) INIT_CHECK=FALSE - - esac -done - -if [ $INIT_CHECK = TRUE ] -then - CHROOT_CHECK -else - CHROOT_NEEDED=FALSE -fi - -case $OPERATION in - add) - if [ x$USERNAME = x ] - then - print_help - fi - add_user - ;; - delete) - if [ x$USERNAME = x ] - then - print_help - fi - del_user - ;; - pass) - if [ x$USERNAME = x ] - then - print_help - fi - - if [ x$PASSWORD = x ] - then - print_help - fi - pass_change - ;; - - web) - if [ x$USERNAME = x ] - then - print_help - fi - - - if [ x$PASSWORD = x ] - then - print_help - fi - echo "adding webUSERNAME $USERNAME with pass $PASSWORD" - web_security - ;; - *) print_help - ;; -esac - +import pexpect, sys, time +import os, re, getopt +import mv_common + + + + +def chroot_check(): + if not INIT_CHECK : + return False + cmd = '''ps -p 1 -o comm=''' + init = mv_common.runcmd_output(cmd).strip() + if init == "runit": + return False + else: + return True + + +def store_commands(full_call): + file_name = "/root/myth_user_call.out" + try: + f = open(file_name,'a') + except: + print "%s could not be opened" % file_name + sys.exit(1) + f.write(full_call) + f.write("\n") + f.close() + try: + os.chmod(600,file_name) + except: + pass + + +def add_user(username,full_call): + if chroot_check() : + print "calling myth_call_user in chroot to add user" + store_commands(full_call) + else: + print "Adding user %s" %username + cmd = '''useradd -m -s /bin/bash %s -G audio,video,optical,storage,users''' %username + mv_common.runcmd(cmd) + cmd = ''' usermod -a -G mythtv %s ''' %username + + +def del_user(username,full_call): + if chroot_check() : + print "calling myth_call_user in chroot to del user" + store_commands(full_call) + else: + print "Removing user %s" %username + cmd = '''userdel %s ''' %username + mv_common.runcmd(cmd) + + +def pass_change(username,password,full_call) : + if chroot_check() : + print "calling myth_call_user in chroot to change password" + store_commands(full_call) + else: + print "changing password for %s" %username + passwd = pexpect.spawn("/usr/bin/passwd %s" % username) + + for repeat in (1, 2): + passwd.expect("password: ") + passwd.sendline(password) + time.sleep(0.1) + +def web_security(username,password) : + file_name = "/etc/lighttpd/lighttpd.user" + file_contents = '' + if os.path.exists(file_name): + try: + f = open(file_name,'r') + file_contents = f.readlines() + except: + print " couldn't read %s" % file_name + try: + f = open(file_name,'w') + except: + print "%s could not be opened for writing" % file_name + return + + for line in file_contents: + if not re.search(username, line): + f.write(line) + line = "%s:%s" %(username, password) + f.write(line) + f.write("\n") + f.close() + + +def usage (): + print "Valid options are:" + print " -c (add|delete|pass|web)" + print " -u USERNAME" + print " -p password" + sys.exit(0) + +def main(argv): + global INIT_CHECK + full_call = "" + INIT_CHECK = True + try: + opts, args = getopt.getopt(argv, 'c:u:p:ih' ) + except getopt.GetoptError, why: + print why + usage() + print "exception happened" + sys.exit(2) + + for opt, arg in opts: + if opt in ("-h", "--help"): + usage() + sys.exit(0) + elif opt in ("-c") : + module = arg + full_call += ''' -c %s ''' %re.escape(arg) + elif opt in ("-u") : + username = arg + full_call += ''' -u %s ''' %re.escape(arg) + elif opt in ("-p") : + password = arg + full_call += ''' -p %s ''' %re.escape(arg) + elif opt in ("-i") : + INIT_CHECK = False + full_call += ''' -i ''' + try: + username + except: + usage() + + if module == "add": + add_user(username,full_call) + elif module == "delete": + del_user(username,full_call) + elif module == "pass": + try: + password + except: + print "needs a password" + usage() + pass_change(username,password,full_call) + elif module == "web": + web_security(username,password) + else: + usage() + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6881e3c..2c605e6 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,12 +1,13 @@ pkgname=LinHES-system pkgver=2 pkgrel=52 -arch=('i686') +arch=('i686' 'x86_64') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin install=LinHES.install pkgdesc="scripts and things related to having an automated system" -depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks' 'LinHES-config>=2.3-59') +#depends=(linhes-sounds xdotool tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks' 'LinHES-config>=2.3-59') +depends=(linhes-sounds xdotool tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'udisks' 'LinHES-config>=2.3-59' 'sudo') backup=(etc/modprobe.d/alsa-base) binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run diff --git a/abs/core/LinHES-timezone/PKGBUILD b/abs/core/LinHES-timezone/PKGBUILD index 05a48fc..8864102 100644 --- a/abs/core/LinHES-timezone/PKGBUILD +++ b/abs/core/LinHES-timezone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=LinHES-timezone pkgver=1 pkgrel=10 pkgdesc="GUI timezone selector used by LinHES-config." -arch=i686 +arch=('i686' 'x86_64') depends=() makedepends=(mdbtools) source=(Makefile diff --git a/abs/core/acl/PKGBUILD b/abs/core/acl/PKGBUILD index 96c51fd..b6e38ec 100644 --- a/abs/core/acl/PKGBUILD +++ b/abs/core/acl/PKGBUILD @@ -1,8 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 158574 2012-05-05 00:02:35Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=acl pkgver=2.2.51 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" @@ -12,23 +13,22 @@ replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' + '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib - make + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DIST_ROOT="${pkgdir}" install install-lib install-dev + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f ${pkgdir}/lib/libacl.a - chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* + rm -f "$pkgdir"/usr/lib/libacl.a + chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* } diff --git a/abs/core/alsa-lib/PKGBUILD b/abs/core/alsa-lib/PKGBUILD index c0009d0..b04e7ef 100644 --- a/abs/core/alsa-lib/PKGBUILD +++ b/abs/core/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94180 2010-10-05 03:01:02Z eric $ +# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -16,12 +16,12 @@ source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-pythonlibs="-lpthread -lm -ldl -lpython2.6" --with-pythonincludes=-I/usr/include/python2.6 - make || return 1 + ./configure --prefix=/usr --with-pythonlibs="-lpthread -lm -ldl -lpython2.7" --with-pythonincludes=-I/usr/include/python2.7 + make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/abs/core/alsa-lib/__changelog b/abs/core/alsa-lib/__changelog deleted file mode 100644 index c02f65c..0000000 --- a/abs/core/alsa-lib/__changelog +++ /dev/null @@ -1 +0,0 @@ ---withpythonlibs="...python2.6..." -mh diff --git a/abs/core/apache/PKGBUILD b/abs/core/apache/PKGBUILD index 4ba626c..fd13bdd 100644 --- a/abs/core/apache/PKGBUILD +++ b/abs/core/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96448 2010-10-21 09:16:04Z jgc $ +# $Id: PKGBUILD 161295 2012-06-08 23:50:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.17 -pkgrel=1 +pkgver=2.2.22 +pkgrel=4 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -18,8 +18,10 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf etc/logrotate.d/httpd) depends=('openssl' 'zlib' 'apr-util' 'pcre') optdepends=('lynx: apachectl status') -_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02 +install=apache.install +_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 + http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc ${_itkurl}/02-rename-prefork-to-itk.patch ${_itkurl}/03-add-mpm-to-build-system.patch ${_itkurl}/04-correct-output-makefile-location.patch @@ -29,30 +31,38 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 ${_itkurl}/08-max-clients-per-vhost.patch ${_itkurl}/09-capabilities.patch ${_itkurl}/10-nice.patch + ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch apachectl-confd.patch apache.conf.d + apache.tmpfiles.conf httpd.logrotate httpd - arch.layout) -md5sums=('16eadc59ea6b38af33874d300973202e' - 'db42cfcc18ae1c32aaaff2347e35b79d' - '131408ad4dc7b18547b4e062e7e495ab' - 'ee488f391054d528547c3a372faa2aa7' - 'b202944761b2f0516196488b12504236' - '78fa15f8ca3a284b7d71f942e24e47fb' - 'd33e39350e987721d50e6fb8e164ab6b' - '9f7a8935f9cabc7b46d0052906634cef' - '1b28e3363e1b0d05b738a21e7ddd264f' - 'd9667fcd2ffecc63e446edd4d6666731' + arch.layout + pcre_info.patch) +md5sums=('9fe3093194c8a57f085ff7c3fc43715f' + '41b3a6e4948679cab70b9caf490877c4' + 'f1d9d41360908ceb2374da55ae99197a' + 'cdfa04985a0efa850976aef01c2a0c40' + '0930d2d0612eb0a53a0d00aea7e8687f' + '3a0c29bb91442c33ea73ebbe072af922' + '0ef4729a6f1ffc848ad0e9b440a66f66' + '940944caa948340b11ddae56adaef89b' + 'ce09a987523884de8838f73dc8ec0d19' + 'e75b7dd8d8afcd299ba4ab2ab81c11e4' + 'ce1ccc21f3ad8625169c8f62913450ac' + '1e5b222edcfbf99a3edc56fcb2074fbe' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' + '82068753dab92fe86312b1010a2904d7' '6382331e9700ed9e8cc78ea51887b537' 'c7e300a287ef7e2e066ac7639536f87e' - '3d659d41276ba3bfcb20c231eb254e0c') + '3d659d41276ba3bfcb20c231eb254e0c' + 'fde5121e32b5aeef5a7eedb5a97009ff') build() { cd "${srcdir}/httpd-${pkgver}" + patch -p1 -i "${srcdir}/pcre_info.patch" patch -Np0 -i "${srcdir}/apachectl-confd.patch" # set default user @@ -64,6 +74,9 @@ build() { for mpm in prefork worker itk; do if [ "${mpm}" = "itk" ]; then + # Fix patch to apply with latest Apache version + sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" + mkdir -p server/mpm/experimental/itk cp -r server/mpm/prefork/* server/mpm/experimental/itk/ mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c @@ -77,6 +90,7 @@ build() { patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" patch -Np1 -i "${srcdir}/09-capabilities.patch" patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" autoconf fi @@ -103,8 +117,7 @@ build() { --with-apr-util=/usr/bin/apu-1-config \ --with-pcre=/usr \ --with-mpm=${mpm} - make || return 1 - + make if [ "${mpm}" = "prefork" ]; then make DESTDIR="${pkgdir}" install else @@ -116,6 +129,7 @@ build() { install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" + install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" # symlinks for /etc/httpd ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" @@ -137,4 +151,5 @@ build() { rm -rf "${pkgdir}/etc/httpd/conf/original" rm -rf "${pkgdir}/srv/" rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/var/run" } diff --git a/abs/core/apache/__changelog b/abs/core/apache/__changelog deleted file mode 100644 index bbcbdac..0000000 --- a/abs/core/apache/__changelog +++ /dev/null @@ -1 +0,0 @@ -update to 2.2.17 diff --git a/abs/core/apache/apache.install b/abs/core/apache/apache.install new file mode 100644 index 0000000..9b74e60 --- /dev/null +++ b/abs/core/apache/apache.install @@ -0,0 +1,3 @@ +post_install() { + systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf +} diff --git a/abs/core/apache/apache.tmpfiles.conf b/abs/core/apache/apache.tmpfiles.conf new file mode 100644 index 0000000..7447752 --- /dev/null +++ b/abs/core/apache/apache.tmpfiles.conf @@ -0,0 +1 @@ +d /run/httpd 0755 root root - diff --git a/abs/core/apache/httpd.logrotate b/abs/core/apache/httpd.logrotate deleted file mode 100644 index a723d20..0000000 --- a/abs/core/apache/httpd.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/httpd/*log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/abs/core/apache/pcre_info.patch b/abs/core/apache/pcre_info.patch new file mode 100644 index 0000000..906a315 --- /dev/null +++ b/abs/core/apache/pcre_info.patch @@ -0,0 +1,22 @@ +--- httpd-2.2.22/server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100 ++++ httpd-2.2.22/server/util_pcre.c 2012-02-08 11:23:56.273855663 +0100 +@@ -128,6 +128,7 @@ + const char *errorptr; + int erroffset; + int options = 0; ++int nsub; + + if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; + if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE; +@@ -136,8 +137,9 @@ + preg->re_erroffset = erroffset; + + if (preg->re_pcre == NULL) return AP_REG_INVARG; +- +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &nsub); ++preg->re_nsub = nsub; + return 0; + } + diff --git a/abs/core/apr-util/PKGBUILD b/abs/core/apr-util/PKGBUILD index 0af3cc8..4a8b380 100644 --- a/abs/core/apr-util/PKGBUILD +++ b/abs/core/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 149396 2012-02-07 13:30:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.3.12 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('0f671b037ca62751a8a7005578085560') +md5sums=('52b31b33fb1aa16e65ddaefc76e41151') build() { cd "${srcdir}/apr-util-${pkgver}" @@ -22,6 +22,11 @@ build() { make } +check() { + cd "${srcdir}/apr-util-${pkgver}" + make -j1 check +} + package() { cd "${srcdir}/apr-util-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/apr/PKGBUILD b/abs/core/apr/PKGBUILD index b0d3f4d..a1e496a 100644 --- a/abs/core/apr/PKGBUILD +++ b/abs/core/apr/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 72235 2010-03-13 20:22:25Z jgc $ +# $Id: PKGBUILD 158966 2012-05-13 20:20:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.4.2 +pkgver=1.4.6 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('util-linux-ng>=2.16') +depends=('util-linux') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('4b00e8f70c067893d075577962656b35') +md5sums=('ffee70a111fd07372982b0550bbb14b7') build() { cd "${srcdir}/apr-${pkgver}" - export apr_cv_epoll_create1=no - export apr_cv_dup3=no - export apr_cv_accept4=no - export apr_cv_sock_cloexec=no - ./configure --prefix=/usr --includedir=/usr/include/apr-1 \ --with-installbuilddir=/usr/share/apr-1/build \ --enable-nonportable-atomics \ - --with-devrandom=/dev/urandom || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --with-devrandom=/dev/urandom + make +} + +check() { + cd "${srcdir}/apr-${pkgver}" + make -j1 check +} + +package() { + cd "${srcdir}/apr-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/archlinux-keyring/PKGBUILD b/abs/core/archlinux-keyring/PKGBUILD new file mode 100644 index 0000000..b0ff4f6 --- /dev/null +++ b/abs/core/archlinux-keyring/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 162172 2012-06-22 16:21:47Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=archlinux-keyring +pkgver=20120622 +pkgrel=1 +pkgdesc='Arch Linux PGP keyring' +arch=('any') +url='https://projects.archlinux.org/archlinux-keyring.git/' +license=('GPL') +install="${pkgname}.install" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('8fecc7ec4a9b51e3166b79a90930e7ce' + 'afa0253f24c6ba3fee22ae6c2150cb6c') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR=${pkgdir} install +} diff --git a/abs/core/archlinux-keyring/archlinux-keyring.install b/abs/core/archlinux-keyring/archlinux-keyring.install new file mode 100644 index 0000000..81726c6 --- /dev/null +++ b/abs/core/archlinux-keyring/archlinux-keyring.install @@ -0,0 +1,11 @@ +post_upgrade() { + if usr/bin/pacman-key -l >/dev/null 2>&1; then + usr/bin/pacman-key --populate archlinux + fi +} + +post_install() { + if [ -x usr/bin/pacman-key ]; then + post_upgrade + fi +} diff --git a/abs/core/aspell/PKGBUILD b/abs/core/aspell/PKGBUILD index 8d584b9..1b88938 100644 --- a/abs/core/aspell/PKGBUILD +++ b/abs/core/aspell/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 19099 2008-11-14 21:50:10Z thayer $ +# $Id: PKGBUILD 131851 2011-07-16 03:59:19Z eric $ # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: dorphell <dorphell@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aspell -pkgver=0.60.6 +pkgver=0.60.6.1 _pkgmajorver=0.60 -pkgrel=4 +pkgrel=1 pkgdesc="A spell checker designed to eventually replace Ispell" -url="http://aspell.net/" arch=('i686' 'x86_64') +url="http://aspell.net/" license=('LGPL') -depends=('gcc-libs' 'ncurses>=5.6-7') +depends=('gcc-libs' 'ncurses') optdepends=('perl: to import old dictionaries') -options=(!libtool) +options=('!libtool') install=aspell.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('bc80f0198773d5c05086522be67334eb') +md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7') +sha1sums=('ff1190db8de279f950c242c6f4c5d5cdc2cbdc49') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - ln -s ${pkgname}-${_pkgmajorver} ${pkgdir}/usr/lib/${pkgname} || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc + make +} - # cleanup info files - rm ${pkgdir}/usr/share/info/dir || return 1 - gzip ${pkgdir}/usr/share/info/* || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s ${pkgname}-${_pkgmajorver} "${pkgdir}/usr/lib/${pkgname}" } diff --git a/abs/core/aspell/aspell.install b/abs/core/aspell/aspell.install index 2747f02..4bb848e 100644 --- a/abs/core/aspell/aspell.install +++ b/abs/core/aspell/aspell.install @@ -1,23 +1,24 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(aspell.info aspell-dev.info) post_install() { + echo "==> aspell comes with no default dictionary" + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file $infodir/dir 2> /dev/null done - echo "==> aspell comes with no default dictionary" } post_upgrade() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file $infodir/dir 2> /dev/null done } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/atk/PKGBUILD b/abs/core/atk/PKGBUILD index 744f67f..626785f 100644 --- a/abs/core/atk/PKGBUILD +++ b/abs/core/atk/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 91408 2010-09-27 08:07:52Z jgc $ +# $Id: PKGBUILD 156707 2012-04-23 09:03:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=atk -pkgver=1.32.0 +pkgver=2.4.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('LGPL') -depends=('glib2>=2.25.17') -makedepends=('pkgconfig' 'gobject-introspection') +depends=('glib2') +makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e') +sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/abs/core/attr/PKGBUILD b/abs/core/attr/PKGBUILD index 229f36f..5fb0a8e 100644 --- a/abs/core/attr/PKGBUILD +++ b/abs/core/attr/PKGBUILD @@ -1,8 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=attr pkgver=2.4.46 -pkgrel=1 +pkgrel=2 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/attr" @@ -13,25 +14,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' + 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - + cd "$pkgname-$pkgver" + export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - - make DIST_ROOT="${pkgdir}" install install-lib install-dev + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "${pkgdir}"/lib/libattr.a - chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + rm -f "$pkgdir"/usrlib/libattr.a + chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* + # remove conflicting manpages - rm -rf "${pkgdir}"/usr/share/man/man2 + rm -rf "$pkgdir"/usr/share/man/man2 } diff --git a/abs/core/audiofile/PKGBUILD b/abs/core/audiofile/PKGBUILD index 501497f..2c92888 100644 --- a/abs/core/audiofile/PKGBUILD +++ b/abs/core/audiofile/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 78833 2010-04-28 13:14:52Z jgc $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 158087 2012-05-02 16:52:54Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + pkgname=audiofile -pkgver=0.2.7 +pkgver=0.3.4 pkgrel=1 pkgdesc="Silicon Graphics Audio File Library" arch=('i686' 'x86_64') url="http://www.68k.org/~michael/audiofile/" license=('LGPL') -depends=('glibc') +depends=('gcc-libs' 'alsa-lib') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('61efd278627415b5468426fc9e52aef32ea0fdac12b56bcdd72734c2ece5945e') +source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz") +md5sums=('2ed06d64ee552a2ce490f54351b86ccd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/autoconf/PKGBUILD b/abs/core/autoconf/PKGBUILD index 1ac8ed6..6f3e18c 100644 --- a/abs/core/autoconf/PKGBUILD +++ b/abs/core/autoconf/PKGBUILD @@ -1,25 +1,42 @@ -# $Id: PKGBUILD 12545 2008-09-15 12:33:36Z andyrtr $ -# Maintainer: Andreas Radke <adyrtr@archlinux.org> +# $Id: PKGBUILD 157321 2012-04-27 00:50:14Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=autoconf -pkgver=2.66 +pkgver=2.69 pkgrel=1 pkgdesc="A GNU tool for automatically configuring source code" -arch=(i686 x86_64) -license=('GPL2' 'GPL3') +arch=('any') +license=('GPL2' 'GPL3' 'custom') url="http://www.gnu.org/software/autoconf" groups=('base-devel') depends=('awk' 'm4' 'diffutils' 'bash') +# for test-suite +#makedepends=('gcc-fortran' 'erlang') install=autoconf.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('50f97f4159805e374639a73e2636f22e' + '2941e2fe687e05b3431eac6b714053bc') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/usr/share/info/dir + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # license exception + install -Dm644 COPYING.EXCEPTION \ + $pkgdir/usr/share/licenses/autoconf/COPYING.EXCEPTION + # conflict with bintuils rm -f ${pkgdir}/usr/share/info/standards.info } -md5sums=('fb00d77cbc468994c55919298af1ff02') diff --git a/abs/core/autoconf/autoconf.install b/abs/core/autoconf/autoconf.install index 6440ec6..7f3a099 100644 --- a/abs/core/autoconf/autoconf.install +++ b/abs/core/autoconf/autoconf.install @@ -2,8 +2,9 @@ infodir=/usr/share/info filelist=(autoconf.info) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,9 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/automake/PKGBUILD b/abs/core/automake/PKGBUILD index 0b3a6f2..c9bbe1c 100644 --- a/abs/core/automake/PKGBUILD +++ b/abs/core/automake/PKGBUILD @@ -1,25 +1,37 @@ -# $Id: PKGBUILD 19545 2008-11-26 18:00:03Z andyrtr $ +# $Id: PKGBUILD 163495 2012-07-13 12:31:30Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=automake -pkgver=1.11.1 +pkgver=1.12.2 pkgrel=1 pkgdesc="A GNU tool for automatically creating Makefiles" -arch=(i686 x86_64) +arch=('any') license=('GPL') url="http://www.gnu.org/software/automake" groups=('base-devel') -depends=('perl' 'bash' 'texinfo' 'autoconf>=2.60') +depends=('perl' 'bash') +makedepends=('autoconf') install=automake.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + automake-1.12.2-aclocal7-test-fix.diff) +md5sums=('56c3ab38a5ed8f2b825341b4e007372a' + '09e754ad7198853dc6abe22cc5e6ba4b' + '12280109fc55cfb6197feecfbe7ab513') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} - rm -f ${pkgdir}/usr/share/info/dir +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } -md5sums=('4ee7f0ff5f0e467d58b6bd5da96b1c74') diff --git a/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff b/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff new file mode 100644 index 0000000..e1fd4ba --- /dev/null +++ b/abs/core/automake/automake-1.12.2-aclocal7-test-fix.diff @@ -0,0 +1,18 @@ +Fix a race condition that causes aclocal7 to fail on fast machines (see the +comment below). + +diff -x config.log -x config.status -ru tmp/automake-1.12.2/t/aclocal7.sh work/automake-1.12.2/t/aclocal7.sh +--- tmp/automake-1.12.2/t/aclocal7.sh 2012-07-08 11:48:25.000000000 +0100 ++++ work/automake-1.12.2/t/aclocal7.sh 2012-07-10 11:58:50.325999591 +0100 +@@ -45,6 +45,11 @@ + $AUTOMAKE --no-force + } + ++# aclocal will rewrite aclocal.m4 unless the input files are all older than the ++# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp ++# than the aclocal.m4 that the next aclocal call will generate. ++$sleep ++ + $ACLOCAL -I m4 + AUTOMAKE_after_aclocal + diff --git a/abs/core/automake/automake.install b/abs/core/automake/automake.install index a1030e5..10c2f2d 100644 --- a/abs/core/automake/automake.install +++ b/abs/core/automake/automake.install @@ -2,8 +2,9 @@ infodir=/usr/share/info filelist=(automake.info automake.info-1 automake.info-2) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,8 +13,9 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } diff --git a/abs/core/avahi/ChangeLog b/abs/core/avahi/ChangeLog deleted file mode 100644 index 57984a3..0000000 --- a/abs/core/avahi/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ - -2009-04-23 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.25 - -2009-03-21 Eric Belanger <eric@archlinux.org> - - * Added optdepends for avahi-discover (close FS#11250) - -2009-01-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.24 - -2008-07-22 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.23 - diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD index 3ab5c8b..424bf2c 100644 --- a/abs/core/avahi/PKGBUILD +++ b/abs/core/avahi/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 94183 2010-10-05 07:08:54Z bisson $ +# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi -pkgver=0.6.27 -pkgrel=8 -pkgdesc='A multicast/unicast DNS-SD framework' -arch=('i686' 'x86_64') +pkgver=0.6.31 +pkgrel=3 +pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') +arch=('i686' 'x86_64') +options=('!libtool' '!emptydirs') depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') -optdepends=('gtk2: avahi-discover-standalone' +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' 'qt: qt bindings' 'pygtk: avahi-bookmarks, avahi-discover' @@ -17,62 +20,59 @@ optdepends=('gtk2: avahi-discover-standalone' 'mono: mono bindings' 'dbus-python: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection>=0.9.10') -backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=avahi.install +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=('etc/avahi/hosts' + 'etc/avahi/avahi-daemon.conf' + 'etc/avahi/services/ssh.service' + 'etc/avahi/services/sftp-ssh.service') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') -options=('!libtool') -source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz - avahi-daemon-dbus.patch - gnome-nettool.png - introspection.patch) -sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b' - '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61' - 'cf56387c88aed246b9f435efc182ef44de4d52f3' - '999d71add829ab9bb55262855dfe04126ac7975c') + +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch" - patch -Np1 -i "${srcdir}/introspection.patch" + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i ../rc.d.patch - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-gtk3 \ - --disable-qt3 \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ - make || return 1 + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install || return 1 - - # howl and mdnsresponder compatability - cd "${pkgdir}"/usr/include - ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h - ln -s avahi-compat-howl howl - cd "${pkgdir}"/usr/lib/pkgconfig - ln -s avahi-compat-howl.pc howl.pc + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover} + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) } diff --git a/abs/core/avahi/__changelog b/abs/core/avahi/__changelog index f8fec40..07b29bb 100644 --- a/abs/core/avahi/__changelog +++ b/abs/core/avahi/__changelog @@ -1 +1 @@ -disable qt3 in configure and remove make and optdepends on it. +removed php diff --git a/abs/core/avahi/avahi-daemon-dbus.patch b/abs/core/avahi/avahi-daemon-dbus.patch deleted file mode 100644 index a168f03..0000000 --- a/abs/core/avahi/avahi-daemon-dbus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- initscript/archlinux/avahi-daemon.in 2010-08-17 22:23:46.510293144 +0200 -+++ initscript/archlinux/avahi-daemon.in 2010-08-17 22:46:58.110163026 +0200 -@@ -33,6 +35,8 @@ - - case "$1" in - start) -+ ck_daemon dbus && /etc/rc.d/dbus start -+ modprobe capability &> /dev/null - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/abs/core/avahi/avahi.install b/abs/core/avahi/install index 7c75c3d..7c75c3d 100644 --- a/abs/core/avahi/avahi.install +++ b/abs/core/avahi/install diff --git a/abs/core/avahi/introspection.patch b/abs/core/avahi/introspection.patch deleted file mode 100644 index 88a7a73..0000000 --- a/abs/core/avahi/introspection.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir ---- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir 2010-06-27 02:38:43.018291433 +0200 -+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-30 16:16:41.260000339 +0200 -@@ -1,10 +1,12 @@ - <?xml version="1.0"?> --<repository version="1.0" -+<repository version="1.2" - xmlns="http://www.gtk.org/introspection/core/1.0" - xmlns:c="http://www.gtk.org/introspection/c/1.0" - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - <namespace name="AvahiCore" version="0.6" shared-library="avahi-core"> -- <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/> -+ <alias name="IfIndex" target="int"> -+ <type name="AvahiIfIndex" c:type="AvahiIfIndex"/> -+ </alias> - <enumeration name="Protocol" c:type="AvahiProtocol"> - <member name="inet" - value="0" diff --git a/abs/core/avahi/rc.d.patch b/abs/core/avahi/rc.d.patch new file mode 100644 index 0000000..fd73573 --- /dev/null +++ b/abs/core/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/abs/core/b43-fwcutter/PKGBUILD b/abs/core/b43-fwcutter/PKGBUILD index c4a9cf4..5aa75bb 100644 --- a/abs/core/b43-fwcutter/PKGBUILD +++ b/abs/core/b43-fwcutter/PKGBUILD @@ -2,24 +2,23 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=b43-fwcutter -pkgver=013 +pkgver=015 pkgrel=1 pkgdesc="firmware extractor for the bcm43xx kernel module" url="http://linuxwireless.org/en/users/Drivers/b43" depends=('glibc') license=('GPL') arch=('i686' 'x86_64') -source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3547ec6c474ac1bc2c4a5bb765b791a4') +source=("http://bues.ch/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2") +md5sums=('628e030565222a107bc40300313cbe76') -build() -{ - cd $srcdir/$pkgname-$pkgver - make || return 1 +build() { + cd $srcdir/$pkgname-$pkgver + make } + package() { - cd $srcdir/$pkgname-$pkgver - install -D -m755 b43-fwcutter $pkgdir/usr/bin/b43-fwcutter || return 1 - install -D -m644 b43-fwcutter.1 $pkgdir/usr/share/man/man1/b43-fwcutter.1 || return 1 + cd $srcdir/$pkgname-$pkgver + install -D -m755 b43-fwcutter $pkgdir/usr/bin/b43-fwcutter + install -D -m644 b43-fwcutter.1 $pkgdir/usr/share/man/man1/b43-fwcutter.1 } - diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD index 7c7eaca..02a6283 100644 --- a/abs/core/bash/PKGBUILD +++ b/abs/core/bash/PKGBUILD @@ -1,69 +1,155 @@ -# $Id: PKGBUILD 82719 2010-06-16 04:44:35Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash -_patchlevel=007 #prepare for some patches -pkgver=4.1.$_patchlevel -pkgrel=2 +_basever=4.2 +_patchlevel=037 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=1 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/bash/bash.html" groups=('base') -backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile) +backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) depends=('readline>=6.1' 'glibc') -makedepends=(gzip) provides=('sh') install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz - profile.bash - bashrc - enable-system-config-files.patch - system.bashrc) +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) if [ $_patchlevel -gt 000 ]; then - for (( p=1; p<=$_patchlevel; p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$(printf "%03d" $p)) + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) done fi build() { - cd ${srcdir}/${pkgname}-4.1 - for p in ../bash41-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} || return 1 + cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done - patch -Np0 -i $srcdir/enable-system-config-files.patch || return 1 + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' + -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' + -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" ./configure --prefix=/usr --with-curses --enable-readline \ --without-bash-malloc --with-installed-readline \ --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +check() { + cd ${srcdir}/${pkgname}-$_basever + make check +} - install -D -m644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash || return 1 - install -D -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc || return 1 +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install # for now, bash is our default /bin/sh cd ${pkgdir}/bin ln -s bash sh - mkdir -p ${pkgdir}/etc/skel/ - install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc - echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile + install -dm755 ${pkgdir}/etc/skel/ + + # system-wide configuration files + install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc + install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout + + # user configuration file skeletons + install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc + install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile + install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout } -md5sums=('9800d8724815fd84994d9be65ab5e7b8' - '17f20ec69535a2f50f2112a8c700630d' - '3d2837e84645eac9bde399b58014bafa' - '51725defa4c2dec49c1bc15883e0bee2' - '196697769f1667a8a1aed608811129c6' - '582dea5671b557f783e18629c2f77b68' - '118d465095d4a4706eb1d34696a2666a' - '120f7cf039a40d35fe375e59d6f17adc' - '336ee037fc2cc1e2350b05097fbdc87c' - '9471e666797f0b03eb2175ed752a9550' - 'fb80ccd58cb1e34940f3adf4ce6e4a1e' - '192a8b161d419a1d0d211169f1d1046e') - +md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + '3546099a1b2f667adc9794f52e78e35b' + '472f536d7c9e8250dc4568ec4cfaf294' + '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' + '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' + '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' + 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' + 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' + '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' + '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' + '4c5835f2fbab36c4292bb334977e5b6d' + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + 'cec7c92a4d8052ea4b29216365d16566' + '58deacf3d57cbd75575444ff6a3b0806' + '9ed2a08e549c3c17745f19e8413cfb31' + '72d5059820015231483bb7415d09e9db' + '45b04b41a4230f469d3e47ab9952c2df' + '608336ebe215984ef126e3c29d2d3409' + '623f63025d155a84977b62531e260ee2' + 'ed19da878e3f630834c62b9d9dcc6fce' + 'eef2dd4a0e4505dc8f8e664b40c6cd66' + '2d07daba0b8ca8f876d2aa052ff594b4' + '0cb823a44e6dc1cde7ac97ae5c8163c9' + '53d246537e1fffd1aaa02ba5c056211c' + '60f983a1dded5f0b28040ff4b3f1e9b5' + '304fd129a58fee2d8a34f8b4704db0aa' + '9df4bf4f46aaadc436f430187741f815' + '6921a0b4228fe89b6537a5c29f027c89' + '4ef0e2a2cbfbdd53346f927000b7e112' + '1195d85447f3d048d2c9bcd075fa765c' + 'b0f3a651ce29a1feee687d93177870f1' + 'b09000bba08da6ac753124593850cdf7' + '204bb5054d1f8bafe2b446d4e5d0d99a' + '09d3f96a16b881334cfaee0cf320b47e' + 'aab415350bcc2bb0c29943b413499d96' + '597bf71a2aac6feb510b7505cdd3d4f7' + 'b0db384bdedecafbdd70c8d22c56af5f' + '3fab459b4e09daea529cacad025b13b3' + 'bab99835ad6198cb1109fac89a085262' + '4ad8d11e72afc6090e701073ff034cf4' + '5658ef10c9d0d804126ec1ce700e4e2c' + 'c7d2493e44490f01dd20bdc8feb0a6a7' + 'e4855dbc4b743618b54d408bd5878637' + '9f19c199dd8d1fa9254eebe738759272' + '600c8e90c2fb13cdbc7aa3f18566df03' + 'a6ed82daf034587aee2f2581ba5fe829' + '821620a0389df723644911c56796ca8c' + 'da9265aa2527fd4a7481baa3e0550287' + '0043f8b75f46f43608a67b863e300fe8' + 'ec444d229e8899fbaaf6fc7de2d82ae6' + 'b632fca3a4943825bfaf3bd29df6b27d' + 'b4bc1c4dc1b508ff9cdfc44f1a5039b5' + '2ffa9a802bbd57540021715f84cc76f4' + '89390ff6a3c2ef7e09dd4b8b097a8e56' + '3e9b529ef3726b75d125d678de76977f' + 'eee08003395c417f677d1a4bf8c548ee' + 'f670f7672b11d0df8c31885dbf15f390' + '2fe070dd6d75d8ff16f269184a16e9c4' + '5018b6b7737808141043b57cf4eb842d' + '4e610506c1711bf3483b965800ac3d5d' + 'cb65e541f9b60a8cb1fe58404f264b73' + '7cd9bfdf7cbfd45274d07620ee94c8d9' + 'a7d2eace0da5fd236c93dbfd93458838' + '9c3142956064d175a880bcb186e51ef9' + 'a1a87649853f20fe99572ddc02b0c67f' + 'c10692f447d4966c879f8fb8d7c8ebc9' + '1bf5e34ad46566bc2d0eb7560ff8968e') diff --git a/abs/core/bash/bash.install b/abs/core/bash/bash.install index 5c3c435..bc75e9b 100644 --- a/abs/core/bash/bash.install +++ b/abs/core/bash/bash.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=(bash.info) post_install() { @@ -18,4 +18,3 @@ pre_remove() { usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done } -# vim:set ts=2 sw=2 et: diff --git a/abs/core/bash/bashrc b/abs/core/bash/bashrc deleted file mode 100644 index 0963431..0000000 --- a/abs/core/bash/bashrc +++ /dev/null @@ -1,6 +0,0 @@ - -# Check for an interactive session -[ -z "$PS1" ] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/abs/core/bash/dot.bash_logout b/abs/core/bash/dot.bash_logout new file mode 100644 index 0000000..0e4e4f1 --- /dev/null +++ b/abs/core/bash/dot.bash_logout @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# diff --git a/abs/core/bash/dot.bash_profile b/abs/core/bash/dot.bash_profile new file mode 100644 index 0000000..5545f00 --- /dev/null +++ b/abs/core/bash/dot.bash_profile @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/abs/core/bash/dot.bashrc b/abs/core/bash/dot.bashrc new file mode 100644 index 0000000..a355b0c --- /dev/null +++ b/abs/core/bash/dot.bashrc @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' diff --git a/abs/core/bash/enable-system-config-files.patch b/abs/core/bash/enable-system-config-files.patch deleted file mode 100644 index 5295355..0000000 --- a/abs/core/bash/enable-system-config-files.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bash-4.0/config-top.h 2009-01-04 11:32:23.000000000 -0800 -+++ config-top.h 2009-08-25 08:41:08.000000000 -0700 -@@ -75,10 +75,10 @@ - #define KSH_COMPATIBLE_SELECT - - /* System-wide .bashrc file for interactive shells. */ --/* #define SYS_BASHRC "/etc/bash.bashrc" */ -+#define SYS_BASHRC "/etc/bash.bashrc" - - /* System-wide .bash_logout for login shells. */ --/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" - - /* Define this to make non-interactive shells begun with argv[0][0] == '-' - run the startup files when not in posix mode. */ diff --git a/abs/core/bash/profile.bash b/abs/core/bash/profile.bash deleted file mode 100644 index d28f069..0000000 --- a/abs/core/bash/profile.bash +++ /dev/null @@ -1,11 +0,0 @@ -# -# /etc/profile.bash -# Global settings for bash shells -# - -#In the future we may want to add more ulimit entries here, -# in the offchance that /etc/security/limits.conf is skipped -ulimit -Sc 0 #Don't create core files - -# Source our global bashrc file, to remove duplication of effort -[ -r /etc/bash.bashrc ] && . /etc/bash.bashrc diff --git a/abs/core/bash/system.bash_logout b/abs/core/bash/system.bash_logout new file mode 100644 index 0000000..a76e48e --- /dev/null +++ b/abs/core/bash/system.bash_logout @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# diff --git a/abs/core/bash/system.bashrc b/abs/core/bash/system.bashrc index 5430d6b..a2231e8 100644 --- a/abs/core/bash/system.bashrc +++ b/abs/core/bash/system.bashrc @@ -1,31 +1,23 @@ # # /etc/bash.bashrc # -# This file is the systemwide bashrc file. While most of the -# environment is preserved when running an interactive shell -# the PS[1-4] variables, aliases and functions are reset. -# -# When running a non-login shell, apply the following settings: -# - Prompt defaults (PS[1-4], PROMPT_COMMAND) -# - bash_completion if it exists -# - source /etc/bash.bashrc.local + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return PS1='[\u@\h \W]\$ ' PS2='> ' PS3='> ' PS4='+ ' -export PS1 PS2 PS3 PS4 - -if test "$TERM" = "xterm" -o \ - "$TERM" = "xterm-color" -o \ - "$TERM" = "xterm-256color" -o \ - "$TERM" = "rxvt" -o \ - "$TERM" = "rxvt-unicode" -o \ - "$TERM" = "xterm-xfree86"; then - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - export PROMPT_COMMAND -fi +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + ;; +esac -[ -r /etc/bash_completion ] && . /etc/bash_completion -[ -r /etc/bash.bashrc.local ] && . /etc/bash.bashrc.local +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/abs/core/bigreqsproto/PKGBUILD b/abs/core/bigreqsproto/PKGBUILD index bf39d56..edf7c9f 100644 --- a/abs/core/bigreqsproto/PKGBUILD +++ b/abs/core/bigreqsproto/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 154132 2012-03-23 17:15:14Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=bigreqsproto -pkgver=1.1.0 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 Big Requests extension wire protocol" -arch=(i686 x86_64) +arch=(any) url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +license=('custom') +makedepends=('xorg-util-macros' 'xmlto' 'docbook-xml') +source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('ef1765eeb5e9e38d080225fe6a64ed7cd2984b46') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('d30c5dbf19ca6dffcd9788227ecff8c5') diff --git a/abs/core/binutils/PKGBUILD b/abs/core/binutils/PKGBUILD index 4c6e5a9..fefc124 100644 --- a/abs/core/binutils/PKGBUILD +++ b/abs/core/binutils/PKGBUILD @@ -1,28 +1,28 @@ -# $Id$ +# $Id: PKGBUILD 163511 2012-07-14 13:06:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21.1 -pkgrel=1 -_date=20110627 +pkgver=2.22 +pkgrel=9 +_date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') -groups=('base') -depends=('glibc>=2.14' 'zlib') +groups=('base-devel') +depends=('glibc>=2.16' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') +md5sums=('de2ac4298732827f8af706fc24020330') mksource() { mkdir ${pkgname}-${_date} cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch + export _TAG=binutils-2_22-branch export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' cvs -z9 co -r $_TAG binutils || return 1 mv src binutils @@ -36,6 +36,7 @@ build() { [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" ${srcdir}/binutils/configure --prefix=/usr \ + --with-lib-path=/usr/lib:/usr/local/lib \ --enable-ld=default --enable-gold \ --enable-plugins --enable-threads \ --enable-shared $CONFIGFLAG @@ -44,13 +45,31 @@ build() { make configure-host make tooldir=${pkgdir}/usr + + # Rebuild libiberty.a with -fPIC + cp -a libiberty libiberty-pic + make -C libiberty-pic clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic + + # Rebuild libbfd.a with -fPIC + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + cp -a bfd bfd-pic + make -C bfd-pic clean + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic + + # Rebuild libopcodes.a with -fPIC + cp -a opcodes opcodes-pic + make -C opcodes-pic clean + make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic } check() { cd ${srcdir}/binutils-build # do not abort on errors - manually check log files - make -k -j1 check || true + # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) + make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ + CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true } package() { @@ -61,16 +80,10 @@ package() { install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib + # install libraries rebuilt with -fPIC + install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib + install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib + install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib # Remove Windows/Novell specific man pages rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* diff --git a/abs/core/bison/ChangeLog b/abs/core/bison/ChangeLog deleted file mode 100644 index 5bb22be..0000000 --- a/abs/core/bison/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2010-03-25 Eric Belanger <eric@archlinux.org> - - * bison 2.4.2-1 - * Upstream update - * Removed texinfo dependency in install scriptlet - * Updated license - * Added sh depends - -2008-12-11 Eric Belanger <eric@archlinux.org> - - * bison 2.4.1-1 - * Upstream update - -2008-11-08 Eric Belanger <eric@archlinux.org> - - * bison 2.4-1 - * Upstream update - * Added info file support - * Added ChangeLog diff --git a/abs/core/bison/PKGBUILD b/abs/core/bison/PKGBUILD index 91d9162..7e10464 100644 --- a/abs/core/bison/PKGBUILD +++ b/abs/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87221 2010-08-11 03:29:16Z allan $ +# $Id: PKGBUILD 163856 2012-07-21 11:24:29Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.4.3 +pkgver=2.6 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -12,17 +12,22 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c1d3ea81bc370dbd43b6f0b2cd21287e') +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('f96a16e79daaef71c797ed88f52e59d1' + 'd67a1a075ab0cccfb53ab23692be1a02') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --datadir=/usr/share - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/abs/core/bison/bison.install b/abs/core/bison/bison.install index 890eb03..0081a19 100644 --- a/abs/core/bison/bison.install +++ b/abs/core/bison/bison.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info file=bison.info.gz post_install() { diff --git a/abs/core/btrfs-progs/PKGBUILD b/abs/core/btrfs-progs/PKGBUILD new file mode 100644 index 0000000..8b3f37e --- /dev/null +++ b/abs/core/btrfs-progs/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=btrfs-progs +pkgver=0.19.20120328 +pkgrel=3 +pkgdesc="btrfs filesystem utilities" +arch=(i686 x86_64) +depends=('glibc' 'e2fsprogs') +url="http://btrfs.wiki.kernel.org/" +replaces=('btrfs-progs-unstable') +conflicts=('btrfs-progs-unstable') +provides=('btrfs-progs-unstable') +license=('GPL2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-btrfs + initcpio-hook-btrfs) +md5sums=('f4504e73cf9254779b78d5b2318ac570' + '3eae9bf1541e297fa72aa40ebf7320c6' + 'b09688a915a0ec8f40e2f5aacbabc9ad') + +build() { + cd $srcdir/$pkgname-$pkgver + make CFLAGS="$CFLAGS" +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install + # fix manpage + mkdir -p $pkgdir/usr/share/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + mkdir -p ${pkgdir}/sbin + ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" +} diff --git a/abs/core/btrfs-progs/initcpio-hook-btrfs b/abs/core/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 0000000..7965d0a --- /dev/null +++ b/abs/core/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,7 @@ +#!/usr/bin/ash + +run_hook() { + btrfs device scan +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/btrfs-progs/initcpio-install-btrfs b/abs/core/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 0000000..a70a324 --- /dev/null +++ b/abs/core/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + add_all_modules btrfs + add_binary btrfs + add_runscript +} + +help() { + cat <<HELPEOF +This hook provides support for multi-device btrfs volumes. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/bzip2/PKGBUILD b/abs/core/bzip2/PKGBUILD index cabf1af..3e4ea23 100644 --- a/abs/core/bzip2/PKGBUILD +++ b/abs/core/bzip2/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 91051 2010-09-21 12:28:55Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=bzip2 pkgver=1.0.6 -pkgrel=1 +pkgrel=4 pkgdesc="A high-quality data compression program" arch=('i686' 'x86_64') license=('custom') url="http://sources.redhat.com/bzip2" groups=('base') depends=('glibc') -source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz) -md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b') +source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz + bzip2-1.0.4-bzip2recover.patch) +sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002' + '85ce76fdb67f52f152bba368c1de81132dcdbdb5') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # add large-file support sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so @@ -24,31 +26,36 @@ build() { sed -i "s|-O2|${CFLAGS}|g" Makefile sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so + patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch + make -f Makefile-libbz2_so - make bzip2recover libbz2.a + make bzip2 bzip2recover libbz2.a +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make test } + package() { - cd $srcdir/$pkgname-$pkgver - install -dm755 $pkgdir/bin - install -m755 bzip2-shared $pkgdir/bin/bzip2 - install -m755 bzip2recover $pkgdir/bin - ln -sf bzip2 $pkgdir/bin/bunzip2 - ln -sf bzip2 $pkgdir/bin/bzcat + cd "$srcdir/$pkgname-$pkgver" - install -dm755 $pkgdir/usr/bin - install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin + install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1} - install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6 - ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so - ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1 - ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0 + install -m755 bzip2-shared $pkgdir/usr/bin/bzip2 + install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin + ln -sf bzip2 $pkgdir/usr/bin/bunzip2 + ln -sf bzip2 $pkgdir/usr/bin/bzcat - install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a - ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so + install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 + install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a - install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h + install -m644 bzlib.h $pkgdir/usr/include/ - install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1 + install -m644 bzip2.1 $pkgdir/usr/share/man/man1/ ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 @@ -56,4 +63,3 @@ package() { install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \ $pkgdir/usr/share/licenses/${pkgname}/LICENSE } - diff --git a/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch b/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch new file mode 100644 index 0000000..e2bfe1c --- /dev/null +++ b/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch @@ -0,0 +1,12 @@ +--- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 ++++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 +@@ -309,7 +309,8 @@ + UInt32 buffHi, buffLo, blockCRC; + Char* p; + +- strcpy ( progName, argv[0] ); ++ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); ++ progName[BZ_MAX_FILENAME-1]='\0'; + inFileName[0] = outFileName[0] = 0; + + fprintf ( stderr, diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD index 35b08ca..4b35562 100644 --- a/abs/core/ca-certificates/PKGBUILD +++ b/abs/core/ca-certificates/PKGBUILD @@ -1,32 +1,38 @@ -# $Id: PKGBUILD 15695 2008-10-17 11:18:31Z pierre $ +# $Id: PKGBUILD 162841 2012-07-01 11:43:58Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=ca-certificates -pkgver=20080809 -pkgrel=30 +pkgver=20120623 +pkgrel=1 pkgdesc='Common CA certificates' -arch=('i686' 'x86_64') +arch=('any') url='http://packages.qa.debian.org/c/ca-certificates.html' license=('MPL' 'GPL') source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz") depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed') -makedepends=('ruby') -install=ca-certificates.install +makedepends=('python2') +install='ca-certificates.install' backup=('etc/ca-certificates.conf') -md5sums=('c155f5059006b94ad0aea7018161ab37') +sha256sums=('878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9') build() { - cd $srcdir/$pkgname - - install -d -m755 $pkgdir/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates}} - install -D -m644 sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8/update-ca-certificates.8 + cd ${srcdir}/${pkgname}-${pkgver} + sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py + sed 's|python|python2|g' -i mozilla/Makefile make - make install DESTDIR=$pkgdir +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs} + make install DESTDIR=${pkgdir} + install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8 ( echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" + echo "# see update-ca-certificates man page" echo "# " - cd $pkgdir/usr/share/ca-certificates + cd ${pkgdir}/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- - ) > $pkgdir/etc/ca-certificates.conf + ) > ${pkgdir}/etc/ca-certificates.conf } diff --git a/abs/core/ca-certificates/ca-certificates.install b/abs/core/ca-certificates/ca-certificates.install index bd3cf6d..3d8b87d 100644 --- a/abs/core/ca-certificates/ca-certificates.install +++ b/abs/core/ca-certificates/ca-certificates.install @@ -1,7 +1,26 @@ +export LC_ALL=C + post_install() { - usr/sbin/update-ca-certificates --fresh &> /dev/null + usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 } post_upgrade() { - post_install + if [ $(vercmp $2 20110421-1) -lt 0 ]; then + echo 'Updating certificates. This might take a while...' + fi + usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 +} + +pre_remove() { + # clean up certificates + local _backup=$(mktemp) + mv etc/ca-certificates.conf ${_backup} + echo > etc/ca-certificates.conf + usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 + mv ${_backup} etc/ca-certificates.conf +} + +post_remove() { + # remove the cert file if it is empty + [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt } diff --git a/abs/core/cdparanoia/ChangeLog b/abs/core/cdparanoia/ChangeLog deleted file mode 100644 index f1873ff..0000000 --- a/abs/core/cdparanoia/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ -2008-08-07 Alexander Fehr <pizzapunk gmail com> - - * cdparanoia-10.1-1: - New upstream release. - Changed license to GPL. - Added !makeflags option. - -2008-07-07 Alexander Fehr <pizzapunk gmail com> - - * cdparanoia-10.0-1: - New upstream release. - New maintainer. - Added arch variable. - Changed license to GPL3. - Fixed man page location. - Removed cdparanoia.patch. - Removed gcc34.patch. - Added ChangeLog. diff --git a/abs/core/cdparanoia/PKGBUILD b/abs/core/cdparanoia/PKGBUILD index 0e60bd4..05bf098 100644 --- a/abs/core/cdparanoia/PKGBUILD +++ b/abs/core/cdparanoia/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 13080 2008-09-25 21:49:25Z pierre $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $ +# Maintainer: +# Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=cdparanoia pkgver=10.2 -pkgrel=2 +pkgrel=4 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64') url="http://www.xiph.org/paranoia/" license=('GPL') depends=('glibc') options=('!makeflags') -source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch) +source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz" + 'gcc.patch') +md5sums=('b304bbe8ab63373924a744eac9ebc652' + '12da14958d2b84c6719fe69890436445') build() { - cd "$srcdir/cdparanoia-III-$pkgver" - patch -p0 -i ${srcdir}/gcc.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1 + cd "${srcdir}/${pkgname}-III-${pkgver}" + patch -p0 -i ${srcdir}/gcc.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-III-${pkgver}" + make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install } diff --git a/abs/core/cloog/PKGBUILD b/abs/core/cloog/PKGBUILD new file mode 100644 index 0000000..c73b689 --- /dev/null +++ b/abs/core/cloog/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 162068 2012-06-19 12:27:34Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=cloog +pkgver=0.17.0 +pkgrel=2 +pkgdesc="Library that generates loops for scanning polyhedra" +arch=('i686' 'x86_64') +url="http://www.bastoul.net/cloog/" +license=('GPL') +depends=('isl' 'gmp') +conflicts=('cloog-ppl<0.15.10-2') +options=('!libtool') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) +md5sums=('0aa3302c81f65ca62c114e5264f8a802') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-isl=system --with-gmp=system + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/abs/core/cmake/PKGBUILD b/abs/core/cmake/PKGBUILD index 2125fb9..5600a7a 100644 --- a/abs/core/cmake/PKGBUILD +++ b/abs/core/cmake/PKGBUILD @@ -1,42 +1,46 @@ -# $Id: PKGBUILD 98166 2010-11-04 07:38:49Z andrea $ +# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: damir <damir@archlinux.org> -# Contributor: Konstantinos Pachnis <kpachnis@mes-direct.com> pkgname=cmake -pkgver=2.8.3 -pkgrel=1 +pkgver=2.8.8 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') +url="http://www.cmake.org/" license=('custom') -url="http://www.cmake.org" -depends=('expat' 'curl' 'gcc-libs' 'shared-mime-info') +depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('a76a44b93acf5e3badda9de111385921') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'fix-pkg-config.patch') +md5sums=('ba74b22c788a0c8547976b880cd02b17' + '32c6a4360a2ba12dc77b6a840fa7672b') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} + + # FS#29545 + patch -p1 -i "${srcdir}"/fix-pkg-config.patch ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ --system-libs \ --qt-gui \ - --parallel=2 + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install vimpath="$pkgdir/usr/share/vim/vimfiles" install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el + install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/cmake/cmake.install b/abs/core/cmake/cmake.install index 7c8a8bd..55f6c84 100644 --- a/abs/core/cmake/cmake.install +++ b/abs/core/cmake/cmake.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true } post_upgrade() { diff --git a/abs/core/cmake/fix-pkg-config.patch b/abs/core/cmake/fix-pkg-config.patch new file mode 100644 index 0000000..c9390ae --- /dev/null +++ b/abs/core/cmake/fix-pkg-config.patch @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") diff --git a/abs/core/compositeproto/PKGBUILD b/abs/core/compositeproto/PKGBUILD index 9b1b56d..4a0754c 100644 --- a/abs/core/compositeproto/PKGBUILD +++ b/abs/core/compositeproto/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149390 2012-02-07 13:05:41Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=compositeproto -pkgver=0.4.1 -pkgrel=1 +pkgver=0.4.2 +pkgrel=2 pkgdesc="X11 Composite extension wire protocol" -arch=(i686 x86_64) +arch=('any') url="http://xorg.freedesktop.org/" -depends=(fixesproto) +license=('custom') +depends=('fixesproto') +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('aa7b5abcfd5bbfad7cb681ce89dc1d6e381e3044') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('3692f3f8b2ea10dff3d2cede8dc65e79') diff --git a/abs/core/confuse/PKGBUILD b/abs/core/confuse/PKGBUILD index 6f713df..2d7f3d7 100644 --- a/abs/core/confuse/PKGBUILD +++ b/abs/core/confuse/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 17258 2010-05-22 14:32:23Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $ +# Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=confuse pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="C-library for parsing configuration files" arch=('i686' 'x86_64') url="http://www.nongnu.org/confuse" license=('LGPL') depends=('glibc') -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz") options=('!libtool' '!emptydirs') md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-shared - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/abs/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/abs/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch new file mode 100644 index 0000000..087b87c --- /dev/null +++ b/abs/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch @@ -0,0 +1,135 @@ +From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Thu, 10 May 2012 19:43:00 +0200 +Subject: [PATCH] ls: color each symlink-to-relative-name in / properly + +In order for ls --color to color each symlink, it must form the name +of each referent and then stat it to see if the link is dangling, to +a directory, to a file, etc. When the symlink is to a relative name, +ls must concatenate the starting directory name and that relative name. +When, in addition, the starting directory was "/" or "/some-name", +the result was ill-formed, and the subsequent stat would usually fail, +making the caller color it as a dangling symlink. +* src/ls.c (make_link_name): Don't botch the case in which +dir_name(NAME) == "/" and LINKNAME is relative. +* tests/ls/root-rel-symlink-color: New file. Test for the above. +* tests/Makefile.am (TESTS): Add it. +* NEWS (Bug fixes): Mention it. +Reported by Mike Frysinger in http://bugs.gnu.org/11453 +Bug introduced by commit v8.16-23-gbcb9078. +--- + NEWS | 5 ++++ + src/ls.c | 9 +++++++- + tests/Makefile.am | 1 + + tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+), 1 deletion(-) + create mode 100755 tests/ls/root-rel-symlink-color + +diff --git a/NEWS b/NEWS +index 6c620b3..f9e9c70 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ ls --color would mis-color relative-named symlinks in / ++ [bug introduced in coreutils-8.17] ++ + + * Noteworthy changes in release 8.17 (2012-05-10) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 397e4ea..9494ae9 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname) + return xstrdup (linkname); + + char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); +- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); ++ ++ /* PREFIX_LEN usually specifies a string not ending in slash. ++ In that case, extend it by one, since the next byte *is* a slash. ++ Otherwise, the prefix is "/", so leave the length unchanged. */ ++ if ( ! ISSLASH (name[prefix_len - 1])) ++ ++prefix_len; ++ ++ stpcpy (stpncpy (p, name, prefix_len), linkname); + return p; + } + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a4370a6..0bafc5f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -449,6 +449,7 @@ TESTS = \ + ls/proc-selinux-segfault \ + ls/readdir-mountpoint-inode \ + ls/recursive \ ++ ls/root-rel-symlink-color \ + ls/rt-1 \ + ls/slink-acl \ + ls/stat-dtype \ +diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color +new file mode 100755 +index 0000000..d795432 +--- /dev/null ++++ b/tests/ls/root-rel-symlink-color +@@ -0,0 +1,51 @@ ++#!/bin/sh ++# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". ++ ++# Copyright (C) 2012 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/init.sh"; path_prepend_ ../src ++print_ver_ ls ++ ++symlink_to_rel= ++for i in /*; do ++ # Skip non-symlinks: ++ env test -h "$i" || continue ++ ++ # Skip dangling symlinks: ++ env test -e "$i" || continue ++ ++ # Skip any symlink-to-absolute-name: ++ case $(readlink "$i") in /*) continue ;; esac ++ ++ symlink_to_rel=$i ++ break ++done ++ ++test -z "$symlink_to_rel" \ ++ && skip_ no relative symlink in / ++ ++e='\33' ++color_code='01;36' ++c_pre="$e[0m$e[${color_code}m" ++c_post="$e[0m" ++printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ ++ ++env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ ++ ls -d --color=always "$symlink_to_rel" > out || fail=1 ++ ++compare exp out || fail=1 ++ ++Exit $fail +-- +1.7.11.2 + diff --git a/abs/core/coreutils/PKGBUILD b/abs/core/coreutils/PKGBUILD index 6d75f06..f83225f 100644 --- a/abs/core/coreutils/PKGBUILD +++ b/abs/core/coreutils/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ +# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.12 +pkgver=8.17 pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/coreutils" groups=('base') -depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') +depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') replaces=('mktemp') backup=('etc/pam.d/su') install=${pkgname}.install options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - coreutils-uname.patch +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} coreutils-pam.patch + 0001-ls-color-each-symlink-to-relative-name-in-properly.patch su.pam) -md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' - 'c4fcca138b6abf6d443d48a6f0cd8833' +md5sums=('bbda656ce8ca2c6903948f9faa204ba3' + 'ebecd29b095aa21b0b2f833f1ec20d70' 'aad79a2aa6d566c375d7bdd1b0767278' + 'd7c691898a695a6284a927e6a9426fe4' 'fa85e5cce5d723275b14365ba71a8aad') build() { @@ -30,11 +31,12 @@ build() { # added su wheel group pam patch (from fedora git) patch -Np1 -i ${srcdir}/coreutils-pam.patch - # linux specific uname improvement (from gentoo portage) - patch -Np1 -i ${srcdir}/coreutils-uname.patch + # fix coloring for symlinks in / + # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 + patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch autoreconf -v - ./configure --prefix=/usr \ + ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ --enable-install-program=su \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam @@ -49,20 +51,15 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - + cd ${pkgdir}/usr/bin install -dm755 ${pkgdir}/{bin,usr/sbin} - - # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ - mkdir mknod mv pwd rm rmdir stty su sync true uname" - mv ${_fhs} ${pkgdir}/bin - # binaries required by various Arch scripts - _bin="cut dir dircolors du install mkfifo readlink shred \ - sleep touch tr vdir" - mv ${_bin} ${pkgdir}/bin - ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep + # binaries required by FHS + _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' + 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' + 'true' 'uname') + mv ${_fhs[@]} ${pkgdir}/bin mv chroot ${pkgdir}/usr/sbin install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su diff --git a/abs/core/coreutils/coreutils-uname.patch b/abs/core/coreutils/coreutils-uname.patch deleted file mode 100644 index b458abe..0000000 --- a/abs/core/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch/<ARCH>/ source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/abs/core/cracklib/PKGBUILD b/abs/core/cracklib/PKGBUILD index fa51f42..d25d26a 100644 --- a/abs/core/cracklib/PKGBUILD +++ b/abs/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82645 2010-06-15 04:51:02Z allan $ +# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib -pkgver=2.8.16 -pkgrel=1 +pkgver=2.8.18 +pkgrel=2 pkgdesc="Password Checking Library" arch=('i686' 'x86_64') license=('GPL') @@ -12,11 +12,17 @@ url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('79053ad8bc714a44cd660cb12116211b') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --without-python - make || return 1 + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check } package() { @@ -26,4 +32,3 @@ package() { sh ./util/cracklib-format dicts/cracklib-small \ | sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict } -md5sums=('3bfb22db8fcffd019463ee415a1b25b7') diff --git a/abs/core/cryptsetup/PKGBUILD b/abs/core/cryptsetup/PKGBUILD index ceb826d..4ec9997 100644 --- a/abs/core/cryptsetup/PKGBUILD +++ b/abs/core/cryptsetup/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 85278 2010-07-11 10:36:02Z thomas $ +# $Id: PKGBUILD 162744 2012-06-29 11:46:09Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.1.3 +pkgver=1.4.3 pkgrel=1 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" -arch=('i686' 'x86_64') +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" +arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') +conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook - encrypt_install) -sha256sums=('9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a' - '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') + encrypt_install) +sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' + 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' + 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' + 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { - cd $srcdir/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib - make || return 1 + cd "${srcdir}"/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static + make } package() { - cd $srcdir/$pkgname-${pkgver} - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install # install hook - install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt - install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt - # Fix pkgconfig location - install -d -m755 $pkgdir/usr/lib - mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } diff --git a/abs/core/cryptsetup/encrypt_hook b/abs/core/cryptsetup/encrypt_hook index e84bc6e..372b7ba 100644 --- a/abs/core/cryptsetup/encrypt_hook +++ b/abs/core/cryptsetup/encrypt_hook @@ -1,131 +1,138 @@ -# vim: set ft=sh: -# TODO this one needs some work to work with lots of different -# encryption schemes -run_hook () -{ - /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" +#!/usr/bin/ash - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ "x${cryptkey}" != "x" ]; then - ckdev="$(echo "${cryptkey}" | cut -d: -f1)" - ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" - ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" - if poll_device "${ckdev}" ${rootdelay}; then - case ${ckarg1} in - *[!0-9]*) - # Use a file on the device - # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path - mkdir /ckey - mount -r -t ${ckarg1} ${ckdev} /ckey - dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" - cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" - else - DEPRECATED_CRYPT=1 - cryptdev="${root}" - cryptname="root" + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 <<EOF +$cryptkey +EOF + + if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t "$ckarg1" "$resolved" /ckey + dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + ;; + esac fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi - warn_deprecated() { - echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" - echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." - } + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <<EOF +$cryptdevice +EOF + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi - if poll_device "${cryptdev}" ${rootdelay}; then - if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "A password is required to access the ${cryptname} volume:" + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } - #loop until we get a real password - while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if [ $# -ne 5 ]; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" - tmp=$(echo "${crypto}" | cut -d: -f1) - [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f2) - [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f3) - [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f4) - [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f5) - [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" - if [ -f ${ckeyfile} ]; then - exe="${exe} --key-file ${ckeyfile}" + for cryptopt in ${cryptoptions//,/ }; do + case ${cryptopt} in + allow-discards) + echo "Enabling TRIM/discard support." + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 else - exe="${exe} --verify-passphrase" - echo "" - echo "A password is required to access the ${cryptname} volume:" + echo "Invalid keyfile. Reverting to passphrase." fi - eval "${exe} ${CSQUIET}" + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" - if [ $? -ne 0 ]; then - err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" - exit 1 + #loop until we get a real password + while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup create $cryptname $resolved $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF +$crypto +EOF + [ -n "$c_hash" ] && exe="$exe --hash '$c_hash'" + [ -n "$c_cipher" ] && exe="$exe --cipher '$c_cipher'" + [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'" + [ -n "$c_offset" ] && exe="$exe --offset '$c_offset'" + [ -n "$c_skip" ] && exe="$exe --skip '$c_skip'" + if [ -f "$ckeyfile" ]; then + exe="$exe --key-file $ckeyfile" + else + exe="$exe --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "$exe $CSQUIET" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" fi else - err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." fi - rm -f ${ckeyfile} fi + rm -f ${ckeyfile} } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/cryptsetup/encrypt_install b/abs/core/cryptsetup/encrypt_install index 9446e68..38e5ddc 100644 --- a/abs/core/cryptsetup/encrypt_install +++ b/abs/core/cryptsetup/encrypt_install @@ -1,26 +1,44 @@ -# vim: set ft=sh: +#!/bin/bash -install () -{ - if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/") " +build() { + local mod + + add_module dm-crypt + if [[ $CRYPTO_MODULES ]]; then + for mod in $CRYPTO_MODULES; do + add_module "$mod" + done else - MODULES=" dm-crypt ${CRYPTO_MODULES} " + add_all_modules '/crypto/' fi - FILES="" - SCRIPT="encrypt" - add_dir "/dev/mapper" - [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" - [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" + + add_binary "cryptsetup" + add_binary "dmsetup" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook allows for an encrypted root device. +help() { + cat <<HELPEOF +This hook allows for an encrypted root device. Users should specify the device +to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, +where 'device' is the path to the raw device, and 'dmname' is the name given to +the device after unlocking, and will be available as /dev/mapper/dmname. + +For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on +the kernel cmdline, where 'device' represents the raw block device where the key +exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is +the absolute path of the keyfile within the device. + +Without specifying a keyfile, you will be prompted for the password at runtime. +This means you must have a keyboard available to input it, and you may need +the keymap hook as well to ensure that the keyboard is using the layout you +expect. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD index 3501d65..f318660 100644 --- a/abs/core/curl/PKGBUILD +++ b/abs/core/curl/PKGBUILD @@ -1,50 +1,64 @@ -# $Id: PKGBUILD 95264 2010-10-17 20:54:32Z ibiru $ +# $Id: PKGBUILD 160000 2012-05-27 15:59:46Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.21.2 -pkgrel=3 +pkgver=7.26.0 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') -source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('ca96df88e044c7c25d19692ec8b250b2' +md5sums=('3fa4d5236f2a36ca5c3af6715e837691' + '61b594830d5acba3c99e4af0ba39a14e' '751bd433ede935c8fae727377625a8ae') -[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h -[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --enable-manual \ - --enable-versioned-symbols \ - --with-ca-path=/etc/ssl/certs \ - --without-libidn - make + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 - mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" - install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" } diff --git a/abs/core/cython/PKGBUILD b/abs/core/cython/PKGBUILD index 9901e43..3665abe 100644 --- a/abs/core/cython/PKGBUILD +++ b/abs/core/cython/PKGBUILD @@ -1,19 +1,29 @@ -pkgname=('cython2') +# $Id: PKGBUILD 69975 2012-04-27 16:14:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Igor Scabini <furester @ gmail.com> + +pkgname=( 'cython2') pkgbase=cython -pkgver=0.15.1 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) url="http://www.cython.org" license=('APACHE') -makedepends=('python2-distribute') +makedepends=( 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('171021b3845c9ca8bd6d8185b3cde664') +md5sums=('7934186ada3552110aba92062fa88b1c') build() { true } +package_cython() { + depends=('python') + + cd $srcdir/Cython-$pkgver + python setup.py install --root=$pkgdir +} package_cython2() { depends=('python2') diff --git a/abs/core/cython/__changelog b/abs/core/cython/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/cython/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/damageproto/PKGBUILD b/abs/core/damageproto/PKGBUILD index 870efcd..3534f1b 100644 --- a/abs/core/damageproto/PKGBUILD +++ b/abs/core/damageproto/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 97557 2010-10-31 15:48:11Z jgc $ +# $Id: PKGBUILD 151181 2012-02-25 07:02:08Z pierre $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=damageproto pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Damage extension wire protocol" arch=(any) url="http://xorg.freedesktop.org/" license=('custom') depends=('xproto' 'fixesproto') makedepends=('xorg-util-macros') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +source=("${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2") sha1sums=('bd0f0f4dc8f37eaabd9279d10fe2889710507358') build() { @@ -18,6 +18,7 @@ build() { ./configure --prefix=/usr make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -25,4 +26,3 @@ package() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/db/PKGBUILD b/abs/core/db/PKGBUILD index cbe2bea..937e1f9 100644 --- a/abs/core/db/PKGBUILD +++ b/abs/core/db/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 98547 2010-11-11 03:57:51Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 160636 2012-06-02 22:25:49Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.1.19 -_basever=5.1.19 -pkgrel=3 -epoch=1 +pkgver=5.3.21 +pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" @@ -14,20 +13,20 @@ license=('custom') depends=('gcc-libs' 'sh') options=('!libtool') install=db.install -source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz) -md5sums=('76fcbfeebfcd09ba0b4d96bfdf8d884d') +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') build() { - cd ${srcdir}/$pkgname-${_basever}/build_unix + cd "${srcdir}"/$pkgname-${pkgver}/build_unix ../dist/configure --prefix=/usr --enable-compat185 \ --enable-shared --enable-static --enable-cxx --enable-dbm make LIBSO_LIBS=-lpthread } package() { - cd ${srcdir}/$pkgname-${_basever}/build_unix - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/docs - install -Dm644 ${srcdir}/${pkgname}-${_basever}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}"/$pkgname-${pkgver}/build_unix + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/dbus-core/PKGBUILD b/abs/core/dbus-core/PKGBUILD index 78ac2f8..afca05e 100644 --- a/abs/core/dbus-core/PKGBUILD +++ b/abs/core/dbus-core/PKGBUILD @@ -1,56 +1,54 @@ -# $Id: PKGBUILD 90541 2010-09-13 10:46:30Z jgc $ +# $Id: PKGBUILD 163992 2012-07-23 14:58:38Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus-core -pkgver=1.4.0 +pkgver=1.6.4 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem') -conflicts=('dbus<1.2.3-2') +depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341 +makedepends=('libx11') options=(!libtool) install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} dbus) -md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282' - '08f93dd19cffd1b45ab05c1fd4efb560') +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' + 'f0364f3f5dc5f653bb05d39aa36e3264') build() { - cd "${srcdir}/dbus-${pkgver}" + cd dbus-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ + --with-console-auth-dir=/run/console/ \ --enable-inotify --disable-dnotify \ --disable-verbose-mode --disable-static \ - --disable-tests --disable-asserts --without-x - make || return 1 + --disable-tests --disable-asserts \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-systemd + make } -package() { - cd "${srcdir}/dbus-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/bin/dbus-launch" - rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" +package(){ + cd dbus-$pkgver + make DESTDIR="$pkgdir" install - chown 81:81 "${pkgdir}/var/run/dbus" + rm -f "$pkgdir/usr/bin/dbus-launch" + rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1" + rm -rf "$pkgdir/var/run" - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" + install -m755 -d "$pkgdir/etc/rc.d" + install -m755 ../dbus "$pkgdir/etc/rc.d/" #Fix configuration file - sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" + sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf" - #install .keep files so pacman doesn't delete empty dirs - touch "${pkgdir}/usr/share/dbus-1/services/.keep" - touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" - touch "${pkgdir}/etc/dbus-1/session.d/.keep" - touch "${pkgdir}/etc/dbus-1/system.d/.keep" - - rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" + install -dm755 "$pkgdir/usr/share/licenses/dbus-core" + install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/" } + diff --git a/abs/core/dbus-core/__changelog b/abs/core/dbus-core/__changelog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/core/dbus-core/__changelog diff --git a/abs/core/dbus-core/bug17754.patch b/abs/core/dbus-core/bug17754.patch deleted file mode 100644 index 7f677ac..0000000 --- a/abs/core/dbus-core/bug17754.patch +++ /dev/null @@ -1,392 +0,0 @@ -diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c -index b3cfa3d..e6d261f 100644 ---- a/dbus/dbus-connection.c -+++ b/dbus/dbus-connection.c -@@ -73,6 +73,14 @@ - _dbus_mutex_unlock ((connection)->mutex); \ - } while (0) - -+#define SLOTS_LOCK(connection) do { \ -+ _dbus_mutex_lock ((connection)->slot_mutex); \ -+ } while (0) -+ -+#define SLOTS_UNLOCK(connection) do { \ -+ _dbus_mutex_unlock ((connection)->slot_mutex); \ -+ } while (0) -+ - #define DISPATCH_STATUS_NAME(s) \ - ((s) == DBUS_DISPATCH_COMPLETE ? "complete" : \ - (s) == DBUS_DISPATCH_DATA_REMAINS ? "data remains" : \ -@@ -257,6 +265,7 @@ struct DBusConnection - - DBusList *filter_list; /**< List of filters. */ - -+ DBusMutex *slot_mutex; /**< Lock on slot_list so overall connection lock need not be taken */ - DBusDataSlotList slot_list; /**< Data stored by allocated integer ID */ - - DBusHashTable *pending_replies; /**< Hash of message serials to #DBusPendingCall. */ -@@ -649,39 +658,42 @@ protected_change_watch (DBusConnection *connection, - DBusWatchToggleFunction toggle_function, - dbus_bool_t enabled) - { -- DBusWatchList *watches; - dbus_bool_t retval; -- -+ - HAVE_LOCK_CHECK (connection); - -- /* This isn't really safe or reasonable; a better pattern is the "do everything, then -- * drop lock and call out" one; but it has to be propagated up through all callers -+ /* The original purpose of protected_change_watch() was to hold a -+ * ref on the connection while dropping the connection lock, then -+ * calling out to the app. This was a broken hack that did not -+ * work, since the connection was in a hosed state (no WatchList -+ * field) while calling out. -+ * -+ * So for now we'll just keep the lock while calling out. This means -+ * apps are not allowed to call DBusConnection methods inside a -+ * watch function or they will deadlock. -+ * -+ * The "real fix" is to use the _and_unlock() pattern found -+ * elsewhere in the code, to defer calling out to the app until -+ * we're about to drop locks and return flow of control to the app -+ * anyway. -+ * -+ * See http://lists.freedesktop.org/archives/dbus/2007-July/thread.html#8144 - */ -- -- watches = connection->watches; -- if (watches) -- { -- connection->watches = NULL; -- _dbus_connection_ref_unlocked (connection); -- CONNECTION_UNLOCK (connection); - -+ if (connection->watches) -+ { - if (add_function) -- retval = (* add_function) (watches, watch); -+ retval = (* add_function) (connection->watches, watch); - else if (remove_function) - { - retval = TRUE; -- (* remove_function) (watches, watch); -+ (* remove_function) (connection->watches, watch); - } - else - { - retval = TRUE; -- (* toggle_function) (watches, watch, enabled); -+ (* toggle_function) (connection->watches, watch, enabled); - } -- -- CONNECTION_LOCK (connection); -- connection->watches = watches; -- _dbus_connection_unref_unlocked (connection); -- - return retval; - } - else -@@ -770,39 +782,42 @@ protected_change_timeout (DBusConnection *connection, - DBusTimeoutToggleFunction toggle_function, - dbus_bool_t enabled) - { -- DBusTimeoutList *timeouts; - dbus_bool_t retval; -- -+ - HAVE_LOCK_CHECK (connection); - -- /* This isn't really safe or reasonable; a better pattern is the "do everything, then -- * drop lock and call out" one; but it has to be propagated up through all callers -+ /* The original purpose of protected_change_timeout() was to hold a -+ * ref on the connection while dropping the connection lock, then -+ * calling out to the app. This was a broken hack that did not -+ * work, since the connection was in a hosed state (no TimeoutList -+ * field) while calling out. -+ * -+ * So for now we'll just keep the lock while calling out. This means -+ * apps are not allowed to call DBusConnection methods inside a -+ * timeout function or they will deadlock. -+ * -+ * The "real fix" is to use the _and_unlock() pattern found -+ * elsewhere in the code, to defer calling out to the app until -+ * we're about to drop locks and return flow of control to the app -+ * anyway. -+ * -+ * See http://lists.freedesktop.org/archives/dbus/2007-July/thread.html#8144 - */ -- -- timeouts = connection->timeouts; -- if (timeouts) -- { -- connection->timeouts = NULL; -- _dbus_connection_ref_unlocked (connection); -- CONNECTION_UNLOCK (connection); - -+ if (connection->timeouts) -+ { - if (add_function) -- retval = (* add_function) (timeouts, timeout); -+ retval = (* add_function) (connection->timeouts, timeout); - else if (remove_function) - { - retval = TRUE; -- (* remove_function) (timeouts, timeout); -+ (* remove_function) (connection->timeouts, timeout); - } - else - { - retval = TRUE; -- (* toggle_function) (timeouts, timeout, enabled); -+ (* toggle_function) (connection->timeouts, timeout, enabled); - } -- -- CONNECTION_LOCK (connection); -- connection->timeouts = timeouts; -- _dbus_connection_unref_unlocked (connection); -- - return retval; - } - else -@@ -1263,6 +1278,10 @@ _dbus_connection_new_for_transport (DBusTransport *transport) - if (connection->io_path_cond == NULL) - goto error; - -+ _dbus_mutex_new_at_location (&connection->slot_mutex); -+ if (connection->slot_mutex == NULL) -+ goto error; -+ - disconnect_message = dbus_message_new_signal (DBUS_PATH_LOCAL, - DBUS_INTERFACE_LOCAL, - "Disconnected"); -@@ -1339,6 +1358,7 @@ _dbus_connection_new_for_transport (DBusTransport *transport) - _dbus_mutex_free_at_location (&connection->mutex); - _dbus_mutex_free_at_location (&connection->io_path_mutex); - _dbus_mutex_free_at_location (&connection->dispatch_mutex); -+ _dbus_mutex_free_at_location (&connection->slot_mutex); - dbus_free (connection); - } - if (pending_replies) -@@ -2612,9 +2632,14 @@ dbus_connection_ref (DBusConnection *connection) - - /* The connection lock is better than the global - * lock in the atomic increment fallback -+ * -+ * (FIXME but for now we always use the atomic version, -+ * to avoid taking the connection lock, due to -+ * the mess with set_timeout_functions()/set_watch_functions() -+ * calling out to the app without dropping locks) - */ - --#ifdef DBUS_HAVE_ATOMIC_INT -+#if 1 - _dbus_atomic_inc (&connection->refcount); - #else - CONNECTION_LOCK (connection); -@@ -2726,6 +2751,8 @@ _dbus_connection_last_unref (DBusConnection *connection) - _dbus_mutex_free_at_location (&connection->io_path_mutex); - _dbus_mutex_free_at_location (&connection->dispatch_mutex); - -+ _dbus_mutex_free_at_location (&connection->slot_mutex); -+ - _dbus_mutex_free_at_location (&connection->mutex); - - dbus_free (connection); -@@ -2760,9 +2787,14 @@ dbus_connection_unref (DBusConnection *connection) - - /* The connection lock is better than the global - * lock in the atomic increment fallback -+ * -+ * (FIXME but for now we always use the atomic version, -+ * to avoid taking the connection lock, due to -+ * the mess with set_timeout_functions()/set_watch_functions() -+ * calling out to the app without dropping locks) - */ - --#ifdef DBUS_HAVE_ATOMIC_INT -+#if 1 - last_unref = (_dbus_atomic_dec (&connection->refcount) == 1); - #else - CONNECTION_LOCK (connection); -@@ -4708,9 +4740,11 @@ dbus_connection_dispatch (DBusConnection *connection) - * should be that dbus_connection_set_watch_functions() has no effect, - * but the add_function and remove_function may have been called. - * -- * @todo We need to drop the lock when we call the -- * add/remove/toggled functions which can be a side effect -- * of setting the watch functions. -+ * @note The thread lock on DBusConnection is held while -+ * watch functions are invoked, so inside these functions you -+ * may not invoke any methods on DBusConnection or it will deadlock. -+ * See the comments in the code or http://lists.freedesktop.org/archives/dbus/2007-July/tread.html#8144 -+ * if you encounter this issue and want to attempt writing a patch. - * - * @param connection the connection. - * @param add_function function to begin monitoring a new descriptor. -@@ -4729,43 +4763,18 @@ dbus_connection_set_watch_functions (DBusConnection *connection, - DBusFreeFunction free_data_function) - { - dbus_bool_t retval; -- DBusWatchList *watches; - - _dbus_return_val_if_fail (connection != NULL, FALSE); - - CONNECTION_LOCK (connection); - --#ifndef DBUS_DISABLE_CHECKS -- if (connection->watches == NULL) -- { -- _dbus_warn_check_failed ("Re-entrant call to %s is not allowed\n", -- _DBUS_FUNCTION_NAME); -- return FALSE; -- } --#endif -- -- /* ref connection for slightly better reentrancy */ -- _dbus_connection_ref_unlocked (connection); -- -- /* This can call back into user code, and we need to drop the -- * connection lock when it does. This is kind of a lame -- * way to do it. -- */ -- watches = connection->watches; -- connection->watches = NULL; -- CONNECTION_UNLOCK (connection); -- -- retval = _dbus_watch_list_set_functions (watches, -+ retval = _dbus_watch_list_set_functions (connection->watches, - add_function, remove_function, - toggled_function, - data, free_data_function); -- CONNECTION_LOCK (connection); -- connection->watches = watches; -- -+ - CONNECTION_UNLOCK (connection); -- /* drop our paranoid refcount */ -- dbus_connection_unref (connection); -- -+ - return retval; - } - -@@ -4794,6 +4803,12 @@ dbus_connection_set_watch_functions (DBusConnection *connection, - * given remove_function. The timer interval may change whenever the - * timeout is added, removed, or toggled. - * -+ * @note The thread lock on DBusConnection is held while -+ * timeout functions are invoked, so inside these functions you -+ * may not invoke any methods on DBusConnection or it will deadlock. -+ * See the comments in the code or http://lists.freedesktop.org/archives/dbus/2007-July/thread.html#8144 -+ * if you encounter this issue and want to attempt writing a patch. -+ * - * @param connection the connection. - * @param add_function function to add a timeout. - * @param remove_function function to remove a timeout. -@@ -4811,38 +4826,17 @@ dbus_connection_set_timeout_functions (DBusConnection *connection, - DBusFreeFunction free_data_function) - { - dbus_bool_t retval; -- DBusTimeoutList *timeouts; - - _dbus_return_val_if_fail (connection != NULL, FALSE); - - CONNECTION_LOCK (connection); - --#ifndef DBUS_DISABLE_CHECKS -- if (connection->timeouts == NULL) -- { -- _dbus_warn_check_failed ("Re-entrant call to %s is not allowed\n", -- _DBUS_FUNCTION_NAME); -- return FALSE; -- } --#endif -- -- /* ref connection for slightly better reentrancy */ -- _dbus_connection_ref_unlocked (connection); -- -- timeouts = connection->timeouts; -- connection->timeouts = NULL; -- CONNECTION_UNLOCK (connection); -- -- retval = _dbus_timeout_list_set_functions (timeouts, -+ retval = _dbus_timeout_list_set_functions (connection->timeouts, - add_function, remove_function, - toggled_function, - data, free_data_function); -- CONNECTION_LOCK (connection); -- connection->timeouts = timeouts; -- -+ - CONNECTION_UNLOCK (connection); -- /* drop our paranoid refcount */ -- dbus_connection_unref (connection); - - return retval; - } -@@ -5805,6 +5799,15 @@ dbus_connection_free_data_slot (dbus_int32_t *slot_p) - * the connection is finalized. The slot number - * must have been allocated with dbus_connection_allocate_data_slot(). - * -+ * @note This function does not take the -+ * main thread lock on DBusConnection, which allows it to be -+ * used from inside watch and timeout functions. (See the -+ * note in docs for dbus_connection_set_watch_functions().) -+ * A side effect of this is that you need to know there's -+ * a reference held on the connection while invoking -+ * dbus_connection_set_data(), or the connection could be -+ * finalized during dbus_connection_set_data(). -+ * - * @param connection the connection - * @param slot the slot number - * @param data the data to store -@@ -5824,14 +5827,14 @@ dbus_connection_set_data (DBusConnection *connection, - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (slot >= 0, FALSE); - -- CONNECTION_LOCK (connection); -+ SLOTS_LOCK (connection); - - retval = _dbus_data_slot_list_set (&slot_allocator, - &connection->slot_list, - slot, data, free_data_func, - &old_free_func, &old_data); - -- CONNECTION_UNLOCK (connection); -+ SLOTS_UNLOCK (connection); - - if (retval) - { -@@ -5847,6 +5850,15 @@ dbus_connection_set_data (DBusConnection *connection, - * Retrieves data previously set with dbus_connection_set_data(). - * The slot must still be allocated (must not have been freed). - * -+ * @note This function does not take the -+ * main thread lock on DBusConnection, which allows it to be -+ * used from inside watch and timeout functions. (See the -+ * note in docs for dbus_connection_set_watch_functions().) -+ * A side effect of this is that you need to know there's -+ * a reference held on the connection while invoking -+ * dbus_connection_get_data(), or the connection could be -+ * finalized during dbus_connection_get_data(). -+ * - * @param connection the connection - * @param slot the slot to get data from - * @returns the data, or #NULL if not found -@@ -5859,13 +5871,13 @@ dbus_connection_get_data (DBusConnection *connection, - - _dbus_return_val_if_fail (connection != NULL, NULL); - -- CONNECTION_LOCK (connection); -+ SLOTS_LOCK (connection); - - res = _dbus_data_slot_list_get (&slot_allocator, - &connection->slot_list, - slot); - -- CONNECTION_UNLOCK (connection); -+ SLOTS_UNLOCK (connection); - - return res; - } diff --git a/abs/core/dbus-core/dbus b/abs/core/dbus-core/dbus index 66b84ca..bf532a2 100644 --- a/abs/core/dbus-core/dbus +++ b/abs/core/dbus-core/dbus @@ -4,18 +4,14 @@ . /etc/rc.conf . /etc/rc.d/functions -case "$1" in +case $1 in start) stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure + if [[ ! -d /run/dbus ]] ; then + install -m755 -g 81 -o 81 -d /run/dbus fi - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then + if ! dbus-daemon --system; then stat_fail else add_daemon dbus @@ -24,27 +20,25 @@ case "$1" in ;; stop) stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then + if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then stat_fail else - rm -f /var/run/dbus.pid + rm -f /run/dbus/pid rm_daemon dbus stat_done fi ;; restart) $0 stop - sleep 1 + sleep 1 $0 start ;; reload) stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ + if ! { [[ -f /run/dbus/pid ]] && dbus-send \ --system --type=method_call \ --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then + / org.freedesktop.DBus.ReloadConfig; }; then stat_fail else stat_done @@ -52,6 +46,6 @@ case "$1" in ;; *) echo "usage: $0 {start|stop|restart|reload}" - ;; + ;; esac exit 0 diff --git a/abs/core/dbus-core/dbus.install b/abs/core/dbus-core/dbus.install index 44f4475..f1ffd61 100644 --- a/abs/core/dbus-core/dbus.install +++ b/abs/core/dbus-core/dbus.install @@ -1,24 +1,23 @@ post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null - dbus-uuidgen --ensure + getent group dbus >/dev/null || groupadd -g 81 dbus + getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus + passwd -l dbus &>/dev/null } post_upgrade() { post_install - #Make sure new rc script can shutdown running dbus - if [ -f var/run/dbus/pid ]; then - mv var/run/dbus/pid var/run/dbus.pid + # Make sure new rc script can shutdown running dbus + if [ -f run/dbus.pid -a -d run/dbus ]; then + mv run/dbus.pid run/dbus/pid fi } post_remove() { if getent passwd dbus >/dev/null; then - usr/sbin/userdel dbus + userdel dbus fi if getent group dbus >/dev/null; then - usr/sbin/groupdel dbus + groupdel dbus fi } diff --git a/abs/core/dbus-core/git-fixes.patch b/abs/core/dbus-core/git-fixes.patch deleted file mode 100644 index b1b11fa..0000000 --- a/abs/core/dbus-core/git-fixes.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c -index fd016a8..8a1f504 100644 ---- a/bus/config-parser-trivial.c -+++ b/bus/config-parser-trivial.c -@@ -131,6 +131,25 @@ bus_config_parser_unref (BusConfigParser *parser) - } - - dbus_bool_t -+bus_config_parser_check_doctype (BusConfigParser *parser, -+ const char *doctype, -+ DBusError *error) -+{ -+ _DBUS_ASSERT_ERROR_IS_CLEAR (error); -+ -+ if (strcmp (doctype, "busconfig") != 0) -+ { -+ dbus_set_error (error, -+ DBUS_ERROR_FAILED, -+ "Configuration file has the wrong document type %s", -+ doctype); -+ return FALSE; -+ } -+ else -+ return TRUE; -+} -+ -+dbus_bool_t - bus_config_parser_start_element (BusConfigParser *parser, - const char *element_name, - const char **attribute_names, -diff --git a/bus/config-parser-trivial.h b/bus/config-parser-trivial.h -index ce542bf..6733b1f 100644 ---- a/bus/config-parser-trivial.h -+++ b/bus/config-parser-trivial.h -@@ -41,6 +41,9 @@ BusConfigParser* bus_config_parser_new (const DBusString *basedir, - - BusConfigParser* bus_config_parser_ref (BusConfigParser *parser); - void bus_config_parser_unref (BusConfigParser *parser); -+dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser, -+ const char *doctype, -+ DBusError *error); - dbus_bool_t bus_config_parser_start_element (BusConfigParser *parser, - const char *element_name, - const char **attribute_names, -diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c -index 4a01b74..4e436eb 100644 ---- a/bus/dir-watch-kqueue.c -+++ b/bus/dir-watch-kqueue.c -@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories) - */ - for (i = 0; new_dirs[i]; i++) - { -- for (j = 0; i < num_fds; j++) -+ for (j = 0; j < num_fds; j++) - { - if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0) - { -diff --git a/bus/messagebus.in b/bus/messagebus.in -index 1f1004b..3e2ee07 100755 ---- a/bus/messagebus.in -+++ b/bus/messagebus.in -@@ -68,7 +68,7 @@ case "$1" in - stop - ;; - status) -- status $processname -+ status $servicename - RETVAL=$? - ;; - restart) -diff --git a/bus/rc.messagebus.in b/bus/rc.messagebus.in -index b147503..c52ca77 100644 ---- a/bus/rc.messagebus.in -+++ b/bus/rc.messagebus.in -@@ -61,7 +61,7 @@ case "$1" in - stop - ;; - status) -- status $processname -+ status $servicename - RETVAL=$? - ;; - restart) -diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h -index 721b5d7..cdf3f59 100644 ---- a/dbus/dbus-connection-internal.h -+++ b/dbus/dbus-connection-internal.h -@@ -75,6 +75,7 @@ void _dbus_connection_toggle_timeout_unlocked (DBusConnection - dbus_bool_t enabled); - DBusConnection* _dbus_connection_new_for_transport (DBusTransport *transport); - void _dbus_connection_do_iteration_unlocked (DBusConnection *connection, -+ DBusPendingCall *pending, - unsigned int flags, - int timeout_milliseconds); - void _dbus_connection_close_possibly_shared (DBusConnection *connection); -diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c -index 9526d3c..b3cfa3d 100644 ---- a/dbus/dbus-connection.c -+++ b/dbus/dbus-connection.c -@@ -320,6 +320,8 @@ static void _dbus_connection_release_dispatch (DB - static DBusDispatchStatus _dbus_connection_flush_unlocked (DBusConnection *connection); - static void _dbus_connection_close_possibly_shared_and_unlock (DBusConnection *connection); - static dbus_bool_t _dbus_connection_get_is_connected_unlocked (DBusConnection *connection); -+static dbus_bool_t _dbus_connection_peek_for_reply_unlocked (DBusConnection *connection, -+ dbus_uint32_t client_serial); - - static DBusMessageFilter * - _dbus_message_filter_ref (DBusMessageFilter *filter) -@@ -1137,14 +1139,22 @@ _dbus_connection_release_io_path (DBusConnection *connection) - * you specify DBUS_ITERATION_BLOCK; in that case the function - * returns immediately. - * -+ * If pending is not NULL then a check is made if the pending call -+ * is completed after the io path has been required. If the call -+ * has been completed nothing is done. This must be done since -+ * the _dbus_connection_acquire_io_path releases the connection -+ * lock for a while. -+ * - * Called with connection lock held. - * - * @param connection the connection. -+ * @param pending the pending call that should be checked or NULL - * @param flags iteration flags. - * @param timeout_milliseconds maximum blocking time, or -1 for no limit. - */ - void - _dbus_connection_do_iteration_unlocked (DBusConnection *connection, -+ DBusPendingCall *pending, - unsigned int flags, - int timeout_milliseconds) - { -@@ -1160,8 +1170,22 @@ _dbus_connection_do_iteration_unlocked (DBusConnection *connection, - { - HAVE_LOCK_CHECK (connection); - -- _dbus_transport_do_iteration (connection->transport, -- flags, timeout_milliseconds); -+ if ( (pending != NULL) && _dbus_pending_call_get_completed_unlocked(pending)) -+ { -+ _dbus_verbose ("pending call completed while acquiring I/O path"); -+ } -+ else if ( (pending != NULL) && -+ _dbus_connection_peek_for_reply_unlocked (connection, -+ _dbus_pending_call_get_reply_serial_unlocked (pending))) -+ { -+ _dbus_verbose ("pending call completed while acquiring I/O path (reply found in queue)"); -+ } -+ else -+ { -+ _dbus_transport_do_iteration (connection->transport, -+ flags, timeout_milliseconds); -+ } -+ - _dbus_connection_release_io_path (connection); - } - -@@ -1989,6 +2013,7 @@ _dbus_connection_send_preallocated_unlocked_no_update (DBusConnection *con - * out immediately, and otherwise get them queued up - */ - _dbus_connection_do_iteration_unlocked (connection, -+ NULL, - DBUS_ITERATION_DO_WRITING, - -1); - -@@ -2157,6 +2182,32 @@ generate_local_error_message (dbus_uint32_t serial, - return message; - } - -+/* -+ * Peek the incoming queue to see if we got reply for a specific serial -+ */ -+static dbus_bool_t -+_dbus_connection_peek_for_reply_unlocked (DBusConnection *connection, -+ dbus_uint32_t client_serial) -+{ -+ DBusList *link; -+ HAVE_LOCK_CHECK (connection); -+ -+ link = _dbus_list_get_first_link (&connection->incoming_messages); -+ -+ while (link != NULL) -+ { -+ DBusMessage *reply = link->data; -+ -+ if (dbus_message_get_reply_serial (reply) == client_serial) -+ { -+ _dbus_verbose ("%s reply to %d found in queue\n", _DBUS_FUNCTION_NAME, client_serial); -+ return TRUE; -+ } -+ link = _dbus_list_get_next_link (&connection->incoming_messages, link); -+ } -+ -+ return FALSE; -+} - - /* This is slightly strange since we can pop a message here without - * the dispatch lock. -@@ -2333,6 +2384,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending) - /* Now we wait... */ - /* always block at least once as we know we don't have the reply yet */ - _dbus_connection_do_iteration_unlocked (connection, -+ pending, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_BLOCK, - timeout_milliseconds); -@@ -2399,6 +2451,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending) - { - /* block again, we don't have the reply buffered yet. */ - _dbus_connection_do_iteration_unlocked (connection, -+ pending, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); -@@ -2426,6 +2479,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending) - { - /* block again, we don't have the reply buffered yet. */ - _dbus_connection_do_iteration_unlocked (connection, -+ NULL, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); -@@ -3403,6 +3457,7 @@ _dbus_connection_flush_unlocked (DBusConnection *connection) - _dbus_verbose ("doing iteration in %s\n", _DBUS_FUNCTION_NAME); - HAVE_LOCK_CHECK (connection); - _dbus_connection_do_iteration_unlocked (connection, -+ NULL, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_DO_WRITING | - DBUS_ITERATION_BLOCK, -@@ -3489,6 +3544,7 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection, - { - _dbus_verbose ("doing iteration in %s\n", _DBUS_FUNCTION_NAME); - _dbus_connection_do_iteration_unlocked (connection, -+ NULL, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_DO_WRITING | - DBUS_ITERATION_BLOCK, -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index ce3475a..b58d09a 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -623,6 +623,7 @@ _dbus_listen_unix_socket (const char *path, - int listen_fd; - struct sockaddr_un addr; - size_t path_len; -+ unsigned int reuseaddr; - - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - -@@ -696,7 +697,15 @@ _dbus_listen_unix_socket (const char *path, - - strncpy (addr.sun_path, path, path_len); - } -- -+ -+ reuseaddr = 1; -+ if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) -+ { -+ dbus_set_error (error, _dbus_error_from_errno (errno), -+ "Failed to set socket option\"%s\": %s", -+ path, _dbus_strerror (errno)); -+ } -+ - if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) - { - dbus_set_error (error, _dbus_error_from_errno (errno), -@@ -870,6 +879,7 @@ _dbus_listen_tcp_socket (const char *host, - int nlisten_fd = 0, *listen_fd = NULL, res, i; - struct addrinfo hints; - struct addrinfo *ai, *tmp; -+ unsigned int reuseaddr; - - *fds_p = NULL; - _DBUS_ASSERT_ERROR_IS_CLEAR (error); -@@ -915,6 +925,14 @@ _dbus_listen_tcp_socket (const char *host, - } - _DBUS_ASSERT_ERROR_IS_CLEAR(error); - -+ reuseaddr = 1; -+ if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) -+ { -+ dbus_set_error (error, _dbus_error_from_errno (errno), -+ "Failed to set socket option \"%s:%s\": %s", -+ host ? host : "*", port, _dbus_strerror (errno)); -+ } -+ - if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0) - { - _dbus_close(fd, NULL); diff --git a/abs/core/dbus-glib/PKGBUILD b/abs/core/dbus-glib/PKGBUILD index bfecd8a..9ba5e1e 100644 --- a/abs/core/dbus-glib/PKGBUILD +++ b/abs/core/dbus-glib/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 98493 2010-11-10 13:05:31Z ibiru $ +# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dbus-glib -pkgver=0.92 +pkgver=0.100 pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core>=1.4.0' 'glib2>=2.26.0') +depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b595b36890c4f9f8f5d5dec131c495f8') +md5sums=('d33959a9c0c6a158f5ac6d640316e89e') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --enable-bash-completion=no make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/abs/core/dbus-python/PKGBUILD b/abs/core/dbus-python/PKGBUILD new file mode 100644 index 0000000..2ab6eea --- /dev/null +++ b/abs/core/dbus-python/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 162393 2012-06-26 18:57:06Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=dbus-python +pkgname=('python2-dbus' 'python-dbus-common') +pkgver=1.1.1 +pkgrel=1 +pkgdesc="Python bindings for DBUS" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +makedepends=('docutils' 'dbus-glib' 'python2') +options=('!libtool') +source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) +md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') + +build() { + cd "${srcdir}" + mkdir build-python2 build-python3 + cd "${srcdir}/build-python2" + PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr + make + + + #cd "${srcdir}/build-python3" + #../${pkgbase}-${pkgver}/configure --prefix=/usr + #make +} + +package_python-dbus-common() { + pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" + conflicts=('dbus-python<1.1.0') + + cd "${srcdir}/build-python2" + make DESTDIR="${pkgdir}" install-data + rm -rf "${pkgdir}"/usr/lib/python* +} + +package_python-dbus1() { + depends=('python-dbus-common' 'python' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 3.2 bindings for DBUS" + + cd "${srcdir}/build-python3" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} + +package_python2-dbus() { + depends=('python-dbus-common' 'python2' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 2.7 bindings for DBUS" + replaces=('dbus-python') + conflicts=('dbus-python') + provides=("dbus-python=$pkgver") + + cd "${srcdir}/build-python2" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} diff --git a/abs/core/dbus-python/__changelog b/abs/core/dbus-python/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/dbus-python/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus index 603e92d..69d2660 100644 --- a/abs/core/dbus/30-dbus +++ b/abs/core/dbus/30-dbus @@ -6,4 +6,3 @@ dbuslaunch="`which dbus-launch 2>/dev/null`" if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then eval `$dbuslaunch --sh-syntax --exit-with-session` fi - diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD index da5da51..02b2696 100644 --- a/abs/core/dbus/PKGBUILD +++ b/abs/core/dbus/PKGBUILD @@ -1,42 +1,42 @@ -# $Id: PKGBUILD 90544 2010-09-13 10:56:13Z jgc $ +# $Id: PKGBUILD 163850 2012-07-21 11:19:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.4.0 +pkgver=1.6.4 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') -depends=("dbus-core>=${pkgver}" 'libx11') -makedepends=('libsm' 'libice') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz +depends=("dbus-core>=$pkgver" 'libx11') +source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} 30-dbus) -md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282' - 'd14e59575f04e55d21a04907b6fd9f3c') +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' + '9fafe8b28460aeaa6054309ef4c5ed92') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ --with-system-pid-file=/var/run/dbus.pid \ --disable-verbose-mode --disable-static \ --enable-inotify --disable-dnotify \ --disable-tests --disable-asserts - cd tools - make dbus-launch || return 1 + make -C tools dbus-launch } + package() { - cd "${srcdir}/${pkgname}-${pkgver}/tools" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m755 dbus-launch "${pkgdir}/usr/bin/" || return 1 - install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/" + cd $pkgname-$pkgver + install -m755 -d "$pkgdir/usr/bin" + install -m755 -d "$pkgdir/usr/share/man/man1" + install -m755 tools/dbus-launch "$pkgdir/usr/bin/" + install -m644 doc/dbus-launch.1 "$pkgdir/usr/share/man/man1/" - install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" - install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" + install -m755 -d "$pkgdir/etc/X11/xinit/xinitrc.d" + install -m755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/" - install -d -m755 "${pkgdir}/usr/share/licenses/dbus" - install -m644 ../COPYING "${pkgdir}/usr/share/licenses/dbus/" + install -d -m755 "$pkgdir/usr/share/licenses/dbus" + install -m644 COPYING "$pkgdir/usr/share/licenses/dbus/" } diff --git a/abs/core/ddcxinfo/PKGBUILD b/abs/core/ddcxinfo/PKGBUILD deleted file mode 100644 index b358c0c..0000000 --- a/abs/core/ddcxinfo/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=ddcxinfo -pkgver=0.6.19 -pkgrel=3 -pkgdesc="DDC readout using the VESA BIOS extension" -url="http://www.t2-project.org/packages/ddcxinfo.html" -license="GPL" -depends=(x-server) -makedepends=() -conflicts=() -replaces=() -backup=() -arch=('i686') -install= -source=(http://www.kanotix.com/files/debian/pool/main/d/ddcxinfo-kanotix/$pkgname-kanotix_$pkgver.tar.gz - lrmi.patch) - - -build() { - cd $startdir/src/$pkgname-kanotix-$pkgver - mkdir -p $startdir/pkg/usr/sbin - patch -p1 < $startdir/src/lrmi.patch - make DESTDIR=$startdir/pkg install - cp svgamodes $startdir/pkg/usr/sbin/ - chmod +s $startdir/pkg/usr/sbin/ddcprobe -} diff --git a/abs/core/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz b/abs/core/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz Binary files differdeleted file mode 100644 index fbbb329..0000000 --- a/abs/core/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz +++ /dev/null diff --git a/abs/core/ddcxinfo/lrmi.patch b/abs/core/ddcxinfo/lrmi.patch deleted file mode 100644 index ca735fa..0000000 --- a/abs/core/ddcxinfo/lrmi.patch +++ /dev/null @@ -1,18 +0,0 @@ -Common subdirectories: ddcxinfo-kanotix-0.6.19-orig/debian and ddcxinfo-kanotix-0.6.19/debian -diff -u ddcxinfo-kanotix-0.6.19-orig/lrmi.c ddcxinfo-kanotix-0.6.19/lrmi.c ---- ddcxinfo-kanotix-0.6.19-orig/lrmi.c 2009-07-25 06:15:09.000000000 +0000 -+++ ddcxinfo-kanotix-0.6.19/lrmi.c 2009-07-25 06:17:22.000000000 +0000 -@@ -170,6 +170,13 @@ - } - } - -+#ifndef TF_MASK -+#define TF_MASK X86_EFLAGS_TF -+#define IF_MASK X86_EFLAGS_IF -+#define IOPL_MASK X86_EFLAGS_IOPL -+#define VIF_MASK X86_EFLAGS_VIF -+#define VIP_MASK X86_EFLAGS_VIP -+#endif - - #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) - #define DEFAULT_STACK_SIZE 0x1000 diff --git a/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch new file mode 100644 index 0000000..4420d0b --- /dev/null +++ b/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Sun, 19 Jun 2011 16:04:25 -0500 +Subject: [PATCH] Set hostname via /proc if file is available + +On Linux, the hostname can be set via this file if available, precluding +the need for a `hostname` binary. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + dhcpcd-hooks/30-hostname | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname +index 65d1a13..af94262 100644 +--- a/dhcpcd-hooks/30-hostname ++++ b/dhcpcd-hooks/30-hostname +@@ -21,7 +21,11 @@ need_hostname() + try_hostname() + { + if valid_domainname "$1"; then +- hostname "$1" ++ if [ -w /proc/sys/kernel/hostname ]; then ++ echo "$1" > /proc/sys/kernel/hostname ++ else ++ hostname "$1" ++ fi + else + syslog err "Invalid hostname: $1" + fi +-- +1.7.5.4 + diff --git a/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch new file mode 100644 index 0000000..7e78ecd --- /dev/null +++ b/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Tue, 21 Jun 2011 09:32:47 -0400 +Subject: [PATCH] set MTU via sysfs if file is available + +On Linux, a network interface's MTU can be set by writing to +/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. + +Signed-off-by: Dave Reisner <d@falconindy.com> +--- + dhcpcd-hooks/10-mtu | 4 ++-- + dhcpcd-run-hooks.in | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu +index 639697c..8763930 100644 +--- a/dhcpcd-hooks/10-mtu ++++ b/dhcpcd-hooks/10-mtu +@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if set_mtu "$interface" "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ set_mtu "$interface" "$mtu" + rm "$mtu_dir/$interface" + fi + fi +diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in +index 0e60338..843f3ca 100644 +--- a/dhcpcd-run-hooks.in ++++ b/dhcpcd-run-hooks.in +@@ -215,6 +215,17 @@ service_condcommand() + service_exists $1 && service_status $1 && service_cmd $1 $2 + } + ++# Set MTU for an interface ++set_mtu() { ++ local interface=$1 mtu=$2 ++ ++ if [ -e /sys/class/net/$interface/mtu ]; then ++ echo "$mtu" > /sys/class/net/$interface/mtu ++ else ++ ifconfig "$interface" mtu "$mtu" ++ fi ++} ++ + # We source each script into this one so that scripts run earlier can + # remove variables from the environment so later scripts don't see them. + # Thus, the user can create their dhcpcd.enter/exit-hook script to configure +-- +1.7.5.4 + diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD index df6e342..ce8ac11 100644 --- a/abs/core/dhcpcd/PKGBUILD +++ b/abs/core/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96706 2010-10-24 10:55:10Z ronald $ +# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.2.8 +pkgver=5.5.6 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -16,35 +16,36 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d') -sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0' +sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { cd ${srcdir}/${pkgname}-${pkgver} # configure variables - ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd + ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ + --rundir=/run # Build - make || return 1 + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # Create Binary Symlink - install -d ${pkgdir}/usr/sbin || return 1 - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd || return 1 + install -d ${pkgdir}/usr/sbin + ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd # Install Configuration File used in /etc/rc.d/network - install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname || return 1 + install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname # Install License - install -d $pkgdir/usr/share/licenses/$pkgname || return 1 + install -d $pkgdir/usr/share/licenses/$pkgname awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ - >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # Set Options in /etc/dhcpcd.conf - echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall + echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall } diff --git a/abs/core/dhcpcd/remove_ifconfig.patch b/abs/core/dhcpcd/remove_ifconfig.patch new file mode 100644 index 0000000..5bcc4a6 --- /dev/null +++ b/abs/core/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/abs/core/dialog/PKGBUILD b/abs/core/dialog/PKGBUILD index f6b93ec..d615e05 100644 --- a/abs/core/dialog/PKGBUILD +++ b/abs/core/dialog/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 94294 2010-10-06 14:23:10Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 163201 2012-07-09 14:42:05Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.1_20100428 -_pkgver=1.1-20100428 -pkgrel=2 +pkgver=1.1_20120706 +pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') url="http://invisible-island.net/dialog/" -license=('GPL') +license=('LGPL2.1') depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-$_pkgver.tgz) -md5sums=('519c0a0cbac28ddb992111ec2c3f82aa') +source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) +sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84') build() { - cd ${srcdir}/$pkgname-$_pkgver + cd "${srcdir}/$pkgname-${pkgver/_/-}" ./configure --prefix=/usr --mandir=/usr/share/man \ --with-ncursesw --enable-nls make } package() { - cd ${srcdir}/$pkgname-$_pkgver - make DESTDIR=${pkgdir} install install-lib + cd "${srcdir}/$pkgname-${pkgver/_/-}" + make DESTDIR="${pkgdir}" install install-lib } diff --git a/abs/core/dialog/timeout.patch b/abs/core/dialog/timeout.patch deleted file mode 100644 index 257f275..0000000 --- a/abs/core/dialog/timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dialog-1.1-20070514/ui_getc.c 2007-05-15 00:24:00.000000000 +0200 -+++ dialog-1.1-20070514_fixed/ui_getc.c 2007-05-29 20:20:27.000000000 +0200 -@@ -252,6 +252,8 @@ - ch = wgetch(win); - /* if error from resizing, wait and try again */ - if (ch == ERR) { -+ current = time((time_t *) 0); -+ if (interval > 0 && current >= expired) dlg_exiterr("timeout"); - napms(50); - continue; - } diff --git a/abs/core/diffutils/PKGBUILD b/abs/core/diffutils/PKGBUILD index 6cf0ff4..ca871aa 100644 --- a/abs/core/diffutils/PKGBUILD +++ b/abs/core/diffutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 137084 2011-09-06 04:35:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=diffutils -pkgver=3.0 -pkgrel=2 +pkgver=3.2 +pkgrel=1 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/diffutils" @@ -13,15 +13,21 @@ groups=('base') depends=('glibc' 'sh') install=diffutils.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('7624eb7e6b53ea3ce38958a092d2216e') +md5sums=('26ff64c332429c830c154be46b393382') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} + sed -i '/gets is a security hole/d' lib/stdio.in.h ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/abs/core/diffutils/__changelog b/abs/core/diffutils/__changelog new file mode 100644 index 0000000..f7bfd9a --- /dev/null +++ b/abs/core/diffutils/__changelog @@ -0,0 +1 @@ +sed -i '/gets is a security hole/d' lib/stdio.in.h diff --git a/abs/core/diffutils/diffutils.install b/abs/core/diffutils/diffutils.install index 3ebec28..ae6655f 100644 --- a/abs/core/diffutils/diffutils.install +++ b/abs/core/diffutils/diffutils.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(diff.info) +infodir=usr/share/info +filelist=(diffutils.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/abs/core/dirmngr/PKGBUILD b/abs/core/dirmngr/PKGBUILD new file mode 100644 index 0000000..40e0c74 --- /dev/null +++ b/abs/core/dirmngr/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155870 2012-04-08 07:13:40Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=dirmngr +pkgver=1.1.0 +pkgrel=4 +pkgdesc="A daemon to handle CRL and certificate requests" +arch=('i686' 'x86_64') +license=('GPL') +url="ftp://ftp.gnupg.org/gcrypt/dirmngr" +depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=dirmngr.install + +build() { + cd $srcdir/$pkgname-$pkgver + # FIX for https://bugzilla.redhat.com/565131 + # not sure how best to turn this into something more upstreamable + # patch configure to try this combo first? -- Rex + # https://bugs.archlinux.org/task/28606 + export LDAPLIBS="-lldap -llber" + ./configure --prefix=/usr --libexecdir=/usr/lib + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} +md5sums=('f2570f0248f5947daac200e85291b328') diff --git a/abs/core/gcc/gcc-ada.install b/abs/core/dirmngr/dirmngr.install index 1c8e086..e26e0e7 100644 --- a/abs/core/gcc/gcc-ada.install +++ b/abs/core/dirmngr/dirmngr.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) +infodir=usr/share/info +filelist=(dirmngr.info) post_install() { [ -x usr/bin/install-info ] || return 0 @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/dmraid/PKGBUILD b/abs/core/dmraid/PKGBUILD new file mode 100644 index 0000000..39f3672 --- /dev/null +++ b/abs/core/dmraid/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +#Contributor: Urs Wolfer <uwolfer @ fwo.ch> + +pkgname=dmraid +pkgver=1.0.0.rc16.3 +pkgrel=7 +pkgdesc="Device mapper RAID interface" +url="http://people.redhat.com/~heinzm/sw/dmraid/" +conflicts=('mkinitcpio<0.7') +depends=('device-mapper>=2.0.54') +arch=('i686' 'x86_64') +license=('GPL') +source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 + http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 + dmraid_install + dmraid_hook + dmraid_tmpfiles + dmraid.service) +install=dmraid.install +md5sums=('819338fcef98e8e25819f0516722beeb' + '2297d23cee1aef23ec6ad8d6d1870356' + 'faec669dc85f87187b45b5d3968efe2c' + '56a8bb0ece8d206cd8efb504ee072ddd' + 'de0af1fdb9ed4c109b8119160167d2e9') + +build() { + cd "$pkgname/1.0.0.rc16-3/$pkgname" + ./configure --enable-led --enable-intel_led + make +} + +package() { + cd "$pkgname/1.0.0.rc16-3/$pkgname" + make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install + install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid + install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid + install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf + + # fix permissions + chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a + + install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service" +} diff --git a/abs/core/dmraid/dmraid.install b/abs/core/dmraid/dmraid.install new file mode 100644 index 0000000..64899e7 --- /dev/null +++ b/abs/core/dmraid/dmraid.install @@ -0,0 +1,14 @@ +post_upgrade() { + if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then + # important upgrade notice + echo ">>>" + echo ">>> IMPORTANT DMRAID UPGRADE NOTICE" + echo ">>> -------------------------------" + echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:" + echo ">>> You need to add an additional 'p' in front of your number." + echo ">>> e.g. <yourname><number> --> <yourname>p<number>" + echo ">>> firsthd1 --> firsthdp1" + echo ">>> Please change your bootloader and fstab accordingly." + echo ">>>" + fi +} diff --git a/abs/core/dmraid/dmraid.service b/abs/core/dmraid/dmraid.service new file mode 100644 index 0000000..1fd142f --- /dev/null +++ b/abs/core/dmraid/dmraid.service @@ -0,0 +1,16 @@ +[Unit] +Description=Assemble FakeRAID arrays +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +Type=oneshot +TimeoutSec=0 +RemainAfterExit=true + +[Install] +WantedBy=basic.target diff --git a/abs/core/dmraid/dmraid_hook b/abs/core/dmraid/dmraid_hook new file mode 100644 index 0000000..37283e8 --- /dev/null +++ b/abs/core/dmraid/dmraid_hook @@ -0,0 +1,14 @@ +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "$quiet" = "y" ]; then + dmraid -ay -I -Z >/dev/null + else + dmraid -ay -I -Z + fi +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/dmraid/dmraid_install b/abs/core/dmraid/dmraid_install new file mode 100644 index 0000000..d3238c1 --- /dev/null +++ b/abs/core/dmraid/dmraid_install @@ -0,0 +1,22 @@ +#!/bin/bash + +build() { + add_module 'dm-mod' + add_module 'dm-mirror' + + add_binary 'dmraid' + add_binary 'dmsetup' + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + + add_runscript +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for a dmraid root device. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/dmraid/dmraid_tmpfiles b/abs/core/dmraid/dmraid_tmpfiles new file mode 100644 index 0000000..4f21ac1 --- /dev/null +++ b/abs/core/dmraid/dmraid_tmpfiles @@ -0,0 +1 @@ +d /run/lock/dmraid 1777 root root diff --git a/abs/core/dmxproto/PKGBUILD b/abs/core/dmxproto/PKGBUILD index 42ee7fa..1298da8 100644 --- a/abs/core/dmxproto/PKGBUILD +++ b/abs/core/dmxproto/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 151184 2012-02-25 07:03:52Z pierre $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dmxproto -pkgver=2.3 -pkgrel=1 +pkgver=2.3.1 +pkgrel=2 pkgdesc="X11 Distributed Multihead X extension wire protocol" -arch=('i686' 'x86_64') +arch=('any') +makedepends=('xorg-util-macros') url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +license=('custom') +source=("${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('880a41720b2937e2660dcdc0d34a8791') diff --git a/abs/core/dnssec-anchors/PKGBUILD b/abs/core/dnssec-anchors/PKGBUILD new file mode 100644 index 0000000..3546394 --- /dev/null +++ b/abs/core/dnssec-anchors/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 157121 2012-04-24 08:19:44Z bisson $ +# Contributor: Thomas Mudrunka <harvie@email.cz> +# Contributor: m4xm4n <max@maxfierke.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=dnssec-anchors +pkgver=20120422 +pkgrel=1 +pkgdesc='DNSSEC trust anchors for the root zone' +url='http://data.iana.org/root-anchors/' +license=('custom:NoCopyright') +arch=('any') +source=('trusted-key.key') +sha256sums=('a6e1e5de6d3f26ea74792eab7ac21cc7805e986303bfa270a0120cc8146f881a') + +# dig . dnskey +short | sed 's/^/. 172789 IN DNSKEY /' > trusted-key.key + +package() { + cd "${srcdir}" + + install -Dm644 trusted-key.key "${pkgdir}"/etc/trusted-key.key + + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + cat > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" << EOF +The contents of this package are inelligible for copyright protection. +EOF +} diff --git a/abs/core/dnssec-anchors/trusted-key.key b/abs/core/dnssec-anchors/trusted-key.key new file mode 100644 index 0000000..b71ae03 --- /dev/null +++ b/abs/core/dnssec-anchors/trusted-key.key @@ -0,0 +1,2 @@ +. 172789 IN DNSKEY 256 3 8 AwEAAbd0IPTQdvyndWSX6HHcB+JycMl1aCGTHSJUBs/y9S93el05VvXg 1VqSF4vveB9rEuAZ1z8RNWZ9ac+rlaK7PrI5RlCIyKKPbtHbpgQGkwai 8O6BZ4J/ch7DGuhGJfvoECcWjsucs683WFRtmfLx5WNdPxxi30Czt1zP qMWfY6YJ +. 172789 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0= diff --git a/abs/core/dnsutils/PKGBUILD b/abs/core/dnsutils/PKGBUILD index 336f534..9fc5101 100644 --- a/abs/core/dnsutils/PKGBUILD +++ b/abs/core/dnsutils/PKGBUILD @@ -1,36 +1,52 @@ -# $Id: PKGBUILD 85957 2010-07-22 20:05:06Z kevin $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 161356 2012-06-10 08:42:42Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> + pkgname=dnsutils + # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.7.1.P2 -_pkgver=9.7.1-P2 +pkgver=9.9.1.P1 +_pkgver=9.9.1-P1 pkgrel=1 -pkgdesc="Various DNS utilities - dig host nslookup nsupdate" -arch=(i686 x86_64) -url="https://www.isc.org/software/bind" + +pkgdesc='DNS utilities: dig host nslookup' +url='http://www.isc.org/software/bind/' license=('custom:ISC') -depends=('openssl') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'remove-bind.patch') +sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' + 'b465ef6160b004838f04de9978fe1be8422af777') + replaces=('bind-tools' 'host') -options=('makeflags') -source=(http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz - bind.so_bsdcompat.diff tools-only.patch) -md5sums=('bd6be63cc910d04da39103d441871596' - '447d58721cfee0e1e377b46f7d50b327' - 'be0558f70ed81d90e68e6b6003ba12ed') build() { - cd "${srcdir}/bind-${_pkgver}" - patch -Np0 -i "${srcdir}/bind.so_bsdcompat.diff" || return 1 - patch -Np1 -i "${srcdir}/tools-only.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-openssl=yes --disable-linux-caps --without-libxml2 || return 1 - make || return 1 + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-bind.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + # hack to remove unused bloat from the binaries + CFLAGS+=' -fdata-sections -ffunction-sections' + LDFLAGS+=' -Wl,--gc-sections' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-idn \ + + make } package() { - cd "${srcdir}/bind-${_pkgver}/bin" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + cd "${srcdir}/bind-${_pkgver}" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd bin; make DESTDIR="${pkgdir}" install } diff --git a/abs/core/dnsutils/bind.so_bsdcompat.diff b/abs/core/dnsutils/bind.so_bsdcompat.diff deleted file mode 100644 index 5d78031..0000000 --- a/abs/core/dnsutils/bind.so_bsdcompat.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600 -+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600 -@@ -245,6 +245,8 @@ - - #define SOCK_DEAD(s) ((s)->references == 0) - -+#undef SO_BSDCOMPAT -+ - static void - manager_log(isc_socketmgr_t *sockmgr, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/abs/core/dnsutils/remove-bind.patch b/abs/core/dnsutils/remove-bind.patch new file mode 100644 index 0000000..19d6509 --- /dev/null +++ b/abs/core/dnsutils/remove-bind.patch @@ -0,0 +1,25 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig + TARGETS = + + @BIND9_MAKE_RULES@ +diff -aur old/lib/Makefile.in new/lib/Makefile.in +--- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 ++++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/abs/core/dnsutils/tools-only.patch b/abs/core/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f..0000000 --- a/abs/core/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/abs/core/dosfstools/PKGBUILD b/abs/core/dosfstools/PKGBUILD index e84eca6..a2555b3 100644 --- a/abs/core/dosfstools/PKGBUILD +++ b/abs/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90820 2010-09-16 19:53:41Z tpowa $ +# $Id: PKGBUILD 143546 2011-11-26 09:49:37Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.10 +pkgver=3.0.12 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -14,6 +14,10 @@ license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver make +} + +package () { + cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('be73c6077cc5f784f0bb4d3901c88792') +md5sums=('5c7c2adac9eae4afbe1f16443142b566') diff --git a/abs/core/dosfstools/linux-2.6.patch b/abs/core/dosfstools/linux-2.6.patch deleted file mode 100644 index e21e94c..0000000 --- a/abs/core/dosfstools/linux-2.6.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur dosfstools-2.10/dosfsck/boot.c dosfstools-2.10-fixed/dosfsck/boot.c ---- dosfstools-2.10/dosfsck/boot.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/boot.c 2004-02-11 21:15:48.000000000 +0100 -@@ -14,6 +14,9 @@ - #include "io.h" - #include "boot.h" - -+#ifndef MSDOS_FAT12 -+# define MSDOS_FAT12 4084 /* taken from 2.4 linux/msdos_fs.h */ -+#endif - - #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) - /* don't divide by zero */ -diff -Nur dosfstools-2.10/dosfsck/common.h dosfstools-2.10-fixed/dosfsck/common.h ---- dosfstools-2.10/dosfsck/common.h 1998-04-28 13:14:25.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/common.h 2004-02-11 21:15:01.000000000 +0100 -@@ -6,6 +6,9 @@ - #ifndef _COMMON_H - #define _COMMON_H - -+#include <asm/types.h> -+#include <asm/byteorder.h> -+ - void die(char *msg,...) __attribute((noreturn)); - - /* Displays a prinf-style message and terminates the program. */ -diff -Nur dosfstools-2.10/dosfsck/file.c dosfstools-2.10-fixed/dosfsck/file.c ---- dosfstools-2.10/dosfsck/file.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/file.c 2004-02-11 21:13:53.000000000 +0100 -@@ -15,9 +15,9 @@ - #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ - #define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h>*/ - #define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */ -+#include "common.h" - #include <linux/msdos_fs.h> - --#include "common.h" - #include "file.h" - - -diff -Nur dosfstools-2.10/dosfsck/io.c dosfstools-2.10-fixed/dosfsck/io.c ---- dosfstools-2.10/dosfsck/io.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/io.c 2004-02-11 21:14:24.000000000 +0100 -@@ -21,8 +21,8 @@ - #include <fcntl.h> - #include <linux/fd.h> - --#include "dosfsck.h" - #include "common.h" -+#include "dosfsck.h" - #include "io.h" - - -diff -Nur dosfstools-2.10/mkdosfs/mkdosfs.c dosfstools-2.10-fixed/mkdosfs/mkdosfs.c ---- dosfstools-2.10/mkdosfs/mkdosfs.c 2003-06-14 22:07:08.000000000 +0200 -+++ dosfstools-2.10-fixed/mkdosfs/mkdosfs.c 2004-02-11 21:13:09.000000000 +0100 -@@ -62,6 +62,7 @@ - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <asm/types.h> - #include <unistd.h> - #include <time.h> - #include <errno.h> diff --git a/abs/core/dri2proto/PKGBUILD b/abs/core/dri2proto/PKGBUILD index d05b73f..0657dda 100644 --- a/abs/core/dri2proto/PKGBUILD +++ b/abs/core/dri2proto/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dri2proto -pkgver=2.3 +pkgver=2.6 pkgrel=1 pkgdesc="X11 DRI protocol" arch=(any) @@ -10,14 +10,17 @@ license=('custom') url="http://xorg.freedesktop.org/" makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('6c9e2c822e777db435a43616067f8dd21cc00a53') +sha1sums=('ba65fc53376fd6e6b41bf6ef1e2ea1ba4b12ca96') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/dvdauthor/PKGBUILD b/abs/core/dvdauthor/PKGBUILD index 967c9e2..6eda716 100644 --- a/abs/core/dvdauthor/PKGBUILD +++ b/abs/core/dvdauthor/PKGBUILD @@ -1,28 +1,35 @@ -# $Id: PKGBUILD 87461 2010-08-13 20:20:49Z giovanni $ +# $Id: PKGBUILD 148702 2012-02-05 11:47:33Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> # Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> pkgname=dvdauthor -pkgver=0.6.18 -pkgrel=2 +pkgver=0.7.0 +pkgrel=4 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" license=('GPL') depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('ded5373800ac6448ff044606f5047550') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'dvdauthor-0.7.0-libpng15.patch') +md5sums=('33a447fb98ab3293ac40f869eedc17ff' + '9ea90bbea6adb0469c8c1b2f7d033f11') build() { cd "${srcdir}/${pkgname}" - ./configure --prefix=/usr || return 1 - make || return 1 + + patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make } + package() { cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install || return 1 -} + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/abs/core/dvdauthor/dvdauthor-0.7.0-libpng15.patch new file mode 100644 index 0000000..2bb6363 --- /dev/null +++ b/abs/core/dvdauthor/dvdauthor-0.7.0-libpng15.patch @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/abs/core/e2fsprogs/Makefile-fsck.static.patch b/abs/core/e2fsprogs/Makefile-fsck.static.patch deleted file mode 100644 index a006443..0000000 --- a/abs/core/e2fsprogs/Makefile-fsck.static.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- e2fsprogs-1.40.4/misc/Makefile 2008-01-16 14:52:53.000000000 +0000 -+++ e2fsprogs-1.40.4/misc/Makefile.neu 2008-01-16 14:53:43.000000000 +0000 -@@ -376,6 +376,10 @@ - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) - -+fsck.static: $(FSCK_OBJS) $(DEPSTATIC_LIBBLKID) -+ @echo " LD $@" -+ @$(CC) $(ALL_LDFLAGS) -static -o fsck.static $(FSCK_OBJS) $(STATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(LIBINTL) -+ - badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) diff --git a/abs/core/e2fsprogs/PKGBUILD b/abs/core/e2fsprogs/PKGBUILD index 730522b..96afe85 100644 --- a/abs/core/e2fsprogs/PKGBUILD +++ b/abs/core/e2fsprogs/PKGBUILD @@ -1,46 +1,48 @@ -# $Id: PKGBUILD 80571 2010-05-19 18:38:36Z ronald $ +# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.41.12 +pkgver=1.42.4 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') url="http://e2fsprogs.sourceforge.net" groups=('base') -depends=('sh' 'util-linux-ng') +depends=('sh' 'util-linux') makedepends=('bc') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f' +sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { cd "${srcdir}/${pkgname}-${pkgver}" # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1 + sed -i '/init\.d/s|^|#|' misc/Makefile.in - ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \ - --disable-fsck --disable-uuidd \ - --disable-libuuid --disable-libblkid || return 1 + ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ + --enable-elf-shlibs --disable-fsck --disable-uuidd \ + --disable-libuuid --disable-libblkid - - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-libs || return 1 + make DESTDIR="${pkgdir}" install install-libs - sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1 + sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" + + # remove references to build directory + sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" + sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1 - + "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" } diff --git a/abs/core/e2fsprogs/e2fsprogs.install b/abs/core/e2fsprogs/e2fsprogs.install index f91d39f..1a7fe20 100644 --- a/abs/core/e2fsprogs/e2fsprogs.install +++ b/abs/core/e2fsprogs/e2fsprogs.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(libext2fs.info.gz) post_install() { diff --git a/abs/core/ed/PKGBUILD b/abs/core/ed/PKGBUILD index 6b152aa..dac07e3 100644 --- a/abs/core/ed/PKGBUILD +++ b/abs/core/ed/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 90096 2010-09-07 19:14:19Z andyrtr $ +# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed -pkgver=1.5 +pkgver=1.6 pkgrel=1 -pkgdesc="A POSIX-compliant line editor" +pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" -install=ed.install depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) -md5sums=('e66c03d7e4c67b025d5b6093ec678267') +md5sums=('9a78593decccaa889523aa4bb555ed4b') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 + cd "$pkgname-$pkgver" + + ./configure --prefix=/ \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + "CFLAGS=$CFLAGS" \ + "LDFLAGS=$LDFLAGS" + + make +} + +check() { + make -C "$pkgname-$pkgver" check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install - cd ${pkgdir}/usr/share/info - ln ed.info red.info + # nuke info pages + rm -r "$pkgdir/usr/share/info" } diff --git a/abs/core/eject/PKGBUILD b/abs/core/eject/PKGBUILD index b2ba852..7cd036c 100644 --- a/abs/core/eject/PKGBUILD +++ b/abs/core/eject/PKGBUILD @@ -4,12 +4,11 @@ pkgname=eject pkgver=2.1.5 -pkgrel=3 +pkgrel=1 pkgdesc="Eject is a program for ejecting removable media under software control" arch=(i686 x86_64) -source=(http://www.pobox.com/~tranter/$pkgname-$pkgver.tar.gz eject-2.1.5-handle-spaces.patch) +source=(http://www.paldo.org/paldo/sources/eject/$pkgname-$pkgver.tar.bz2 eject-2.1.5-handle-spaces.patch) url="http://ca.geocities.com/jefftranter@rogers.com/eject.html" -md5sums=('b96a6d4263122f1711db12701d79f738' '595b97c3bd56fd41e3b01b07885f81dc') build() { cd $startdir/src/$pkgname @@ -18,3 +17,5 @@ build() { make || return 1 make DESTDIR=$startdir/pkg install } +md5sums=('5a6cab2184ae4ed21128054d931d558f' + '595b97c3bd56fd41e3b01b07885f81dc') diff --git a/abs/core/eject/__changelog b/abs/core/eject/__changelog new file mode 100644 index 0000000..754fe1c --- /dev/null +++ b/abs/core/eject/__changelog @@ -0,0 +1,2 @@ +changed url to http://www.ibiblio.org/pub/Linux/utils/disk-management/eject-2.1.0.tar.gz + diff --git a/abs/core/esound/PKGBUILD b/abs/core/esound/PKGBUILD deleted file mode 100644 index b157aab..0000000 --- a/abs/core/esound/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 19662 2008-11-28 20:35:54Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=esound -pkgver=0.2.41 -pkgrel=1 -pkgdesc="Enlightened Sound Daemon" -arch=(i686 x86_64) -license=('LGPL') -depends=('audiofile' 'tcp_wrappers' 'alsa-lib>=1.0.18') -url="http://www.tux.org/~ricdude/EsounD.html" -provides=("esd=${pkgver}") -replaces=('esd') -conflicts=('esd') -backup=('etc/esd.conf') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - esd-0.2.38-alsa-drain.patch - esd) -md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' - '3de93efcd1bc196a3585e6aef50eac48' - 'a4c76e7c7f75b201ea7ab6fb15b47472') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-audiofile --with-libwrap \ - --enable-alsa --disable-artstest || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" || return 1 -} diff --git a/abs/core/esound/esd b/abs/core/esound/esd deleted file mode 100755 index d90ef55..0000000 --- a/abs/core/esound/esd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/esd` -case "$1" in - start) - stat_busy "Starting Esound Daemon" - if [ -z "$PID" ]; then - /usr/bin/esd -nobeeps & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon esd - stat_done - fi - ;; - stop) - stat_busy "Stopping Esound Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core/esound/esd-0.2.38-alsa-drain.patch b/abs/core/esound/esd-0.2.38-alsa-drain.patch deleted file mode 100644 index f2fb716..0000000 --- a/abs/core/esound/esd-0.2.38-alsa-drain.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- esound-0.2.38/audio_alsa09.c.old 2007-06-11 12:22:24.000000000 +0200 -+++ esound-0.2.38/audio_alsa09.c 2007-06-11 12:22:49.000000000 +0200 -@@ -486,7 +486,7 @@ void esd_audio_flush(void) - } - - if (alsa_playback_handle != NULL) -- snd_pcm_drain( alsa_playback_handle ); -+ snd_pcm_drop( alsa_playback_handle ); - - if (alsadbg) - print_state(); diff --git a/abs/core/etcnet/PKGBUILD b/abs/core/etcnet/PKGBUILD index 50e604c..3154aba 100755 --- a/abs/core/etcnet/PKGBUILD +++ b/abs/core/etcnet/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=2 pkgdesc="/etc/net network configuration subsystem" url="http://etcnet.org/" depends=('bash' 'grep' 'sed' 'iproute2' 'wireless_tools' 'iptables' 'dhcpcd') -arch=i686 +arch=('i686' 'x86_64') install=etcnet.install #source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) source=($pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) diff --git a/abs/core/eventlog/ChangeLog b/abs/core/eventlog/ChangeLog index f2f386d..1c139bd 100644 --- a/abs/core/eventlog/ChangeLog +++ b/abs/core/eventlog/ChangeLog @@ -1,3 +1,12 @@ +2011-11-02 Andrea Scarpino <andrea@archlinux.org> + + * Sign package + +2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> + + * Rebuild of old package + * Tidy up PKGBUILD + 2010-07-10 Dan McGee <dan@archlinux.org> * Updated PKGBUILD to be in line with standard style diff --git a/abs/core/eventlog/PKGBUILD b/abs/core/eventlog/PKGBUILD index 36f657b..80ec8b0 100644 --- a/abs/core/eventlog/PKGBUILD +++ b/abs/core/eventlog/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 85218 2010-07-10 21:39:54Z dan $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 142815 2011-11-15 17:24:10Z andrea $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=eventlog pkgver=0.2.12 -pkgrel=1 -pkgdesc="A new API to format and send structured log messages" +pkgrel=3 +pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64') url="http://www.balabit.com/support/community/products/" license=('BSD') depends=('glibc') options=('!libtool') changelog=ChangeLog -source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) -md5sums=('3d6ebda8a161d36cb40d09328f78786b') +source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz") sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/expat/CVE-2009-3560.patch b/abs/core/expat/CVE-2009-3560.patch deleted file mode 100644 index 5fe9c36..0000000 --- a/abs/core/expat/CVE-2009-3560.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c ---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 -+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/abs/core/expat/CVE-2009-3720.patch b/abs/core/expat/CVE-2009-3720.patch deleted file mode 100644 index 65d1643..0000000 --- a/abs/core/expat/CVE-2009-3720.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c ---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 -+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/abs/core/expat/PKGBUILD b/abs/core/expat/PKGBUILD index e2f1038..73688e0 100644 --- a/abs/core/expat/PKGBUILD +++ b/abs/core/expat/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 62836 2010-01-12 23:27:10Z allan $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=expat -pkgver=2.0.1 -pkgrel=5 -pkgdesc="An XML Parser library written in C" +pkgver=2.1.0 +pkgrel=1 +pkgdesc="An XML parser library" arch=('i686' 'x86_64') url="http://expat.sourceforge.net/" license=('custom') depends=('glibc') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz - CVE-2009-3560.patch - CVE-2009-3720.patch) -md5sums=('ee8b492592568805593f81f8cdf2a04c' - '50603cac0f03aabc7087415251f592be' - 'f3eeb796f28945899216b815e5901996') +source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz) +md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/CVE-2009-3560.patch - patch -Np1 -i $srcdir/CVE-2009-3720.patch - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/abs/core/expect/ChangeLog b/abs/core/expect/ChangeLog index 3e1246f..f0432ba 100644 --- a/abs/core/expect/ChangeLog +++ b/abs/core/expect/ChangeLog @@ -1,7 +1,16 @@ +2011-01-01 Allan McRae <allan@archlinux.org> + + * expect 5.45-2 + - Package signing rebuild + +2011-01-01 kevin <kevin@archlinux.org> + + * expect 5.45-1 + - Added upgrade message about expectk being removed + - Have expect conflict with expectk 2010-03-27 kevin <kevin@archlinux.org> * expect 5.44.1.15-1 - Source on sourceforge now and maintained mostly by ActiveState - Added symlink to fix FS#18686 - libexpect.so is not found - diff --git a/abs/core/expect/PKGBUILD b/abs/core/expect/PKGBUILD index d219fbc..140b4a4 100644 --- a/abs/core/expect/PKGBUILD +++ b/abs/core/expect/PKGBUILD @@ -1,52 +1,42 @@ -# $Id: PKGBUILD 73840 2010-03-28 22:17:41Z kevin $ +# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $ # Maintainer: kevin <kevin@archlinux.org> pkgname=expect -pkgver=5.44.1.15 -pkgrel=1 +pkgver=5.45 +pkgrel=2 pkgdesc="A tool for automating interactive applications" -arch=(i686 x86_64) -url="http://expect.nist.gov/" +arch=('i686' 'x86_64') +url="http://www.nist.gov/el/msid/expect.cfm" +license=('custom') depends=('tcl>=8.5.3') -makedepends=('tk>=8.5.3') -source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect-${pkgver}.tar.bz2) +conflicts=('expectk') +install=expect.install +changelog=ChangeLog +source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect${pkgver}.tar.gz) # CVS checkout on gerolde. #source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2) # old nist source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2) -license=('custom') -md5sums=('9307bbf67e19125036ce34544a78dadf') +md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b') build() { - # stuff to remove. - BIN="expectk multixterm tknewsbiff tkpasswd xkibitz xpstat" - MAN="multixterm tknewsbiff xkibitz" - - cd ${srcdir}/expect-${pkgver} + cd ${srcdir}/expect${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include --with-tk=/usr/lib \ - --with-tkinclude=/usr/include \ + --with-tclinclude=/usr/include # Keep $startdir/pkg out of library search paths. sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile - make || return 1 + make } + package() { - cd ${srcdir}/expect-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd ${srcdir}/expect${pkgver} + make DESTDIR=${pkgdir} install # license. install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README (cd ${pkgdir}/usr/lib; - ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so) - - # Remove X related stuff. - for i in ${BIN}; do - rm -f ${pkgdir}/usr/bin/${i} - done - for i in ${MAN}; do - rm -f ${pkgdir}/usr/share/man/man1/${i}.1 - done + ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so) } diff --git a/abs/core/expect/expect.install b/abs/core/expect/expect.install new file mode 100644 index 0000000..2847848 --- /dev/null +++ b/abs/core/expect/expect.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "`vercmp $2 5.45`" -lt 0 ]; then + echo " - expectk has been removed. Use tclsh instead" + fi +} diff --git a/abs/core/faac/PKGBUILD b/abs/core/faac/PKGBUILD index 7b6b3a7..e56599e 100644 --- a/abs/core/faac/PKGBUILD +++ b/abs/core/faac/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 71335 2010-03-06 18:43:34Z andrea $ -# Maintainer: Hugo Doria <hugo@archlinux.org> +# $Id: PKGBUILD 159954 2012-05-27 10:22:19Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=faac pkgver=1.28 -pkgrel=2 -pkgdesc="FAAC is an AAC audio encoder" +pkgrel=4 +pkgdesc="An AAC audio encoder" arch=('i686' 'x86_64') url="http://www.audiocoding.com/" license=('GPL' 'custom') -depends=('libmp4v2>=1.9.1' 'glibc') -makedepends=('automake' 'autoconf' 'libtool') +depends=('libmp4v2' 'glibc') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'mp4v2-1.9.patch') -md5sums=('80763728d392c7d789cde25614c878f6' - '9d52a17e68fa15ca94e88e1457b94b74') + 'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/mp4v2-1.9.patch || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i ../mp4v2-1.9.patch + patch -p0 -i ../mp4v2-2.0.0.patch + patch -p0 -i ../altivec.patch find . -type f -print0 | xargs -0 sed -i 's/\r//g' ./bootstrap - ./configure --prefix=/usr --with-mp4v2 - make || return 1 + ./configure --prefix=/usr + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \ - ${pkgdir}/usr/share/licenses/faac/LICENSE + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \ + "${pkgdir}"/usr/share/licenses/faac/LICENSE } +md5sums=('80763728d392c7d789cde25614c878f6' + 'e1ee422ab524fb1f78d178700c3a0e7f' + '9d52a17e68fa15ca94e88e1457b94b74' + '979ff4f13f36217cb15c92df9fd75f0c') diff --git a/abs/core/faac/__changelog b/abs/core/faac/__changelog deleted file mode 100644 index b91559b..0000000 --- a/abs/core/faac/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -change depends to libmp4v2>=1.9.1 as an earlier version (1.6) caused faac build to error. - diff --git a/abs/core/faac/altivec.patch b/abs/core/faac/altivec.patch new file mode 100644 index 0000000..ae461ef --- /dev/null +++ b/abs/core/faac/altivec.patch @@ -0,0 +1,40 @@ +http://bugs.gentoo.org/306881 + +--- configure.in ++++ configure.in +@@ -33,7 +33,12 @@ + AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], + AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), +- external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) ++ external_mp4v2=no, [ ++ #if defined(__ALTIVEC__) ++ #undef bool ++ #endif ++ #include <mp4v2/mp4v2.h> ++ ]) + + if test x$external_mp4v2 = xyes; then + AC_MSG_NOTICE([*** Building with external mp4v2 ***]) +--- frontend/main.c ++++ frontend/main.c +@@ -30,6 +30,9 @@ + #endif + + #ifdef HAVE_LIBMP4V2 ++#if defined(__ALTIVEC__) ++# undef bool ++#endif + # include <mp4v2/mp4v2.h> + #endif + +--- common/mp4v2/mpeg4ip.h ++++ common/mp4v2/mpeg4ip.h +@@ -123,7 +123,6 @@ + #ifdef __cplusplus + extern "C" { + #endif +-char *strcasestr(const char *haystack, const char *needle); + #ifdef __cplusplus + } + #endif diff --git a/abs/core/faac/mp4v2-2.0.0.patch b/abs/core/faac/mp4v2-2.0.0.patch new file mode 100644 index 0000000..f4ac8e6 --- /dev/null +++ b/abs/core/faac/mp4v2-2.0.0.patch @@ -0,0 +1,138 @@ +http://bugs.gentoo.org/397575 +http://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704 + +--- configure.in ++++ configure.in +@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long) + AM_CONDITIONAL(WITH_MP4V2, false) + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) + +-AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], +- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, ++AC_CHECK_DECLS([MP4Create], ++ AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), + external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) + +@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then + AC_MSG_NOTICE([*** Building with external mp4v2 ***]) + MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2) + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) ++ AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>]) + else + if test x$WITHMP4V2 = xyes; then + AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) +--- frontend/main.c ++++ frontend/main.c +@@ -873,8 +873,12 @@ int main(int argc, char *argv[]) + if (!faacEncSetConfiguration(hEncoder, myFormat)) { + fprintf(stderr, "Unsupported output format!\n"); + #ifdef HAVE_LIBMP4V2 ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0); ++#else + if (container == MP4_CONTAINER) MP4Close(MP4hFile); + #endif ++#endif + return 1; + } + +@@ -885,12 +889,10 @@ int main(int argc, char *argv[]) + unsigned long ASCLength = 0; + char *version_string; + +-#ifdef MP4_CREATE_EXTENSIBLE_FORMAT +- /* hack to compile against libmp4v2 >= 1.0RC3 +- * why is there no version identifier in mp4.h? */ ++#ifdef MP4_DETAILS_ERROR /* r453 fix */ + MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0); + #else +- MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0); ++ MP4hFile = MP4Create(aacFileName, 0); + #endif + if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) { + fprintf(stderr, "Couldn't create output file %s\n", aacFileName); +@@ -905,12 +907,22 @@ int main(int argc, char *argv[]) + free(ASC); + + /* set metadata */ ++#if HAVE_DECL_MP4TAGSALLOC ++ const MP4Tags* tags; ++ tags = MP4TagsAlloc(); ++ MP4TagsFetch( tags, MP4hFile ); ++#endif + version_string = malloc(strlen(faac_id_string) + 6); + strcpy(version_string, "FAAC "); + strcpy(version_string + 5, faac_id_string); ++#if !HAVE_DECL_MP4TAGSALLOC + MP4SetMetadataTool(MP4hFile, version_string); ++#else ++ MP4TagsSetEncodingTool(tags, version_string); ++#endif + free(version_string); + ++#if !HAVE_DECL_MP4TAGSALLOC + if (artist) MP4SetMetadataArtist(MP4hFile, artist); + if (writer) MP4SetMetadataWriter(MP4hFile, writer); + if (title) MP4SetMetadataName(MP4hFile, title); +@@ -923,8 +935,40 @@ int main(int argc, char *argv[]) + if (comment) MP4SetMetadataComment(MP4hFile, comment); + if (artSize) { + MP4SetMetadataCoverArt(MP4hFile, art, artSize); ++#else ++ if (artist) MP4TagsSetArtist(tags, artist); ++ if (writer) MP4TagsSetComposer(tags, writer); ++ if (title) MP4TagsSetName(tags, title); ++ if (album) MP4TagsSetAlbum(tags, album); ++ if (trackno > 0) { ++ MP4TagTrack tt; ++ tt.index = trackno; ++ tt.total = ntracks; ++ MP4TagsSetTrack(tags, &tt); ++ } ++ if (discno > 0) { ++ MP4TagDisk td; ++ td.index = discno; ++ td.total = ndiscs; ++ MP4TagsSetDisk(tags, &td); ++ } ++ if (compilation) MP4TagsSetCompilation(tags, compilation); ++ if (year) MP4TagsSetReleaseDate(tags, year); ++ if (genre) MP4TagsSetGenre(tags, genre); ++ if (comment) MP4TagsSetComments(tags, comment); ++ if (artSize) { ++ MP4TagArtwork mp4art; ++ mp4art.data = art; ++ mp4art.size = artSize; ++ mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2 ++ MP4TagsAddArtwork( tags, &mp4art ); ++#endif + free(art); + } ++#if HAVE_DECL_MP4TAGSALLOC ++ MP4TagsStore( tags, MP4hFile ); ++ MP4TagsFree( tags ); ++#endif + } + else + { +@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[]) + /* clean up */ + if (container == MP4_CONTAINER) + { ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ MP4Close(MP4hFile, 0); ++#else + MP4Close(MP4hFile); ++#endif + if (optimizeFlag == 1) + { + fprintf(stderr, "\n\nMP4 format optimization... "); ++#ifdef MP4_DETAILS_ERROR /* r453 fix */ + MP4Optimize(aacFileName, NULL, 0); ++#else ++ MP4Optimize(aacFileName, NULL); ++#endif + fprintf(stderr, "Done!"); + } + } else diff --git a/abs/core/faad2/ChangeLog b/abs/core/faad2/ChangeLog deleted file mode 100644 index ed5548b..0000000 --- a/abs/core/faad2/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2009-02-16 Eric Belanger <eric@archlinux.org> - - * faad2 2.7-1 - * Upstream update - * Updated LICENSE file - * Compiled with -fPIC option - -2009-01-05 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-2 - * Applied security patch - -2008-07-19 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-1 - * Upstream update - * Patched to fix libtool build problem : - faad2-2.6.1-libtool22.patch - * Patched to make faad2 exit if output pipe breaks : - faad2-2.6.1-broken-pipe.patch - * Patched to fix include file implicit declaration : - faad2-2.6.1-implicitdeclar.patch - * Patched to bump soname (symbols have been changed) : - faad2-2.6.1-abi_has_changed.patch - * Updated license - * Added ChangeLog diff --git a/abs/core/faad2/PKGBUILD b/abs/core/faad2/PKGBUILD index 729d69b..46a388a 100644 --- a/abs/core/faad2/PKGBUILD +++ b/abs/core/faad2/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 27494 2009-02-22 04:26:47Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> +# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=faad2 pkgver=2.7 -pkgrel=1 +pkgrel=3 pkgdesc="ISO AAC audio decoder" arch=('i686' 'x86_64') url="http://www.audiocoding.com/" @@ -12,15 +11,19 @@ license=('custom:GPL') depends=('glibc') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0') -sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') +sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' + '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make CFLAGS="${CFLAGS} -fPIC" || return 1 - make DESTDIR=${pkgdir} manmdir=/usr/share/man/man1 install || return 1 - install -m644 common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/mp4ff_int_types.h || return 1 - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - mv ${pkgdir}/usr/share/man/man1/faad.man ${pkgdir}/usr/share/man/man1/faad.1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make CFLAGS="${CFLAGS} -fPIC" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install + mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1" + install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch b/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch deleted file mode 100644 index 7206e38..0000000 --- a/abs/core/faad2/faad2-2.6.1-abi_has_changed.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: faad2/libfaad/Makefile.am -=================================================================== ---- faad2.orig/libfaad/Makefile.am -+++ faad2/libfaad/Makefile.am -@@ -3,7 +3,8 @@ lib_LTLIBRARIES = libfaad.la - include_HEADERS = $(top_srcdir)/include/faad.h \ - $(top_srcdir)/include/neaacdec.h - --libfaad_la_LDFLAGS = -lm -+libfaad_la_LDFLAGS = -version-info 1:0:0 -+libfaad_la_LIBADD = -lm - - libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ - drm_dec.c error.c filtbank.c \ diff --git a/abs/core/faad2/faad2-2.6.1-broken-pipe.patch b/abs/core/faad2/faad2-2.6.1-broken-pipe.patch deleted file mode 100644 index 428d7dd..0000000 --- a/abs/core/faad2/faad2-2.6.1-broken-pipe.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- faad2/frontend/main.c~ 2007-11-01 06:33:29.000000000 -0600 -+++ faad2/frontend/main.c 2008-01-03 18:05:10.000000000 -0700 -@@ -640,7 +640,8 @@ - - if ((frameInfo.error == 0) && (frameInfo.samples > 0) && (!adts_out)) - { -- write_audio_file(aufile, sample_buffer, frameInfo.samples, 0); -+ if (write_audio_file(aufile, sample_buffer, frameInfo.samples, 0) == 0) -+ break; - } - - /* fill buffer */ -@@ -976,7 +977,8 @@ - - if ((frameInfo.error == 0) && (sample_count > 0) && (!adts_out)) - { -- write_audio_file(aufile, sample_buffer, sample_count, delay); -+ if (write_audio_file(aufile, sample_buffer, sample_count, delay) == 0) -+ break; - } - - if (frameInfo.error > 0) diff --git a/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch b/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch deleted file mode 100644 index 9379329..0000000 --- a/abs/core/faad2/faad2-2.6.1-implicitdeclar.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur faad2-orig/frontend/main.c faad2/frontend/main.c ---- faad2-orig/frontend/main.c 2007-11-01 08:33:29.000000000 -0400 -+++ faad2/frontend/main.c 2008-06-21 19:33:08.000000000 -0400 -@@ -41,6 +41,7 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <getopt.h> -+#include <string.h> - - #include <neaacdec.h> - #include <mp4ff.h> diff --git a/abs/core/faad2/faad2-2.6.1-libtool22.patch b/abs/core/faad2/faad2-2.6.1-libtool22.patch deleted file mode 100644 index 4eab084..0000000 --- a/abs/core/faad2/faad2-2.6.1-libtool22.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: faad2/configure.in -=================================================================== ---- faad2.orig/configure.in -+++ faad2/configure.in -@@ -18,7 +18,7 @@ dnl Checks for programs. - AC_PROG_CC - AC_PROG_CPP - dnl disable for mpeg4ip plugin --dnl AC_PROG_CXX -+AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET diff --git a/abs/core/fakeroot/PKGBUILD b/abs/core/fakeroot/PKGBUILD new file mode 100644 index 0000000..292e30d --- /dev/null +++ b/abs/core/fakeroot/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jochem Kossen <j.kossen@home.nl> + +pkgname=fakeroot +pkgver=1.18.4 +pkgrel=1 +pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" +arch=('i686' 'x86_64') +license=('GPL') +url="http://packages.debian.org/fakeroot" +groups=('base-devel') +install=fakeroot.install +depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') +options=('!libtool') +source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) +md5sums=('706171d8d520b1ca1576ac73f2ceb4f3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ + --disable-static --with-ipc=sysv + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/etc/ld.so.conf.d/ + echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf + + # install README for sysv/tcp usage + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README +} diff --git a/abs/core/fakeroot/fakeroot.install b/abs/core/fakeroot/fakeroot.install new file mode 100644 index 0000000..986c91b --- /dev/null +++ b/abs/core/fakeroot/fakeroot.install @@ -0,0 +1,14 @@ +post_install() { + sbin/ldconfig -r . +} + +post_upgrade() { + if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then + sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf + fi + sbin/ldconfig -r . +} + +pre_remove() { + sbin/ldconfig -r . +} diff --git a/abs/core/ffmpeg-svn/PKGBUILD b/abs/core/ffmpeg-svn/PKGBUILD deleted file mode 100644 index 6d3a132..0000000 --- a/abs/core/ffmpeg-svn/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 98250 2010-11-05 15:59:39Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=ffmpeg-svn -pkgver=26402 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libtheora' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva>=1.0.4' 'openjpeg' 'rtmpdump') -makedepends=('yasm' 'subversion') -#epoch=1 -provides=("ffmpeg=`date +%Y%m%d`") -conflicts=('ffmpeg') - -_svntrunk=svn://svn.ffmpeg.org/ffmpeg/trunk -_svnmod=ffmpeg - -build() { - cd "${srcdir}" - - if [ -d ${_svnmod}/.svn ]; then - (cd ${_svnmod} && svn up -r ${pkgver}) - else - svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod} && cd ${_svnmod} - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_svnmod}/{$_svnmod}-build" - mkdir -p "${srcdir}/${_svnmod}/${_svnmod}-build" - cd "${srcdir}/${_svnmod}/${_svnmod}-build" - - "${srcdir}/${_svnmod}/configure" \ - --prefix=/usr \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libfaac \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-postproc \ - --enable-shared \ - --enable-pthreads \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-version3 \ - --enable-nonfree \ - --enable-runtime-cpudetect \ - --disable-debug # libfaac is nonfree - - make || return 1 - make doc/ff{mpeg,play,server}.1 || return 1 -} - -package() { - cd "${srcdir}/${_svnmod}/${_svnmod}-build" - make DESTDIR="${pkgdir}" install || return 1 - make DESTDIR="${pkgdir}" install-man || return 1 -} - -# vim:set ts=2 sw=2 et: -md5sums=() diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD new file mode 100644 index 0000000..e3062b4 --- /dev/null +++ b/abs/core/ffmpeg/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg +pkgver=0.11.1 +pkgrel=1 +epoch=1 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=(alsa-lib bzip2 gsm lame libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) +makedepends=('yasm' 'git' 'libvdpau') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('ff8cb914f657e164dd60ea1008b555a8') + +build() { + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --disable-libpulse \ + --enable-libv4l2 \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/ffmpeg/__changelog b/abs/core/ffmpeg/__changelog new file mode 100644 index 0000000..1672732 --- /dev/null +++ b/abs/core/ffmpeg/__changelog @@ -0,0 +1 @@ +no pulse diff --git a/abs/core/file/PKGBUILD b/abs/core/file/PKGBUILD index a7cc7ee..f182038 100644 --- a/abs/core/file/PKGBUILD +++ b/abs/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65356 2010-01-28 04:43:43Z allan $ +# $Id: PKGBUILD 150976 2012-02-24 12:10:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.04 -pkgrel=2 +pkgver=5.11 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -12,17 +12,20 @@ groups=('base') url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') -source=(ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('accade81ff1cc774904b47c72c8aeea0') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('16a407bd66d6c7a832f3a5c0d609c27b') build() { - cd ${srcdir}/$pkgname-$pkgver - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + ./configure --prefix=/usr --datadir=/usr/share/file - make || return 1 + make } + package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install install -dm755 ${pkgdir}/usr/share/misc ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD index 01b8a0d..0098c1f 100644 --- a/abs/core/filesystem/PKGBUILD +++ b/abs/core/filesystem/PKGBUILD @@ -1,111 +1,96 @@ -# $Id: PKGBUILD 96685 2010-10-24 09:56:25Z pierre $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 163828 2012-07-20 23:48:47Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> pkgname=filesystem -pkgver=2010.10 +pkgver=2012.7 pkgrel=1 -pkgdesc="Base filesystem" +pkgdesc='Base filesystem' arch=('any') license=('GPL') -url="http://www.archlinux.org" +url='http://www.archlinux.org' groups=('base') -install=filesystem.install -# These dependencies are not needed for initial installation. -# They are only required on upgrade to create missing groups. -#depends=('sh' 'coreutils') -depends=('iana-etc') -backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd - etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf - etc/shells etc/host.conf etc/securetty etc/profile ) -source=(group nsswitch.conf securetty host.conf ld.so.conf - passwd shadow fstab crypttab hosts motd resolv.conf shells - gshadow profile modprobe.d.usb-load-ehci-first) -md5sums=('75c7e1770305e1f3b75c52785c137611' - '1bdc5dba66947d74866a5df8ce9ef3b1' - '13753e4e0964f3652b0cc60a28528bdf' - '933dee67c58d452334d342c294342910' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ef40305da5803ca69d22e428ffc2ab9b' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '81b3cb42a6ddabc2ed2310511ee9c859' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - '5340b9287b71ffe9d4d99510bffe933f' - 'ccc4e6292ae594f16b44c66c7769765c' - '8098ffd9fbf890468d3198277596b85a') - -build() -{ - cd ${pkgdir} - mkdir -p bin boot dev etc home lib media mnt proc root sbin tmp usr var opt srv sys - chmod 555 proc - mkdir -p usr/{bin,include,lib,sbin,share/misc,src} - - mkdir -p usr/share/man/man{1,2,3,4,5,6,7,8} - - # fhs compliance - mkdir -p usr/local/{bin,games,include,lib,man,sbin,share,src} - ln -s ../man ${pkgdir}/usr/local/share/man - mkdir -p var/{cache/man,local,lock,opt,run,spool/mail,tmp,games} - chmod 1777 var/lock - mkdir -p var/log/old - mkdir -p etc/{ld.so.conf.d,skel,profile.d} - mkdir -p lib/modules - mkdir -p var/lib/misc - (cd ${pkgdir}/var; ln -s spool/mail mail) +install='filesystem.install' +depends=('iana-etc' 'bash' 'coreutils') +backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' + 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') +source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' + 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') - # vsftpd won't run with write perms on /srv/ftp - mkdir -p srv/ftp - chown root.ftp srv/ftp - chmod 555 srv/ftp +package() { + cd ${pkgdir} - install -d -o root -g root -m 755 srv/http + # + # setup root filesystem + # + for d in boot dev etc home media mnt usr var opt srv/http run; do + install -d -m755 ${d} + done + install -d -m555 proc + install -d -m555 sys + install -d -m0750 root + install -d -m1777 tmp + # vsftpd won't run with write perms on /srv/ftp + install -d -m555 -g ftp srv/ftp - chmod 1777 var/spool/mail tmp var/tmp - chmod 0750 root + # setup /etc + install -d etc/{ld.so.conf.d,skel,profile.d} + for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do + install -m644 ${srcdir}/${f} etc/ + done + ln -s /proc/self/mounts etc/mtab + for f in gshadow shadow crypttab; do + install -m600 ${srcdir}/${f} etc/ + done + touch etc/arch-release + install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf - #Allow setgid games to write scores: - chmod 775 ${pkgdir}/var/games - chown root:50 ${pkgdir}/var/games + # setup /var + for d in cache/man local opt log/old lib/misc empty; do + install -d -m755 var/${d} + done + install -d -m1777 var/{tmp,spool/mail} + # allow setgid games to write scores + install -d -m775 -g games var/games + ln -s spool/mail var/mail + ln -s ../run var/run + ln -s ../run/lock var/lock - cd ${srcdir} - cp fstab crypttab group host.conf hosts ld.so.conf motd nsswitch.conf \ - passwd resolv.conf securetty shadow shells profile \ - ${pkgdir}/etc/ - install -m 600 ${srcdir}/gshadow ${pkgdir}/etc/gshadow - chmod 600 ${pkgdir}/etc/shadow - chmod 600 ${pkgdir}/etc/crypttab + # + # setup /usr hierarchy + # + for d in bin include lib sbin share/misc src; do + install -d -m755 usr/${d} + done + for d in $(seq 8); do + install -d -m755 usr/share/man/man${d} + done - # re-add /etc/arch-release, some software uses it - # to check whether arch is running - touch ${pkgdir}/etc/arch-release - - # Add /etc/modprobe.d/ - install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first \ - ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf - # Prevent pacman from removing directory (FS#16886) - mkdir ${pkgdir}/var/empty - touch ${pkgdir}/var/empty/.keep + # + # setup /usr/local hierarchy + # + for d in bin etc games include lib man sbin share src; do + install -d -m755 usr/local/${d} + done + ln -s ../man usr/local/share/man } -md5sums=('75c7e1770305e1f3b75c52785c137611' +md5sums=('45940618da782cc391c59f88ab3333c3' + 'b153cc716cd73e8ec17bc27fa127d052' '13753e4e0964f3652b0cc60a28528bdf' - 'f97799ef3d8990f2eda9166122d8d5aa' + '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' '8a9042a2cedf6b6b47eb8973f14289cb' 'b8355d9d2782f424f4cedcf682651be0' - 'ef40305da5803ca69d22e428ffc2ab9b' + 'ca716f853860199c1286e7939b2f2666' 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '81b3cb42a6ddabc2ed2310511ee9c859' + '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' + 'c1e795aa3bae70bf0fb76b8a720e4825' '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - '5340b9287b71ffe9d4d99510bffe933f' - 'ccc4e6292ae594f16b44c66c7769765c' - '8098ffd9fbf890468d3198277596b85a') + '22518e922891f9359f971f4f5b4e793c' + 'f95416882cef800edef08382a1176b7d' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130') diff --git a/abs/core/filesystem/__changelog b/abs/core/filesystem/__changelog index 87707ff..941c6ba 100644 --- a/abs/core/filesystem/__changelog +++ b/abs/core/filesystem/__changelog @@ -1,2 +1,2 @@ -removed /etc/issue added tty10 to securetty +os.system diff --git a/abs/core/filesystem/filesystem.install b/abs/core/filesystem/filesystem.install index e0ce1e2..c8717f0 100644 --- a/abs/core/filesystem/filesystem.install +++ b/abs/core/filesystem/filesystem.install @@ -1,74 +1,60 @@ -# arg 1: the new package version post_install() { - [ -f var/log/lastlog ] || : >var/log/lastlog - [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/run/utmp ] || : >var/run/utmp - [ -f var/log/btmp ] || (: >var/log/btmp && bin/chmod 600 var/log/btmp) - # workaround for bug #7194 - # readded due to bug #9465 - # please do not remove! - chmod 1777 var/spool/mail tmp var/tmp var/lock + [ -f var/log/lastlog ] || : >var/log/lastlog + [ -f var/log/wtmp ] || : >var/log/wtmp + [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; } + # workaround for bug #7194 + # readded due to bug #9465 + # please do not remove! + chmod 1777 var/spool/mail tmp var/tmp +} + +# args: <group> [options] +_addgroup() { + if ! getent group "$1" >/dev/null; then + groupadd "$@" >/dev/null + fi +} + +# args: <group> [options] +_adduser() { + if ! getent passwd "$1" >/dev/null; then + useradd "$@" >/dev/null + fi } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - post_install $1 - if [ ! "`grep ^optical: etc/group`" ]; then - echo "adding new groups: audio optical" - usr/sbin/groupadd -g 92 audio >/dev/null - usr/sbin/groupadd -g 93 optical >/dev/null - fi - if [ ! "`grep ^video: etc/group`" ]; then - echo "adding new groups: video floppy storage" - usr/sbin/groupadd -g 91 video >/dev/null - usr/sbin/groupadd -g 94 floppy >/dev/null - usr/sbin/groupadd -g 95 storage >/dev/null - fi - if [ ! "`grep ^log: etc/group`" ]; then - echo "adding new group: log" - usr/sbin/groupadd -g 19 log >/dev/null - fi - if [ ! "`grep ^power: etc/group`" ]; then - echo "adding new group: power" - usr/sbin/groupadd -g 98 power >/dev/null - fi - if [ ! "`grep ^network: etc/group`" ]; then - echo "adding new group: network" - usr/sbin/groupadd -g 90 network >/dev/null - fi - if [ ! "`grep ^games: etc/group`" ]; then - echo "adding new group: games" - usr/sbin/groupadd -g 50 games >/dev/null - fi - if [ ! "`grep ^uucp: etc/group`" ]; then - echo "adding new group: uucp" - usr/sbin/groupadd -g 14 uucp >/dev/null - fi - if [ ! "`grep ^http: etc/group`" ]; then - echo "adding new group: http" - usr/sbin/groupadd -g 33 http >/dev/null - fi - if [ ! "`grep ^http: etc/passwd`" ]; then - echo "adding new user http" - usr/sbin/useradd -u 33 -d /srv/http -g http -s /bin/false http >/dev/null - fi - if [ ! "`grep ^scanner: etc/group`" ]; then - echo "adding new group: scanner" - usr/sbin/groupadd -g 96 scanner >/dev/null - fi - if [ ! "`grep ^rfkill: etc/group`" ]; then - echo "adding new group: rfkill" - usr/sbin/groupadd -g 24 rfkill >/dev/null - fi + post_install + + _addgroup optical -g 93 + _addgroup audio -g 92 + _addgroup video -g 91 + _addgroup floppy -g 94 + _addgroup storage -g 95 + _addgroup log -g 19 + _addgroup utmp -g 20 + _addgroup power -g 98 + _addgroup network -g 90 + _addgroup games -g 50 + _addgroup uucp -g 14 + _addgroup http -g 33 + _adduser http -u 33 -d /srv/http -g http -s /bin/false + _addgroup scanner -g 96 + _addgroup rfkill -g 24 + _addgroup lock -g 54 + + # sync gshadow to group (fixes FS#19869 + if ! grep -q '^lock:' etc/gshadow; then + grpconv >/dev/null + fi - grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf \ - || echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf + if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then + echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf + fi - # set "Last password change" > 0; otherwise su $user wont work - for user in bin daemon mail ftp http nobody; do - if LANG=C chage -l ${user} | grep -q 'password must be changed'; then - chage -d 14871 ${user} - fi - done + # set "Last password change" > 0; otherwise su $user wont work + for user in bin daemon mail ftp http nobody; do + if LANG=C chage -l ${user} | grep -q 'password must be changed'; then + chage -d 14871 ${user} + fi + done } diff --git a/abs/core/filesystem/fstab b/abs/core/filesystem/fstab index a23e795..f7f9298 100644 --- a/abs/core/filesystem/fstab +++ b/abs/core/filesystem/fstab @@ -1,6 +1,5 @@ # # /etc/fstab: static file system information # -# <file system> <dir> <type> <options> <dump> <pass> -devpts /dev/pts devpts defaults 0 0 -shm /dev/shm tmpfs nodev,nosuid 0 0 +# <file system> <dir> <type> <options> <dump> <pass> +tmpfs /tmp tmpfs nodev,nosuid 0 0 diff --git a/abs/core/filesystem/group b/abs/core/filesystem/group index 4bd635c..6e8e773 100644 --- a/abs/core/filesystem/group +++ b/abs/core/filesystem/group @@ -13,11 +13,13 @@ ftp:x:11: mail:x:12: uucp:x:14: log:x:19:root +utmp:x:20: locate:x:21: rfkill:x:24: smmsp:x:25: http:x:33: games:x:50: +lock:x:54: network:x:90: video:x:91: audio:x:92: diff --git a/abs/core/filesystem/gshadow b/abs/core/filesystem/gshadow index a6d78a3..c5c7635 100644 --- a/abs/core/filesystem/gshadow +++ b/abs/core/filesystem/gshadow @@ -13,10 +13,13 @@ ftp::: mail::: uucp::: log:::root +utmp:x:: locate::: +rfkill:x:: smmsp::: http::: games::: +lock::: network:x:: video:x:: audio::: diff --git a/abs/core/filesystem/hosts b/abs/core/filesystem/hosts index ec12849..1747f91 100644 --- a/abs/core/filesystem/hosts +++ b/abs/core/filesystem/hosts @@ -3,6 +3,7 @@ # #<ip-address> <hostname.domain.org> <hostname> -127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost.localdomain localhost +::1 localhost.localdomain localhost # End of file diff --git a/abs/core/filesystem/issue b/abs/core/filesystem/issue index 3db753d..36067f0 100644 --- a/abs/core/filesystem/issue +++ b/abs/core/filesystem/issue @@ -1,3 +1,2 @@ -[H[2J -Arch Linux \r (\n) (\l) +LinHES\r (\l) diff --git a/abs/core/filesystem/modprobe.d.usb-load-ehci-first b/abs/core/filesystem/modprobe.d.usb-load-ehci-first index 3b5db0e..9473794 100644 --- a/abs/core/filesystem/modprobe.d.usb-load-ehci-first +++ b/abs/core/filesystem/modprobe.d.usb-load-ehci-first @@ -1,2 +1,2 @@ -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS +softdep ohci_hcd pre: ehci_hcd +softdep uhci_hcd pre: ehci_hcd diff --git a/abs/core/filesystem/os-release b/abs/core/filesystem/os-release new file mode 100644 index 0000000..c36b91c --- /dev/null +++ b/abs/core/filesystem/os-release @@ -0,0 +1,8 @@ +NAME="LinHES" +ID=linhes +PRETTY_NAME="LinHES The Home Entertainment System" +ANSI_COLOR="0;36" +HOME_URL="http://www.linhes.org/" +SUPPORT_URL="http://forum.archlinux.org/" +BUG_REPORT_URL="http://bugs.linhes.org/" + diff --git a/abs/core/filesystem/profile b/abs/core/filesystem/profile index e7a958a..3bc22db 100644 --- a/abs/core/filesystem/profile +++ b/abs/core/filesystem/profile @@ -1,44 +1,23 @@ -# # /etc/profile -# -# This file is intended to be used for ALL common -# Bourne-compatible shells. Shell specifics should be -# handled in /etc/profile.$SHELL where $SHELL is the name -# of the binary being run (discounting symlinks) -# -# Sections taken from SuSe's /etc/profile -# Note the explicit use of 'test' to cover all bases -# and potentially incompatible shells - -#Determine our shell without using $SHELL, which may lie -shell="sh" -if test -f /proc/mounts; then - case $(/bin/ls -l /proc/$$/exe) in - *bash) shell=bash ;; - *dash) shell=dash ;; - *ash) shell=ash ;; - *ksh) shell=ksh ;; - *zsh) shell=zsh ;; - esac -fi - -# Load shell specific profile settings -test -f "/etc/profile.$shell" && . "/etc/profile.$shell" -unset shell #Set our umask umask 022 # Set our default path -PATH="/bin:/usr/bin:/sbin:/usr/sbin" +PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" export PATH # Load profiles from /etc/profile.d if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -x $profile && . $profile - done - unset profile + for profile in /etc/profile.d/*.sh; do + test -r "$profile" && . "$profile" + done + unset profile +fi + +# Source global bash config +if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then + . /etc/bash.bashrc fi # Termcap is outdated, old, and crusty, kill it. diff --git a/abs/core/filesystem/securetty b/abs/core/filesystem/securetty index 7fcd451..5a2235c 100644 --- a/abs/core/filesystem/securetty +++ b/abs/core/filesystem/securetty @@ -9,6 +9,7 @@ tty3 tty4 tty5 tty6 +ttyS0 hvc0 -tty10 + # End of file diff --git a/abs/core/filesystem/shells b/abs/core/filesystem/shells index ff9e383..18c1aef 100644 --- a/abs/core/filesystem/shells +++ b/abs/core/filesystem/shells @@ -4,6 +4,5 @@ /bin/sh /bin/bash -/bin/dash # End of file diff --git a/abs/core/findutils/PKGBUILD b/abs/core/findutils/PKGBUILD index 420a885..e8d3d8c 100644 --- a/abs/core/findutils/PKGBUILD +++ b/abs/core/findutils/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 77807 2010-04-18 04:29:16Z allan $ -# Maintainer: +# $Id: PKGBUILD 142108 2011-11-05 10:13:34Z tpowa $ +# Maintainer: pkgname=findutils pkgver=4.4.2 -pkgrel=2 +pkgrel=4 pkgdesc="GNU utilities to locate files" arch=('i686' 'x86_64') license=('GPL3') groups=('base') depends=('glibc' 'sh') url="http://www.gnu.org/software/findutils" -source=(ftp://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.gz) +source=(ftp://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz) install=findutils.install -md5sums=('351cc4adb07d54877fa15f75fb77d39f') +sha1sums=('e8dd88fa2cc58abffd0bfc1eddab9020231bb024') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + + # Don't build or install locate because we use mlocate, + # which is a secure version of locate. + sed -i '/^SUBDIRS/s/locate//' Makefile.in + ./configure --prefix=/usr - make || return 1 + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/{libexec,var} - - # remove locate utils (we use mlocate instead) - rm -f $pkgdir/usr/bin/{locate,updatedb} - rm -f $pkgdir/usr/share/man/man1/{updatedb.1,locate.1} - rm -f $pkgdir/usr/share/man/man5/locatedb.5 } diff --git a/abs/core/fixesproto/PKGBUILD b/abs/core/fixesproto/PKGBUILD index 2cc1e4e..578c41a 100644 --- a/abs/core/fixesproto/PKGBUILD +++ b/abs/core/fixesproto/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 97554 2010-10-31 15:47:03Z jgc $ +# $Id: PKGBUILD 151256 2012-02-25 10:07:40Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fixesproto -pkgver=4.1.2 -pkgrel=1 +pkgver=5.0 +pkgrel=2 pkgdesc="X11 Fixes extension wire protocol" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') depends=('xproto' 'xextproto') makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c9cda7ff37849250c328f8dc52dc0f6e546df3a5') +sha1sums=('ab605af5da8c98c0c2f8b2c578fed7c864ee996a') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/flac/PKGBUILD b/abs/core/flac/PKGBUILD index f28b964..a6cb0c2 100644 --- a/abs/core/flac/PKGBUILD +++ b/abs/core/flac/PKGBUILD @@ -1,32 +1,51 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -pkgname=flac +# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=flac +pkgname=('flac' 'flac-doc') pkgver=1.2.1 -pkgrel=2 -pkgdesc="Free Lossless Audio Codec" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') +pkgrel=3 +arch=('i686' 'x86_64') url="http://flac.sourceforge.net/" -arch=(i686 x86_64) -options=('!libtool') -depends=('glibc' 'libogg' 'xmms') -makedepends=('nasm' 'xmms') -source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - flac-1.2.1-gcc43.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' '4922379f33c86792630b624ddc83b236') +license=('BSD' 'GPL') +depends=('libogg') +makedepends=('nasm' ) +options=('!libtool' '!makeflags') +source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz + flac-1.2.1-gcc-4.3-includes.patch) +md5sums=('153c8b15a54da428d1f0fadc756c22c7' + 'b9d245422bbc547b18a72897366bea77') +sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' + '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') build() { - # -j1 to get the xmms plugin working (from gentoo) - export MAKEFLAGS="-j1" - cd $startdir/src/$pkgname-$pkgver || return 1 - patch -Np1 -i $startdir/src/flac-1.2.1-gcc43.patch - ./configure --prefix=/usr --enable-shared --disable-sse \ - --disable-rpath --with-pic || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ + --disable-sse --disable-rpath --with-pic + make +} - # install license - install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING.Xiph \ - $startdir/pkg/usr/share/licenses/$pkgname/COPYING.Xiph +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check } +package_flac() { + pkgdesc="Free Lossless Audio Codec" + #optdepends=('xmms: for using the xmms plugin') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_flac-doc() { + pkgdesc="Developer documentation for the Free Lossless Audio Codec" + depends=('flac') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" -C doc install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/flac/__changelog b/abs/core/flac/__changelog new file mode 100644 index 0000000..ba7c043 --- /dev/null +++ b/abs/core/flac/__changelog @@ -0,0 +1 @@ +removed xmms diff --git a/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch b/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch new file mode 100644 index 0000000..52fec8b --- /dev/null +++ b/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch @@ -0,0 +1,11 @@ +diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp +--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 ++++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <cstring> + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + diff --git a/abs/core/flac/flac-1.2.1-gcc43.patch b/abs/core/flac/flac-1.2.1-gcc43.patch deleted file mode 100644 index d8e8ab9..0000000 --- a/abs/core/flac/flac-1.2.1-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 2007-09-13 17:58:03.000000000 +0200 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2008-01-08 10:27:39.000000000 +0100 -@@ -29,6 +29,7 @@ - #endif - - #include <stdio.h> -+#include <string.h> - #include <stdlib.h> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" diff --git a/abs/core/flac/flac-linking.diff b/abs/core/flac/flac-linking.diff deleted file mode 100644 index 3f9f595..0000000 --- a/abs/core/flac/flac-linking.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur flac-1.1.2-orig/configure flac-1.1.2/configure ---- flac-1.1.2-orig/configure 2005-07-24 17:58:19.180907080 +0100 -+++ flac-1.1.2/configure 2005-07-24 17:58:59.139832400 +0100 -@@ -3462,7 +3462,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM diff --git a/abs/core/flac/xmms-plugin.patch b/abs/core/flac/xmms-plugin.patch deleted file mode 100644 index e5fcf2e..0000000 --- a/abs/core/flac/xmms-plugin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugin_xmms/configure.c.old 2005-04-08 12:16:17.000000000 +0200 -+++ src/plugin_xmms/configure.c 2005-04-08 12:16:41.000000000 +0200 -@@ -61,7 +61,7 @@ - "", /* proxy_user */ - "", /* proxy_pass */ - FALSE, /* save_http_stream */ -- "", /* save_http_path */ -+ FALSE, /* save_http_path */ - FALSE, /* cast_title_streaming */ - FALSE /* use_udp_channel */ - }, diff --git a/abs/core/flex/PKGBUILD b/abs/core/flex/PKGBUILD index f36300f..d51091d 100644 --- a/abs/core/flex/PKGBUILD +++ b/abs/core/flex/PKGBUILD @@ -1,30 +1,44 @@ -# $Id: PKGBUILD 3606 2008-06-26 00:29:52Z paul $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 163839 2012-07-21 10:43:39Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + pkgname=flex -pkgver=2.5.35 +pkgver=2.5.36 pkgrel=1 pkgdesc="A tool for generating text-scanning programs" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://flex.sourceforge.net" license=('custom') groups=('base-devel') -depends=('glibc' 'sh') -source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 - lex.sh) -md5sums=('10714e50cea54dc7a227e3eddcd44d57' 'f725259ec23a9e87ee29e2ef82eda9a5') +depends=('glibc' 'm4' 'sh') +install=flex.install +source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 + lex.sh) +md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5' + 'f725259ec23a9e87ee29e2ef82eda9a5') build() { - cd $startdir/src/$pkgname-$pkgver || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $srcdir/$pkgname-$pkgver - # configure - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + # these tests used features removed in bison-2.6 + sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in - # build and install - make || return 1 - make prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man install || return 1 - install -D -m755 $startdir/src/lex.sh $startdir/pkg/usr/bin/lex || return 1 + make check +} - # install license - install -D -m644 COPYING \ - $startdir/pkg/usr/share/licenses/$pkgname/license.txt || return 1 +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex + + install -Dm644 COPYING \ + $pkgdir/usr/share/licenses/$pkgname/license.txt } + diff --git a/abs/core/flex/flex-yytext.patch b/abs/core/flex/flex-yytext.patch deleted file mode 100644 index 27cfaa4..0000000 --- a/abs/core/flex/flex-yytext.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur flex-2.5.31-orig/flex.skl flex-2.5.31/flex.skl ---- flex-2.5.31-orig/flex.skl 2003-03-31 17:51:38.000000000 -0800 -+++ flex-2.5.31/flex.skl 2004-04-11 12:19:10.000000000 -0700 -@@ -3280,7 +3280,6 @@ - #undef yy_set_bol - #undef yy_new_buffer - #undef yy_set_interactive --#undef yytext_ptr - #undef YY_DO_BEFORE_ACTION - - #ifdef YY_DECL_IS_OURS -diff -Naur flex-2.5.31-orig/gen.c flex-2.5.31/gen.c ---- flex-2.5.31-orig/gen.c 2003-03-30 11:58:44.000000000 -0800 -+++ flex-2.5.31/gen.c 2004-04-11 12:19:38.000000000 -0700 -@@ -1812,7 +1812,6 @@ - if (yytext_is_array) { - if (!reentrant){ - indent_puts ("static int yy_more_offset = 0;"); -- }else{ - indent_puts ("static int yy_prev_more_offset = 0;"); - } - } diff --git a/abs/core/ed/ed.install b/abs/core/flex/flex.install index 637807f..5b328c7 100644 --- a/abs/core/ed/ed.install +++ b/abs/core/flex/flex.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(ed.info red.info) +filelist=(flex.info{,-1,-2}) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD index ff2130a..7f6a2ca 100644 --- a/abs/core/fontconfig/PKGBUILD +++ b/abs/core/fontconfig/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59983 2009-11-29 20:25:27Z jgc $ +# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" license=('custom') -depends=('expat>=2.0.1' 'freetype2>=2.3.11') +depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install -source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz 29-replace-bitmap-fonts.conf 30-urw-aliases.patch) md5sums=('77e15a92006ddc2adbb06f840d591c0e' @@ -18,18 +18,22 @@ md5sums=('77e15a92006ddc2adbb06f840d591c0e' '51bc6cb633b50f3c28793361738aac5b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/30-urw-aliases.patch" # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \ - "${pkgdir}/etc/fonts/conf.avail" || return 1 - rm -f ${pkgdir}/etc/fonts/conf.d/*.conf + export CFLAGS="$CFLAGS -fPIC" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \ + "$pkgdir/etc/fonts/conf.avail" + rm -f "$pkgdir"/etc/fonts/conf.d/*.conf #Install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/abs/core/fontsproto/PKGBUILD b/abs/core/fontsproto/PKGBUILD index 595f2e3..c4ddc51 100644 --- a/abs/core/fontsproto/PKGBUILD +++ b/abs/core/fontsproto/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 51009 2009-09-04 13:55:55Z jgc $ +# $Id: PKGBUILD 154134 2012-03-23 17:17:02Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontsproto -pkgver=2.1.0 +pkgver=2.1.2 pkgrel=1 pkgdesc="X11 font extension wire protocol" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('395b300fd5120a7ff90cb8fea4e2356b9632dc3e') +sha1sums=('538f0880faa6981cb1a348ced93dc715c42840f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/freeglut/2.6.0-GFX_radeon.patch b/abs/core/freeglut/2.6.0-GFX_radeon.patch deleted file mode 100644 index 8806fe8..0000000 --- a/abs/core/freeglut/2.6.0-GFX_radeon.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: src/freeglut_window.c -=================================================================== ---- src/freeglut_window.c (Revision 832) -+++ src/freeglut_window.c (Arbeitskopie) -@@ -594,10 +594,9 @@ - #if TARGET_HOST_POSIX_X11 - if ( window ) - { -- glXMakeContextCurrent( -+ glXMakeCurrent( - fgDisplay.Display, - window->Window.Handle, -- window->Window.Handle, - window->Window.Context - ); - -@@ -932,10 +932,9 @@ - XSetWMProtocols( fgDisplay.Display, window->Window.Handle, - &fgDisplay.DeleteWindow, 1 ); - -- glXMakeContextCurrent( -+ glXMakeCurrent( - fgDisplay.Display, - window->Window.Handle, -- window->Window.Handle, - window->Window.Context - ); - diff --git a/abs/core/freeglut/ChangeLog b/abs/core/freeglut/ChangeLog deleted file mode 100644 index 7dd6847..0000000 --- a/abs/core/freeglut/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2009-12-30 Eric Belanger <eric@archlinux.org> - - * freeglut 2.6.0-1 - * Upstream update - * Added libxi depends - * Changed license to MIT - * Added patch to fix an issue with the radeon[hd] ATI opensource drivers - * Added ChangeLog diff --git a/abs/core/freeglut/PKGBUILD b/abs/core/freeglut/PKGBUILD index 7752309..afd3f36 100644 --- a/abs/core/freeglut/PKGBUILD +++ b/abs/core/freeglut/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $ +# $Id: PKGBUILD 147152 2012-01-23 14:30:00Z heftig $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=freeglut -pkgver=2.6.0 +pkgver=2.8.0 pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64') @@ -14,22 +14,18 @@ replaces=('glut') provides=('glut') conflicts=('glut') options=('!libtool') -source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \ - 2.6.0-GFX_radeon.patch) -md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3') -sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95') +source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz) +md5sums=('5db8651af306bc403fbfd36934a20e1d') +sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# fixes an issue with the radeon[hd] ATI opensource drivers -# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163 - patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" || return 1 - - ./configure --prefix=/usr || return 1 - make all || return 1 + ./configure --prefix=/usr --disable-static + make all } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/fribidi/ChangeLog b/abs/core/fribidi/ChangeLog deleted file mode 100644 index 43b17a5..0000000 --- a/abs/core/fribidi/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-02-16 Travis Willard <travis@archlinux.org> - - * 0.10.9 - Added ChangeLog - New upstream release. diff --git a/abs/core/fribidi/PKGBUILD b/abs/core/fribidi/PKGBUILD index 63b7258..55cebf7 100644 --- a/abs/core/fribidi/PKGBUILD +++ b/abs/core/fribidi/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 68036 2010-02-10 15:06:49Z giovanni $ +# $Id: PKGBUILD 137683 2011-09-10 12:05:16Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi pkgver=0.19.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64') license=('LGPL') url="http://fribidi.org" depends=('glibc') options=('!libtool') -source=(http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz) +source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz") md5sums=('626db17d2d99b43615ad9d12500f568a') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/fuse/PKGBUILD b/abs/core/fuse/PKGBUILD index f386396..c16e6d7 100644 --- a/abs/core/fuse/PKGBUILD +++ b/abs/core/fuse/PKGBUILD @@ -1,55 +1,51 @@ -# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $ +# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.8.5 +pkgver=2.9.0 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" -license="GPL2" +license=('GPL2') depends=('glibc') makedepends=('pkg-config') backup=(etc/fuse.conf) -install=fuse.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b' +sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' '3b42e37a741d4651099225987dc40e7f02a716ad') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-lib \ + cd "$pkgname-$pkgver" + + # fix building with glibc-2.14 + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ --enable-util --bindir=/bin - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install - # static device nodes will cause collision. - rm -rf ${pkgdir}/dev - # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse - install -d ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1 - ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1 - mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1 - ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1 - # install sample config file - install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1 - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" + install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf + + # remove udev rules (is in the udev package} + rm -rf ${pkgdir}/etc/udev + + # static device nodes are handled by udev + rm -rf ${pkgdir}/dev } diff --git a/abs/core/fuse/fuse.install b/abs/core/fuse/fuse.install deleted file mode 100644 index 595ac7c..0000000 --- a/abs/core/fuse/fuse.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cat << 'EOM' -==> You must load the fuse kernel module to use FUSE. - -> Run 'modprobe fuse' to load the module now. - -> Add fuse to $MODULES in /etc/rc.conf to load on every boot. -==> You will need a /dev/fuse device node to use FUSE. - -> If you use udev, nothing needs to be done - -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229 -EOM -} - -op=$1 -shift -$op $* diff --git a/abs/core/gawk/PKGBUILD b/abs/core/gawk/PKGBUILD index 9b959fe..9bf1c91 100644 --- a/abs/core/gawk/PKGBUILD +++ b/abs/core/gawk/PKGBUILD @@ -1,35 +1,41 @@ -# $Id: PKGBUILD 80261 2010-05-14 07:26:51Z tpowa $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 155835 2012-04-07 08:07:16Z allan $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=3.1.8 +pkgver=4.0.1 pkgrel=1 -pkgdesc="Gnu version of awk" +pkgdesc="GNU version of awk" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/GNU/gawk.html" license=('GPL') groups=('base') +depends=('sh' 'glibc') provides=('awk') install=gawk.install -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -depends=('sh' 'glibc') -md5sums=('35937a0f83f0efe7a8c2dee635624784') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('bab2bda483e9f32be65b43b8dab39fa5' + '7cf4e4896509c655dd00ecd4ca9098ef') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --libexecdir=/usr/lib + make } -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - mv $pkgdir/usr/libexec $pkgdir/usr/lib - install -dm755 $pkgdir/bin - mv $pkgdir/usr/bin/gawk* $pkgdir/bin/ - mv $pkgdir/usr/bin/awk $pkgdir/bin/ - - rm $pkgdir/usr/share/info/dir - gzip -9 $pkgdir/usr/share/info/{gawk,gawkinet}.info + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + + make check } +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/bin + ln -sf /usr/bin/gawk ${pkgdir}/bin/ + ln -sf gawk ${pkgdir}/bin/awk +} diff --git a/abs/core/gawk/gawk.install b/abs/core/gawk/gawk.install index 95973e4..3f7f24c 100644 --- a/abs/core/gawk/gawk.install +++ b/abs/core/gawk/gawk.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gawk.info.gz gawkinet.info.gz) post_install() { diff --git a/abs/core/gcc/PKGBUILD b/abs/core/gcc/PKGBUILD deleted file mode 100644 index 6699be5..0000000 --- a/abs/core/gcc/PKGBUILD +++ /dev/null @@ -1,231 +0,0 @@ -# $Id: PKGBUILD 87242 2010-08-11 12:46:24Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') -pkgver=4.5.1 -pkgrel=3 -#_snapshot=4.5-20100610 -_libstdcppmanver=20100719 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-2' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('dc8959e31b01a65ce10d269614815054' - 'b294953ff0bb2f20c7acb2bf005d832a' - '7567c2f8df8a8bf61b48fe414b88de65' - '3c11b7037896e967eddf8178af2ddd98' - 'c92111e2e22fc60d1e0adb1b5c7fa4f9' - '226ae0c6364cfe2c1f7ac88d06088d5a' - '4030ee1c08dd1e843c0225b772360e76' - '6fd395bacbd7b6e47c7b74854b478363') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - if ! locale -a | grep ^de_DE > /dev/null; then - echo "You need the de_DE locale to build gcc." - return 1 - fi - - cd ${_basedir} - - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ../gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - mkdir build && cd build - ../configure --prefix=/usr --enable-languages=c,c++,fortran,objc,obj-c++,ada \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-gnu-unique-object \ - --enable-lto --enable-plugin \ - --disable-multilib --disable-libstdcxx-pch \ - --with-system-zlib --with-ppl --with-cloog \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC for C and C++ languages" - groups=('base') - depends=('glibc>=2.11.1-2') - install=gcc-libs.install - - CHOST=i686-pc-linux-gnu - - cd ${_basedir}/build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... - rm -rf ${pkgdir}/usr/lib/gcc/ - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') - groups=('base-devel') - install=gcc.install - - CHOST=i686-pc-linux-gnu - - cd ${_basedir}/build - - # much, much easier to install the lot and clean-up the mess - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{*gfortran,gnat*} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}/* - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a} - rm $pkgdir/usr/lib/{*.so*,lib{gfortran,objc}.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/gfortran.1 - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ - # deal with conflicts... - rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - CHOST=i686-pc-linux-gnu - - cd ${_basedir}/build - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libgfortran.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - CHOST=i686-pc-linux-gnu - - cd ${_basedir}/build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - CHOST=i686-pc-linux-gnu - - cd ${_basedir}/build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/abs/core/gcc/__changelog b/abs/core/gcc/__changelog deleted file mode 100644 index aeacc24..0000000 --- a/abs/core/gcc/__changelog +++ /dev/null @@ -1 +0,0 @@ -add CHOST=i686-pc-linux-gnu to each package-gcc*() section diff --git a/abs/core/gcc/gcc-fortran.install b/abs/core/gcc/gcc-fortran.install deleted file mode 100644 index acffc05..0000000 --- a/abs/core/gcc/gcc-fortran.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/gcc/gcc-hash-style-both.patch b/abs/core/gcc/gcc-hash-style-both.patch deleted file mode 100644 index fbb2105..0000000 --- a/abs/core/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/abs/core/gcc/gcc-libs.install b/abs/core/gcc/gcc-libs.install deleted file mode 100644 index bd57efb..0000000 --- a/abs/core/gcc/gcc-libs.install +++ /dev/null @@ -1,14 +0,0 @@ -infodir=/usr/share/info -file="libgomp.info" - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/gcc/gcc_pure64.patch b/abs/core/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8..0000000 --- a/abs/core/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/abs/core/gdb/PKGBUILD b/abs/core/gdb/PKGBUILD index d96cb93..3c5769c 100644 --- a/abs/core/gdb/PKGBUILD +++ b/abs/core/gdb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90312 2010-09-10 14:58:18Z allan $ +# $Id: PKGBUILD 157331 2012-04-27 05:07:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdb -pkgver=7.2 -pkgrel=2 +pkgver=7.4.1 +pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gdb/" @@ -14,24 +14,21 @@ makedepends=('texinfo') backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install -source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2) -md5sums=('64260e6c56979ee750a01055f16091a5') +source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig} siginfo_t.patch) build() { cd ${srcdir}/${pkgname}-${pkgver} - + patch -Np1 <$srcdir/siginfo_t.patch || exit 1 ./configure --prefix=/usr --disable-nls \ --with-system-readline \ + --with-python=/usr/bin/python2 \ --with-system-gdbinit=/etc/gdb/gdbinit - make || return 1 - - # requires dejagnu - #make check + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # install "custom" system gdbinit install -dm755 $pkgdir/etc/gdb @@ -42,3 +39,6 @@ package() { rm ${pkgdir}/usr/lib/{libbfd,libiberty,libopcodes}.a rm ${pkgdir}/usr/share/info/{bfd,configure,standards}.info } +md5sums=('8854d34691087ec127d934692639855f' + 'a3d48626efc9e7d802f0734ca39a7878' + 'd3d6566382696c7d5a1b6aea5df0bbc2') diff --git a/abs/core/gdb/__changelog b/abs/core/gdb/__changelog new file mode 100644 index 0000000..7b0630f --- /dev/null +++ b/abs/core/gdb/__changelog @@ -0,0 +1 @@ +added siginfo_t.patch diff --git a/abs/core/gdb/gdb.install b/abs/core/gdb/gdb.install index 4430217..986ec54 100644 --- a/abs/core/gdb/gdb.install +++ b/abs/core/gdb/gdb.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info) post_install() { diff --git a/abs/core/gdb/siginfo_t.patch b/abs/core/gdb/siginfo_t.patch new file mode 100644 index 0000000..465645d --- /dev/null +++ b/abs/core/gdb/siginfo_t.patch @@ -0,0 +1,403 @@ +POSIX says you get "siginto_t" *not* "struct siginfo + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: gdb-7.4.1/gdb/alpha-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/alpha-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800 ++++ gdb-7.4.1/gdb/alpha-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700 +@@ -114,7 +114,7 @@ + /* __NR_rt_sigreturn has a couple of structures on the stack. This is: + + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + }; + +Index: gdb-7.4.1/gdb/amd64-linux-nat.c +=================================================================== +--- gdb-7.4.1.orig/gdb/amd64-linux-nat.c 2012-01-05 20:43:04.000000000 -0800 ++++ gdb-7.4.1/gdb/amd64-linux-nat.c 2012-07-03 10:12:30.154227388 -0700 +@@ -671,13 +671,13 @@ + INF. */ + + static int +-amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction) ++amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction) + { + /* Is the inferior 32-bit? If so, then do fixup the siginfo + object. */ + if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32) + { +- gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t)); ++ gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t)); + + if (direction == 0) + compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native); +Index: gdb-7.4.1/gdb/arm-linux-nat.c +=================================================================== +--- gdb-7.4.1.orig/gdb/arm-linux-nat.c 2012-01-05 20:43:04.000000000 -0800 ++++ gdb-7.4.1/gdb/arm-linux-nat.c 2012-07-03 10:12:30.154227388 -0700 +@@ -1137,7 +1137,7 @@ + static int + arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p) + { +- struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid); ++ siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid); + int slot = siginfo_p->si_errno; + + /* This must be a hardware breakpoint. */ +Index: gdb-7.4.1/gdb/arm-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/arm-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800 ++++ gdb-7.4.1/gdb/arm-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700 +@@ -301,7 +301,7 @@ + + /* There are three elements in an rt_sigframe before the ucontext: + pinfo, puc, and info. The first two are pointers and the third +- is a struct siginfo, with size 128 bytes. We could follow puc ++ is a siginfo_t, with size 128 bytes. We could follow puc + to the ucontext, but it's simpler to skip the whole thing. */ + #define ARM_OLD_RT_SIGFRAME_SIGINFO 0x8 + #define ARM_OLD_RT_SIGFRAME_UCONTEXT 0x88 +Index: gdb-7.4.1/gdb/frv-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/frv-linux-tdep.c 2012-01-05 20:43:12.000000000 -0800 ++++ gdb-7.4.1/gdb/frv-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700 +@@ -94,9 +94,9 @@ + { + void (*pretcode)(void); + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + uint32_t retcode[2]; + }; +Index: gdb-7.4.1/gdb/gdbserver/linux-arm-low.c +=================================================================== +--- gdb-7.4.1.orig/gdb/gdbserver/linux-arm-low.c 2012-01-05 20:43:37.000000000 -0800 ++++ gdb-7.4.1/gdb/gdbserver/linux-arm-low.c 2012-07-03 10:12:30.154227388 -0700 +@@ -631,7 +631,7 @@ + arm_stopped_by_watchpoint (void) + { + struct lwp_info *lwp = get_thread_lwp (current_inferior); +- struct siginfo siginfo; ++ siginfo_t siginfo; + + /* We must be able to set hardware watchpoints. */ + if (arm_linux_get_hw_watchpoint_count () == 0) +Index: gdb-7.4.1/gdb/gdbserver/linux-low.c +=================================================================== +--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.c 2012-01-05 20:43:37.000000000 -0800 ++++ gdb-7.4.1/gdb/gdbserver/linux-low.c 2012-07-03 10:12:30.154227388 -0700 +@@ -4522,7 +4522,7 @@ + layout of the inferiors' architecture. */ + + static void +-siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction) ++siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction) + { + int done = 0; + +@@ -4534,9 +4534,9 @@ + if (!done) + { + if (direction == 1) +- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo)); ++ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t)); + else +- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo)); ++ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t)); + } + } + +@@ -4545,8 +4545,8 @@ + unsigned const char *writebuf, CORE_ADDR offset, int len) + { + int pid; +- struct siginfo siginfo; +- char inf_siginfo[sizeof (struct siginfo)]; ++ siginfo_t siginfo; ++ char inf_siginfo[sizeof (siginfo_t)]; + + if (current_inferior == NULL) + return -1; +Index: gdb-7.4.1/gdb/gdbserver/linux-low.h +=================================================================== +--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.h 2012-01-05 20:43:37.000000000 -0800 ++++ gdb-7.4.1/gdb/gdbserver/linux-low.h 2012-07-03 10:20:28.554250548 -0700 +@@ -22,6 +22,7 @@ + #endif + + #include "gdb_proc_service.h" ++#include <signal.h> + + #ifdef HAVE_LINUX_REGSETS + typedef void (*regset_fill_func) (struct regcache *, void *); +@@ -46,8 +47,6 @@ + extern struct regset_info target_regsets[]; + #endif + +-struct siginfo; +- + struct process_info_private + { + /* Arch-specific additions. */ +@@ -103,7 +102,7 @@ + Returns true if any conversion was done; false otherwise. + If DIRECTION is 1, then copy from INF to NATIVE. + If DIRECTION is 0, copy from NATIVE to INF. */ +- int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction); ++ int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction); + + /* Hook to call when a new process is created or attached to. + If extra per-process architecture-specific data is needed, +Index: gdb-7.4.1/gdb/gdbserver/linux-x86-low.c +=================================================================== +--- gdb-7.4.1.orig/gdb/gdbserver/linux-x86-low.c 2012-01-05 20:43:37.000000000 -0800 ++++ gdb-7.4.1/gdb/gdbserver/linux-x86-low.c 2012-07-03 10:12:30.154227388 -0700 +@@ -906,13 +906,13 @@ + INF. */ + + static int +-x86_siginfo_fixup (struct siginfo *native, void *inf, int direction) ++x86_siginfo_fixup (siginfo_t *native, void *inf, int direction) + { + #ifdef __x86_64__ + /* Is the inferior 32-bit? If so, then fixup the siginfo object. */ + if (register_size (0) == 4) + { +- if (sizeof (struct siginfo) != sizeof (compat_siginfo_t)) ++ if (sizeof (siginfo_t) != sizeof (compat_siginfo_t)) + fatal ("unexpected difference in siginfo"); + + if (direction == 0) +Index: gdb-7.4.1/gdb/hppa-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/hppa-linux-tdep.c 2012-01-05 20:43:15.000000000 -0800 ++++ gdb-7.4.1/gdb/hppa-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700 +@@ -181,10 +181,10 @@ + } + + /* sp + sfoffs[try] points to a struct rt_sigframe, which contains +- a struct siginfo and a struct ucontext. struct ucontext contains ++ a siginfo_t and a struct ucontext. struct ucontext contains + a struct sigcontext. Return an offset to this sigcontext here. Too + bad we cannot include system specific headers :-(. +- sizeof(struct siginfo) == 128 ++ sizeof(siginfo_t) == 128 + offsetof(struct ucontext, uc_mcontext) == 24. */ + return sp + sfoffs[try] + 128 + 24; + } +Index: gdb-7.4.1/gdb/ia64-linux-nat.c +=================================================================== +--- gdb-7.4.1.orig/gdb/ia64-linux-nat.c 2012-01-05 20:43:16.000000000 -0800 ++++ gdb-7.4.1/gdb/ia64-linux-nat.c 2012-07-03 10:12:30.158227388 -0700 +@@ -637,7 +637,7 @@ + ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p) + { + CORE_ADDR psr; +- struct siginfo *siginfo_p; ++ siginfo_t *siginfo_p; + struct regcache *regcache = get_current_regcache (); + + siginfo_p = linux_nat_get_siginfo (inferior_ptid); +Index: gdb-7.4.1/gdb/linux-nat.c +=================================================================== +--- gdb-7.4.1.orig/gdb/linux-nat.c 2012-01-05 20:43:19.000000000 -0800 ++++ gdb-7.4.1/gdb/linux-nat.c 2012-07-03 10:12:30.158227388 -0700 +@@ -179,7 +179,7 @@ + /* The method to call, if any, when the siginfo object needs to be + converted between the layout returned by ptrace, and the layout in + the architecture of the inferior. */ +-static int (*linux_nat_siginfo_fixup) (struct siginfo *, ++static int (*linux_nat_siginfo_fixup) (siginfo_t *, + gdb_byte *, + int); + +@@ -4138,7 +4138,7 @@ + layout of the inferiors' architecture. */ + + static void +-siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction) ++siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction) + { + int done = 0; + +@@ -4150,9 +4150,9 @@ + if (!done) + { + if (direction == 1) +- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo)); ++ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t)); + else +- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo)); ++ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t)); + } + } + +@@ -4162,8 +4162,8 @@ + const gdb_byte *writebuf, ULONGEST offset, LONGEST len) + { + int pid; +- struct siginfo siginfo; +- gdb_byte inf_siginfo[sizeof (struct siginfo)]; ++ siginfo_t siginfo; ++ gdb_byte inf_siginfo[sizeof (siginfo_t)]; + + gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO); + gdb_assert (readbuf || writebuf); +@@ -5852,7 +5852,7 @@ + inferior. */ + void + linux_nat_set_siginfo_fixup (struct target_ops *t, +- int (*siginfo_fixup) (struct siginfo *, ++ int (*siginfo_fixup) (siginfo_t *, + gdb_byte *, + int)) + { +@@ -5861,7 +5861,7 @@ + } + + /* Return the saved siginfo associated with PTID. */ +-struct siginfo * ++siginfo_t * + linux_nat_get_siginfo (ptid_t ptid) + { + struct lwp_info *lp = find_lwp_pid (ptid); +Index: gdb-7.4.1/gdb/linux-nat.h +=================================================================== +--- gdb-7.4.1.orig/gdb/linux-nat.h 2012-01-05 20:43:19.000000000 -0800 ++++ gdb-7.4.1/gdb/linux-nat.h 2012-07-03 10:12:30.158227388 -0700 +@@ -76,7 +76,7 @@ + + /* Non-zero si_signo if this LWP stopped with a trap. si_addr may + be the address of a hardware watchpoint. */ +- struct siginfo siginfo; ++ siginfo_t siginfo; + + /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data + watchpoint trap. */ +@@ -171,7 +171,7 @@ + that ptrace returns, and the layout in the architecture of the + inferior. */ + void linux_nat_set_siginfo_fixup (struct target_ops *, +- int (*) (struct siginfo *, ++ int (*) (siginfo_t *, + gdb_byte *, + int)); + +@@ -180,7 +180,7 @@ + void linux_nat_switch_fork (ptid_t new_ptid); + + /* Return the saved siginfo associated with PTID. */ +-struct siginfo *linux_nat_get_siginfo (ptid_t ptid); ++siginfo_t *linux_nat_get_siginfo (ptid_t ptid); + + /* Compute and return the processor core of a given thread. */ + int linux_nat_core_of_thread_1 (ptid_t ptid); +Index: gdb-7.4.1/gdb/linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/linux-tdep.c 2012-01-05 20:43:19.000000000 -0800 ++++ gdb-7.4.1/gdb/linux-tdep.c 2012-07-03 10:12:30.158227388 -0700 +@@ -150,7 +150,7 @@ + append_composite_type_field (type, "si_fd", int_type); + append_composite_type_field (sifields_type, "_sigpoll", type); + +- /* struct siginfo */ ++ /* siginfo_t */ + siginfo_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT); + TYPE_NAME (siginfo_type) = xstrdup ("siginfo"); + append_composite_type_field (siginfo_type, "si_signo", int_type); +Index: gdb-7.4.1/gdb/mips-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/mips-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800 ++++ gdb-7.4.1/gdb/mips-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700 +@@ -905,7 +905,7 @@ + struct rt_sigframe { + u32 rs_ass[4]; [argument save space for o32] + u32 rs_code[2] [signal trampoline or fill] +- struct siginfo rs_info; ++ siginfo_t rs_info; + struct ucontext rs_uc; + }; + +@@ -1033,7 +1033,7 @@ + struct rt_sigframe_n32 { + u32 rs_ass[4]; [ argument save space for o32 ] + u32 rs_code[2]; [ signal trampoline or fill ] +- struct siginfo rs_info; ++ siginfo_t rs_info; + struct ucontextn32 rs_uc; + }; + +@@ -1048,7 +1048,7 @@ + struct rt_sigframe { + u32 rs_ass[4]; [ argument save space for o32 ] + u32 rs_code[2]; [ signal trampoline ] +- struct siginfo rs_info; ++ siginfo_t rs_info; + struct ucontext rs_uc; + }; + +Index: gdb-7.4.1/gdb/mn10300-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/mn10300-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800 ++++ gdb-7.4.1/gdb/mn10300-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700 +@@ -528,9 +528,9 @@ + { + void (*pretcode)(void); + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + struct fpucontext fpuctx; + char retcode[8]; +Index: gdb-7.4.1/gdb/ppc-linux-nat.c +=================================================================== +--- gdb-7.4.1.orig/gdb/ppc-linux-nat.c 2012-01-05 20:43:22.000000000 -0800 ++++ gdb-7.4.1/gdb/ppc-linux-nat.c 2012-07-03 10:12:30.158227388 -0700 +@@ -2213,7 +2213,7 @@ + static int + ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p) + { +- struct siginfo *siginfo_p; ++ siginfo_t *siginfo_p; + + siginfo_p = linux_nat_get_siginfo (inferior_ptid); + +Index: gdb-7.4.1/gdb/procfs.c +=================================================================== +--- gdb-7.4.1.orig/gdb/procfs.c 2012-01-05 20:43:25.000000000 -0800 ++++ gdb-7.4.1/gdb/procfs.c 2012-07-03 10:12:30.158227388 -0700 +@@ -262,7 +262,7 @@ + #ifdef HAVE_PR_SIGINFO64_T + typedef pr_siginfo64_t gdb_siginfo_t; + #else +-typedef struct siginfo gdb_siginfo_t; ++typedef siginfo_t gdb_siginfo_t; + #endif + + /* On mips-irix, praddset and prdelset are defined in such a way that +Index: gdb-7.4.1/gdb/tic6x-linux-tdep.c +=================================================================== +--- gdb-7.4.1.orig/gdb/tic6x-linux-tdep.c 2012-01-05 20:54:31.000000000 -0800 ++++ gdb-7.4.1/gdb/tic6x-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700 +@@ -34,7 +34,7 @@ + + /* The offset from rt_sigframe pointer to SP register. */ + #define TIC6X_SP_RT_SIGFRAME 8 +-/* Size of struct siginfo info. */ ++/* Size of siginfo_t info. */ + #define TIC6X_SIGINFO_SIZE 128 + /* Size of type stack_t, which contains three fields of type void*, int, and + size_t respectively. */ diff --git a/abs/core/gdbm/PKGBUILD b/abs/core/gdbm/PKGBUILD index 91744e4..30570dd 100644 --- a/abs/core/gdbm/PKGBUILD +++ b/abs/core/gdbm/PKGBUILD @@ -1,38 +1,57 @@ -# $Id: PKGBUILD 73046 2010-03-22 00:42:44Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 143800 2011-11-29 13:32:53Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm -pkgver=1.8.3 -pkgrel=15 +pkgver=1.10 +pkgrel=1 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') arch=('i686' 'x86_64') depends=('glibc' 'sh') -source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz - gdbm-1.8.3-fhs.patch) +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.10-zeroheaders.patch) options=('!libtool' '!makeflags') install=gdbm.install - +md5sums=('88770493c2559dc80b561293e39d3570' + 'ac255b10452005237836cd2d3a470733') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/gdbm-1.8.3-fhs.patch + cd "${srcdir}/${pkgname}-${pkgver}" - libtoolize --force --copy - aclocal - autoconf - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make prefix=/usr || return 1 + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch - make prefix=$pkgdir/usr \ - manprefix=$pkgdir/usr/share/man \ - man3dir=$pkgdir/usr/share/man/man3 \ - infodir=$pkgdir/usr/share/info \ - install install-compat + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat + + make prefix=/usr +} - ln -sf gdbm/gdbm.h $pkgdir/usr/include +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h } -md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1' - 'a5bb00f10f4d8317435c4cf471b6ced4') diff --git a/abs/core/gdbm/__changelog b/abs/core/gdbm/__changelog deleted file mode 100644 index 7eaaf1d..0000000 --- a/abs/core/gdbm/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -Add -lgdbm_compat to line 104 of gdbm-1.8.3-fhs.patch. Python2.6 would not - build "dbm" module without this. diff --git a/abs/core/gdbm/gdbm-1.10-zeroheaders.patch b/abs/core/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 0000000..a268f6b --- /dev/null +++ b/abs/core/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/abs/core/gdbm/gdbm-1.8.3-fhs.patch b/abs/core/gdbm/gdbm-1.8.3-fhs.patch deleted file mode 100644 index 5b405d9..0000000 --- a/abs/core/gdbm/gdbm-1.8.3-fhs.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in ---- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 -@@ -1,7 +1,7 @@ - #### Start of system configuration section. #### - - srcdir = @srcdir@ --top_builddir = . -+top_builddir = @top_builddir@ - VPATH = @srcdir@ - - CC = @CC@ -@@ -14,17 +14,13 @@ INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - --# File ownership and group --BINOWN = bin --BINGRP = bin -- - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - --DEFS = -+DEFS = @DEFS@ - - # Where the system [n]dbm routines are... --LIBS = @LIBS@ -lc -+LIBS = @LIBS@ - - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ - # Common prefix for installation directories - prefix = @prefix@ - exec_prefix = @exec_prefix@ --binprefix = $(exec_prefix) --manprefix = $(prefix) -+datarootdir = @datarootdir@ - - # Directory in which to put libgdbm.a. - libdir = @libdir@ - # The include directory for gdbm.h and dbm.h. - includedir = @includedir@ -+pkgincludedir = $(includedir)/gdbm - # Info and man directories. - infodir = @infodir@ --man3dir = @mandir@/man3 -+mandir = @mandir@ -+man3dir = $(mandir)/man3 - manext = 3 - - #### End of system configuration section. #### -@@ -57,7 +54,7 @@ manext = 3 - - SHELL = /bin/sh - --PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm -+PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm - - DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c - -@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la - progs: $(PROGS) - - install: libgdbm.la gdbm.h gdbm.info -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ -- $(INSTALL_ROOT)$(infodir) -- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -- $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -- $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -- $(INSTALL_ROOT)$(infodir)/gdbm.info -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) -+ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la -+ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 -+ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info - - install-compat: -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) -- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ -- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -- $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -- $(INSTALL_ROOT)$(includedir)/ndbm.h -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) -+ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la -+ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h -+ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h - # rm -f libgdbm.a -@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h - libgdbm_compat.la: $(C_LOBJS) gdbm.h - rm -f libgdbm_compat.la - $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ -- -version-info $(SHLIB_VER) $(C_LOBJS) -+ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm_compat -lgdbm - - gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 - rm -f gdbm.h -@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot - chmod -w gdbm.h - - testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ - - testdbm: testdbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la - - tdbm: testdbm.o - $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) -@@ -184,7 +172,7 @@ testndbm.o: testndbm.c - $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c - - testndbm: testndbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la - - tndbm.o: testndbm.c - cp $(srcdir)/testndbm.c ./tndbm.c -@@ -195,7 +183,7 @@ tndbm: tndbm.o - $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) - - conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ - - lintgdbm: - lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c diff --git a/abs/core/gdk-pixbuf/PKGBUILD b/abs/core/gdk-pixbuf/PKGBUILD index 27e662a..7b0059d 100644 --- a/abs/core/gdk-pixbuf/PKGBUILD +++ b/abs/core/gdk-pixbuf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63580 2010-01-17 23:27:59Z andrea $ -# Maintainer: +# $Id: PKGBUILD 66703 2012-02-27 17:09:51Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gdk-pixbuf pkgver=0.22.0 -pkgrel=7 +pkgrel=9 pkgdesc="Image loading and manipulation library" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -17,28 +17,27 @@ source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgve gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch gdk-pixbuf-0.22.0-bmp_secure.patch gdk-pixbuf-0.22.0-loaders.patch - gdk-pixbuf-0.22.0.patch) + gdk-pixbuf-0.22.0.patch + libpng15.patch) md5sums=('05fcb68ceaa338614ab650c775efc2f2' - 'd1fb93f1ae994875158a7e0c108c36f8' - '5f59d5772b1482d885a180dbc581cf84' - '3cf31ae0509747f72ac27a9fd96109c2' - 'e0f5f301ce958b7cea0be631ed7b8e56') + 'd1fb93f1ae994875158a7e0c108c36f8' + '5f59d5772b1482d885a180dbc581cf84' + '3cf31ae0509747f72ac27a9fd96109c2' + 'e0f5f301ce958b7cea0be631ed7b8e56' + '16db4dc83d507ebcf15d1beb753a77bc') build() { cd ${srcdir}/${pkgname}-${pkgver} export SED=/bin/sed - patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch || return 1 - patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch || return 1 - patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch || return 1 - patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch || return 1 - libtoolize --force --copy --automake || return 1 - autoreconf --force --install || return 1 - ./configure --prefix=/usr --disable-gtk-doc || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch + patch -Np1 -i ${srcdir}/libpng15.patch + libtoolize --force --copy --automake + autoreconf --force --install + ./configure --prefix=/usr --disable-gtk-doc + make + make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/share/gnome } diff --git a/abs/core/gdk-pixbuf/libpng15.patch b/abs/core/gdk-pixbuf/libpng15.patch new file mode 100644 index 0000000..e667288 --- /dev/null +++ b/abs/core/gdk-pixbuf/libpng15.patch @@ -0,0 +1,30 @@ +diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c 2001-01-24 23:59:23.000000000 +0300 ++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c 2012-01-23 13:33:08.000000000 +0400 +@@ -175,7 +175,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -366,7 +366,7 @@ + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/abs/core/gdk-pixbuf2/PKGBUILD b/abs/core/gdk-pixbuf2/PKGBUILD index 44b8e7a..d281834 100644 --- a/abs/core/gdk-pixbuf2/PKGBUILD +++ b/abs/core/gdk-pixbuf2/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 98279 2010-11-06 11:00:15Z ibiru $ +# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=gdk-pixbuf2 -pkgver=2.22.1 -pkgrel=3 -pkgdesc="An image loading library for gtk2" +pkgver=2.26.1 +pkgrel=1 +pkgdesc="An image loading library" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2>=2.26.0' 'libpng>=1.4.3' 'libtiff>=3.9.4' 'libjpeg>=8.0.2' 'libx11') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.22/gdk-pixbuf-${pkgver}.tar.bz2) -sha256sums=('6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d') +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') build() { - cd "${srcdir}/gdk-pixbuf-${pkgver}" + cd "gdk-pixbuf-$pkgver" ./configure --prefix=/usr \ --without-libjasper \ + --with-x11 \ --with-included-loaders=png - make || return 1 + make } package() { - cd "${srcdir}/gdk-pixbuf-${pkgver}" + cd "gdk-pixbuf-$pkgver" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/abs/core/gdk-pixbuf2/gdk-pixbuf2.install b/abs/core/gdk-pixbuf2/gdk-pixbuf2.install index 1b35942..f04c096 100644 --- a/abs/core/gdk-pixbuf2/gdk-pixbuf2.install +++ b/abs/core/gdk-pixbuf2/gdk-pixbuf2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { @@ -7,5 +7,5 @@ post_upgrade() { } pre_remove() { - rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache + rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache } diff --git a/abs/core/gettext/PKGBUILD b/abs/core/gettext/PKGBUILD index d8946b0..e29c291 100644 --- a/abs/core/gettext/PKGBUILD +++ b/abs/core/gettext/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 82270 2010-06-09 19:25:00Z tpowa $ -# Maintainer: +# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $ +# Maintainer: pkgname=gettext pkgver=0.18.1.1 -pkgrel=2 +pkgrel=4 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') -url="http://www.gnu.org/software/gettext" +url="http://www.gnu.org/software/gettext/" license=('GPL') groups=('base') depends=('gcc-libs' 'acl' 'sh' 'glib2') optdepends=('cvs: for autopoint tool') -options=(!libtool) +options=(!libtool !docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) md5sums=('3dd55b952826d2b32f51308f2f91aa89') build() { - cd $srcdir/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c + sed -i '/gets is a security hole/d' \ + gettext-{runtime/gnulib-lib,tools/{gnulib-lib,libgettextpo}}/stdio.in.h ./configure --prefix=/usr --enable-csharp - make || return 1 + make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/gettext/__changelog b/abs/core/gettext/__changelog new file mode 100644 index 0000000..55fb64e --- /dev/null +++ b/abs/core/gettext/__changelog @@ -0,0 +1,2 @@ +sed -i '/gets is a security hole/d' \ + gettext-{runtime/gnulib-lib,tools/{gnulib-lib,libgettextpo}}/stdio.in.h diff --git a/abs/core/ghostscript/PKGBUILD b/abs/core/ghostscript/PKGBUILD index c479bdc..a911598 100644 --- a/abs/core/ghostscript/PKGBUILD +++ b/abs/core/ghostscript/PKGBUILD @@ -1,62 +1,57 @@ -# $Id: PKGBUILD 94631 2010-10-08 20:42:27Z andyrtr $ +# $Id: PKGBUILD 149988 2012-02-12 09:04:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=ghostscript -pkgver=9.00 +pkgver=9.05 pkgrel=1 pkgdesc="An interpreter for the PostScript language" arch=('i686' 'x86_64') license=('GPL3' 'custom') -depends=('libxext' 'libxt' 'libcups>=1.4.2-3' 'fontconfig>=2.8.0' 'gnutls>=2.8.5' 'cairo>=1.8.8-2' - 'jasper>=1.900.1-4' 'zlib' 'libpng>=1.4.0' 'libjpeg>=8') -makedepends=('automake' 'autoconf' 'gtk2>=2.18.6') -optdepends=('texlive-core: dvipdf' - 'gtk2: gsx') -replaces=('ghostscript-lrpng') -provides=('ghostscript-lprng') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? +makedepends=('gtk2' 'gnutls') +optdepends=('texlive-core: needed for dvipdf' + 'gtk2: needed for gsx') url="http://www.ghostscript.com/" -source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.xz - ghostscript-fPIC.patch - ghostscript-system-jasper.patch) +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) options=('!libtool' '!makeflags') -md5sums=('1ca5f245677f78f573e6490bdb40702f' - '766d44c47c693f96941b658e360c1277' - '03e27cd02471ab3b642c344fa06b623e') +md5sums=('8bcef1f33ddf8a4d12b2cf8da385c191') build() { cd ${srcdir}/ghostscript-${pkgver} + # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat - - # fix build with systems jasper - patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1 + rm -rf jpeg libpng zlib jasper expat tiff lcms freetype - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch || return 1 - fi + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --with-install-cups \ + --enable-fontconfig \ + --enable-freetype \ + --without-luratech \ + --with-system-libtiff \ + --disable-compile-inits #--help # needed for linking with system-zlib + make # Build IJS cd ${srcdir}/ghostscript-${pkgver}/ijs ./autogen.sh ./configure --prefix=/usr --enable-shared --disable-static - make || return 1 - make -j1 DESTDIR=${pkgdir} install || return 1 - - cd .. - ./autogen.sh - ./configure --prefix=/usr --enable-dynamic --with-ijs \ - --with-jbig2dec --with-omni --with-x --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --disable-compile-inits # needed for linking with system-zlib - make || return 1 + make } + package() { - cd ${srcdir}/ghostscript-${pkgver} - make -j1 DESTDIR=${pkgdir} \ + cd ${srcdir}/ghostscript-${pkgver} + make DESTDIR=${pkgdir} \ cups_serverroot=${pkgdir}/etc/cups \ cups_serverbin=${pkgdir}/usr/lib/cups install soinstall - # install a missing doc files # http://bugs.archlinux.org/task/18023 + # install missing doc files # http://bugs.archlinux.org/task/18023 install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} @@ -64,4 +59,8 @@ package() { # remove unwanted localized man-pages rm -rf $pkgdir/usr/share/man/[^man1]* + + # install IJS + cd ${srcdir}/ghostscript-${pkgver}/ijs + make DESTDIR=${pkgdir} install } diff --git a/abs/core/ghostscript/ghostscript-fPIC.patch b/abs/core/ghostscript/ghostscript-fPIC.patch deleted file mode 100644 index 6f89996..0000000 --- a/abs/core/ghostscript/ghostscript-fPIC.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ghostscript-8.60-r8112/base/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100 -+++ ghostscript-8.60-r8112/base/lib.mak 2007-07-10 17:05:56.000000000 +0100 -@@ -874,7 +874,7 @@ - $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ - $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ -@@ -1077,7 +1077,7 @@ - - # Provide a mapping between StandardEncoding and ISOLatin1Encoding. - $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) -- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c -+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c - - ###### Create a pseudo-"feature" for the entire graphics library. - diff --git a/abs/core/ghostscript/ghostscript-system-jasper.patch b/abs/core/ghostscript/ghostscript-system-jasper.patch deleted file mode 100644 index 444b760..0000000 --- a/abs/core/ghostscript/ghostscript-system-jasper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c ---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100 -+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000 -@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s - private_st_jpxd_state(); /* creates a gc object for our state, - defined in sjpx.h */ - --/* error reporting callback for the jpx library */ --static void --s_jpx_jas_error_cb(jas_error_t err, char *msg) --{ -- dprintf2("jasper (code %d) %s", (int)err, msg); --} -- -- - /* initialize the steam. - this involves allocating the stream and image structures, and - initializing the decoder. -@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss) - } - - status = jas_init(); -- jas_set_error_cb(s_jpx_jas_error_cb); - #ifdef JPX_DEBUG - /* raise the error reporting threshold from the default (0) */ - jas_setdbglevel(1); diff --git a/abs/core/ghostscript/svn_rev11948.diff b/abs/core/ghostscript/svn_rev11948.diff new file mode 100644 index 0000000..92abb0d --- /dev/null +++ b/abs/core/ghostscript/svn_rev11948.diff @@ -0,0 +1,16 @@ +Modified: trunk/gs/base/gximag3x.c +=================================================================== +--- trunk/gs/base/gximag3x.c 2010-12-10 19:50:53 UTC (rev 11947) ++++ trunk/gs/base/gximag3x.c 2010-12-11 23:02:25 UTC (rev 11948) +@@ -241,7 +241,9 @@ + const gs_image3x_mask_t *pixm = + (i == 0 ? &pim->Opacity : &pim->Shape); + +- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict; ++ /* Use memcpy because direct assignment breaks ANSI aliasing */ ++ /* rules and causes SEGV with gcc 4.5.1 */ ++ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict)); + mask[i].image.type = type1; + mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent; + } + diff --git a/abs/core/giflib/PKGBUILD b/abs/core/giflib/PKGBUILD index 8ecf503..d92ecb7 100644 --- a/abs/core/giflib/PKGBUILD +++ b/abs/core/giflib/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 151260 2012-02-25 10:17:00Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -5,12 +6,12 @@ pkgname=giflib pkgver=4.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') license=('MIT') -depends=('libx11' 'libsm') +depends=('libx11') provides=("libungif=${pkgver}") conflicts=('libungif') replaces=('libungif') @@ -19,20 +20,25 @@ source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver} md5sums=('7125644155ae6ad33dbc9fc15a14735f') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + libtoolize -f + autoreconf + ./configure --prefix=/usr --disable-static + make # libungif compatibility - instructions taken from Redhat specfile MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} || return 1 - install -m755 libungif.so.${pkgver} ${pkgdir}/usr/lib/ || return 1 - ln -sf libungif.so.${pkgver} ${pkgdir}/usr/lib/libungif.so.4 || return 1 - ln -sf libungif.so.4 ${pkgdir}/usr/lib/libungif.so || return 1 + gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" + ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" + ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/git/ChangeLog b/abs/core/git/ChangeLog deleted file mode 100644 index f0c1523..0000000 --- a/abs/core/git/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <dan@archlinux.org> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <dan@archlinux.org> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <dan@archlinux.org> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <dan@archlinux.org> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <allan@archlinux.org> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <dan@archlinux.org> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <dan@archlinux.org> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <dan@archlinux.org> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <dan@archlinux.org> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <dan@archlinux.org> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <kevin@archlinux.org> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <eric@archlinux.org> - Version 1.5.3.5-2 - * Fix Perl module location diff --git a/abs/core/git/PKGBUILD b/abs/core/git/PKGBUILD deleted file mode 100644 index e6a7db4..0000000 --- a/abs/core/git/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: PKGBUILD 141151 2011-10-24 22:00:23Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=git -pkgver=1.7.7.1 -pkgrel=2 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -#depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl' 'openssl' 'pcre') -makedepends=('python2' ) -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-mime-tools: git send-email' - 'perl-net-smtp-ssl: git send-email TLS support' - 'perl-authen-sasl: git send-email TLS support' - 'python2: various helper scripts' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" -# "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2" -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf) -changelog=ChangeLog - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 - -# cd contrib/emacs -# make prefix=/usr -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install - - # bash completion - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ - # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ - $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} - - # emacs interface -# cd contrib/emacs -# make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - rm -rf "$pkgdir"/usr/lib/perl5 - - # git daemon script - install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon - install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf -} - -md5sums=('7cfb3e7ea585037272a7ad8e35f4ac0a' - 'b6ec6c3a08855b7393284675643be95c' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f' - '28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5' - '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' - 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/abs/core/git/git-daemon b/abs/core/git/git-daemon deleted file mode 100644 index 21ba73e..0000000 --- a/abs/core/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/abs/core/git/git-daemon.conf b/abs/core/git/git-daemon.conf deleted file mode 100644 index 3f9a120..0000000 --- a/abs/core/git/git-daemon.conf +++ /dev/null @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/abs/core/glib/PKGBUILD b/abs/core/glib/PKGBUILD index 42f4420..480a521 100644 --- a/abs/core/glib/PKGBUILD +++ b/abs/core/glib/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=10 +pkgrel=9 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') depends=('glibc') -options=('!libtool' '!emptydirs' '!docs' ) -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \ - gcc340.patch \ - aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\ +options=('!libtool') +install=glib.install +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ + gcc340.patch aclocal-fixes.patch) +md5sums=('6fe30dad87c77b91b632def29dd69ef9' + '877b3330e822a4be69a0f8a8c268cfd7' 'e52c4b88427b9785bb8049dbdc9ff6fb') -sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'\ - 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\ +sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' + 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np0 -i ../aclocal-fixes.patch || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../gcc340.patch + patch -Np0 -i ../aclocal-fixes.patch - #Arch64 fixes --build/host - ./configure --prefix=/usr #--host=i686-pc-linux-gnu - make || return 1 - make DESTDIR=$startdir/pkg install + [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info $CONFIGFLAG + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/glib/__changelog b/abs/core/glib/__changelog deleted file mode 100644 index f2439db..0000000 --- a/abs/core/glib/__changelog +++ /dev/null @@ -1 +0,0 @@ -added !emptydir !docs to options diff --git a/abs/core/glib/glib.install b/abs/core/glib/glib.install new file mode 100644 index 0000000..c0046fe --- /dev/null +++ b/abs/core/glib/glib.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(glib.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index c3ec618..0b43721 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -1,27 +1,30 @@ -# $Id$ +# $Id: PKGBUILD 163895 2012-07-21 19:19:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.28.8 +pkgver=2.32.4 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) license=('LGPL') -depends=('pcre>=8.12') -makedepends=('pkgconfig' 'python2') -checkdepends=('pygobject' 'dbus-python') -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz +depends=('pcre' 'libffi') +makedepends=('pkg-config' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz glib2.sh - glib2.csh) -sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353' + glib2.csh + revert-warn-glib-compile-schemas.patch) +sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { - cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr \ + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ --with-pcre=system \ --disable-fam @@ -29,20 +32,15 @@ build() { } package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install + cd glib-$pkgver + make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + install -d "$pkgdir/etc/profile.d" + install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/" + install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/" - for _i in "${pkgdir}/etc/bash_completion.d/"*; do - chmod -x "${_i}" + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" done -} - -check() { - cd "${srcdir}/glib-${pkgver}" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py - make -k check || true + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen } diff --git a/abs/core/glib2/revert-warn-glib-compile-schemas.patch b/abs/core/glib2/revert-warn-glib-compile-schemas.patch new file mode 100644 index 0000000..75b0510 --- /dev/null +++ b/abs/core/glib2/revert-warn-glib-compile-schemas.patch @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2 diff --git a/abs/core/glibc/PKGBUILD b/abs/core/glibc/PKGBUILD index 1c9d578..93a0751 100644 --- a/abs/core/glibc/PKGBUILD +++ b/abs/core/glibc/PKGBUILD @@ -1,105 +1,52 @@ -# $Id$ +# $Id: PKGBUILD 163512 2012-07-14 13:07:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each new glibc version +# NOTE: valgrind requires rebuilt with each major glibc version pkgname=glibc -pkgver=2.14 -pkgrel=4 -_glibcdate=20110617 +pkgver=2.16.0 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=2.6.39' 'tzdata') -makedepends=('gcc>=4.4') -backup=(etc/locale.gen +depends=('linux-api-headers>=3.4' 'tzdata') +makedepends=('gcc>=4.7') +backup=(etc/gai.conf + etc/locale.gen etc/nscd.conf) options=('!strip') install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - nscd +source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.15-fix-res_query-assert.patch + glibc-2.15-revert-c5a0802a.patch + nscd.rcd + nscd.service + nscd.tmpfiles locale.gen.txt locale-gen) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - 'b587ee3a70c9b3713099295609afde49' +md5sums=('80b181b02ab249524ec92822c0174cf7' + '2a1221a15575820751c325ef4d2fbb90' + '31f415b41197d85d3bbee3d1eecd06a3' + '0a0383d50d63f1c02919fe9943b82014' + '589d79041aa767a5179eaa4e2737dd3f' + 'ad8a9af15ab7eeaa23dc7ee85024af9f' + 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - git checkout -b glibc-2.14-arch origin/release/2.14/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + cd ${srcdir}/${pkgname}-${pkgver} - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + # fix res_query assertion + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf + # revert commit c5a0802a - causes various hangs + # https://bugzilla.redhat.com/show_bug.cgi?id=552960 + patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch cd ${srcdir} mkdir glibc-build @@ -107,82 +54,100 @@ build() { if [[ ${CARCH} = "i686" ]]; then # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" fi echo "slibdir=/lib" >> configparms - ${srcdir}/glibc/configure --prefix=/usr \ + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --with-headers=/usr/include \ --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch - + --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms make + + # re-enable hardening for programs + sed -i "/build-programs=/s#no#yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms } check() { cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true + make -k check } package() { cd ${srcdir}/glibc-build + + ln -s usr/lib ${pkgdir}/lib + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + make install_root=${pkgdir} install rm -f ${pkgdir}/etc/ld.so.{cache,conf} - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf + install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd + install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + + install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf + + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen + sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ + ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker + # fix paths and compliance with binary blobs... sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . + ln -s usr/lib ${pkgdir}/lib64 fi - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 + + # Do not strip the following files for improved debugging support + # ("improved" as in not breaking gdb and valgrind...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so cd $pkgdir strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale} \ - usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ + usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \ + usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \ usr/lib/getconf/* \ usr/sbin/{iconvconfig,nscd} [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + strip $STRIP_STATIC usr/lib/*.a - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/abs/core/glibc/glibc-2.10-bz4781.patch b/abs/core/glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a..0000000 --- a/abs/core/glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/abs/core/glibc/glibc-2.10-dont-build-timezone.patch b/abs/core/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff..0000000 --- a/abs/core/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/abs/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/abs/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e847542..0000000 --- a/abs/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/abs/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/abs/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b4..0000000 --- a/abs/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/abs/core/glibc/glibc-2.13-futex.patch b/abs/core/glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac..0000000 --- a/abs/core/glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/abs/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/abs/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7..0000000 --- a/abs/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/abs/core/glibc/glibc-2.14-libdl-crash.patch b/abs/core/glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c..0000000 --- a/abs/core/glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/abs/core/glibc/glibc-2.14-reexport-rpc-interface.patch b/abs/core/glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea8..0000000 --- a/abs/core/glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/abs/core/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/abs/core/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd82..0000000 --- a/abs/core/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/abs/core/glibc/glibc-2.14-revert-4462fad3.patch b/abs/core/glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e374..0000000 --- a/abs/core/glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/abs/core/glibc/glibc-2.15-fix-res_query-assert.patch b/abs/core/glibc/glibc-2.15-fix-res_query-assert.patch new file mode 100644 index 0000000..a894da9 --- /dev/null +++ b/abs/core/glibc/glibc-2.15-fix-res_query-assert.patch @@ -0,0 +1,51 @@ +--- a/resolv/res_query.c ++++ a/resolv/res_query.c +@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp, + int *resplen2) + { + HEADER *hp = (HEADER *) answer; ++ HEADER *hp2; + int n, use_malloc = 0; + u_int oflags = statp->_flags; + +@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp, + /* __libc_res_nsend might have reallocated the buffer. */ + hp = (HEADER *) *answerp; + +- /* We simplify the following tests by assigning HP to HP2. It +- is easy to verify that this is the same as ignoring all +- tests of HP2. */ +- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; +- +- if (n < (int) sizeof (HEADER) && answerp2 != NULL +- && *resplen2 > (int) sizeof (HEADER)) ++ /* We simplify the following tests by assigning HP to HP2 or ++ vice versa. It is easy to verify that this is the same as ++ ignoring all tests of HP or HP2. */ ++ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) + { +- /* Special case of partial answer. */ +- assert (hp != hp2); +- hp = hp2; ++ hp2 = hp; + } +- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +- && n > (int) sizeof (HEADER)) ++ else + { +- /* Special case of partial answer. */ +- assert (hp != hp2); +- hp2 = hp; ++ hp2 = (HEADER *) *answerp2; ++ if (n < (int) sizeof (HEADER)) ++ { ++ hp = hp2; ++ } + } + ++ /* Make sure both hp and hp2 are defined */ ++ assert((hp != NULL) && (hp2 != NULL)); ++ + if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) + && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { + #ifdef DEBUG diff --git a/abs/core/glibc/glibc-2.15-revert-c5a0802a.patch b/abs/core/glibc/glibc-2.15-revert-c5a0802a.patch new file mode 100644 index 0000000..d889472 --- /dev/null +++ b/abs/core/glibc/glibc-2.15-revert-c5a0802a.patch @@ -0,0 +1,226 @@ +diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +@@ -137,7 +137,6 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 18f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx + movl %ebp, %edx + xorl %esi, %esi +@@ -151,9 +150,6 @@ __pthread_cond_wait: + sete 16(%esp) + je 19f + +- cmpl $-EAGAIN, %eax +- je 91f +- + /* Normal and PI futexes dont mix. Use normal futex functions only + if the kernel does not support the PI futex functions. */ + cmpl $-ENOSYS, %eax +@@ -398,78 +394,6 @@ __pthread_cond_wait: + #endif + call __lll_unlock_wake + jmp 11b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- +- /* Get internal lock. */ +- movl $1, %edx +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %edx, (%ebx) +-#else +- cmpxchgl %edx, cond_lock(%ebx) +-#endif +- jz 92f +- +-#if cond_lock == 0 +- movl %ebx, %edx +-#else +- leal cond_lock(%ebx), %edx +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_lock_wait +- +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- addl $1, cond_futex(%ebx) +- movl cond_futex(%ebx), %ebp +- +- /* Unlock. */ +- LOCK +-#if cond_lock == 0 +- subl $1, (%ebx) +-#else +- subl $1, cond_lock(%ebx) +-#endif +- je 93f +-#if cond_lock == 0 +- movl %ebx, %eax +-#else +- leal cond_lock(%ebx), %eax +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_unlock_wake +- +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorl %ecx, %ecx +- movl dep_mutex(%ebx), %edi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -642,10 +566,6 @@ __condvar_w_cleanup: + .long .LcleanupEND-.Lsub_cond_futex + .long __condvar_w_cleanup-.LSTARTCODE + .uleb128 0 +- .long .LcleanupSTART2-.LSTARTCODE +- .long .LcleanupEND2-.LcleanupSTART2 +- .long __condvar_w_cleanup-.LSTARTCODE +- .uleb128 0 + .long .LcallUR-.LSTARTCODE + .long .LENDCODE-.LcallUR + .long 0 +Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig +diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 +@@ -23,7 +23,6 @@ + #include <lowlevelcond.h> + #include <tcb-offsets.h> + #include <pthread-pi-defines.h> +-#include <pthread-errnos.h> + #include <stap-probe.h> + + #include <kernel-features.h> +@@ -137,14 +136,11 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 61f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi + movl $SYS_futex, %eax + syscall + + movl $1, %r8d +- cmpq $-EAGAIN, %rax +- je 91f + #ifdef __ASSUME_REQUEUE_PI + jmp 62f + #else +@@ -331,70 +327,6 @@ __pthread_cond_wait: + + 13: movq %r10, %rax + jmp 14b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- movq 8(%rsp), %rdi +- +- /* Get internal lock. */ +- movl $1, %esi +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %esi, (%rdi) +-#else +- cmpxchgl %esi, cond_lock(%rdi) +-#endif +- jz 92f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- callq __lll_lock_wait +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- incl cond_futex(%rdi) +- movl cond_futex(%rdi), %edx +- +- /* Release internal lock. */ +- LOCK +-#if cond_lock == 0 +- decl (%rdi) +-#else +- decl cond_lock(%rdi) +-#endif +- jz 93f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- /* The call preserves %rdx. */ +- callq __lll_unlock_wake +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorq %r10, %r10 +- mov dep_mutex(%rdi), %R8_LP +- leaq cond_futex(%rdi), %rdi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -547,15 +479,11 @@ __condvar_cleanup1: + .uleb128 .LcleanupSTART-.LSTARTCODE + .uleb128 .LcleanupEND-.LcleanupSTART + .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 +- .uleb128 .LcleanupSTART2-.LSTARTCODE +- .uleb128 .LcleanupEND2-.LcleanupSTART2 +- .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 ++ .uleb128 0 + .uleb128 .LcallUR-.LSTARTCODE + .uleb128 .LENDCODE-.LcallUR + .uleb128 0 +- .uleb128 0 ++ .uleb128 0 + .Lcstend: + diff --git a/abs/core/glibc/glibc-__i686.patch b/abs/core/glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd4..0000000 --- a/abs/core/glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/abs/core/glibc/nscd b/abs/core/glibc/nscd deleted file mode 100755 index 8b14f2a..0000000 --- a/abs/core/glibc/nscd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/nscd` -case "$1" in - start) - stat_busy "Starting nscd" - # create necessary directories if they don't already exist - mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null - # remove stale files - rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null - [ -z "$PID" ] && /usr/sbin/nscd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nscd - stat_done - fi - ;; - stop) - stat_busy "Stopping nscd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nscd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/glibc/nscd.rcd b/abs/core/glibc/nscd.rcd new file mode 100755 index 0000000..4b48ab0 --- /dev/null +++ b/abs/core/glibc/nscd.rcd @@ -0,0 +1,65 @@ +#!/bin/bash + +daemon_name="nscd" + +. /etc/rc.conf +. /etc/rc.d/functions + + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + PID=$(get_pid) + if [[ -z $PID ]]; then + rm -f /run/$daemon_name.pid + mkdir -p /run/nscd /var/db/nscd + rm -f /run/nscd/* /var/db/nscd/* + $daemon_name + if (( $? > 0 )); then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + [[ -n $PID ]] && nscd --shutdown &> /dev/null + if (( $? > 0 )); then + stat_fail + exit 1 + else + rm -f /run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/abs/core/glibc/nscd.service b/abs/core/glibc/nscd.service new file mode 100644 index 0000000..de5315e --- /dev/null +++ b/abs/core/glibc/nscd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Name Service Cache Daemon +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +ExecReload=/usr/sbin/nscd -i passwd +ExecReload=/usr/sbin/nscd -i group +ExecReload=/usr/sbin/nscd -i hosts +ExecReload=/usr/sbin/nscd -i service +Restart=always +PIDFile=/run/nscd/nscd.pid + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/glibc/nscd.tmpfiles b/abs/core/glibc/nscd.tmpfiles new file mode 100644 index 0000000..8a24a78 --- /dev/null +++ b/abs/core/glibc/nscd.tmpfiles @@ -0,0 +1 @@ +d /run/nscd 0755 root root diff --git a/abs/core/glproto/PKGBUILD b/abs/core/glproto/PKGBUILD index 577864e..94976fa 100644 --- a/abs/core/glproto/PKGBUILD +++ b/abs/core/glproto/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 163853 2012-07-21 11:21:24Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=glproto -pkgver=1.4.12 +pkgver=1.4.16 pkgrel=1 pkgdesc="X11 OpenGL extension wire protocol" -arch=('i686' 'x86_64') +arch=(any) url="http://xorg.freedesktop.org/" license=('custom') source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('55edc5ff2efb734215c868f72f7cf27e') diff --git a/abs/core/gmp/PKGBUILD b/abs/core/gmp/PKGBUILD index 1a0d9c3..d0490e5 100644 --- a/abs/core/gmp/PKGBUILD +++ b/abs/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72634 2010-03-19 02:57:15Z allan $ +# $Id: PKGBUILD 158748 2012-05-09 01:14:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.5 +pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64') url="http://gmplib.org/" @@ -12,16 +12,26 @@ depends=('gcc-libs' 'sh') license=('LGPL3') options=(!libtool) install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('6bac6df75c192a13419dfd71d19240a7') +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig}) +md5sums=('8aef50959acec2a1ad41d144ffe0f3b5' + '406e8878aadc51b134d1b3dd845261ee') build() { cd "${srcdir}/${pkgname}-${pkgver}" + [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=$CHOST \ + ./configure --build=${CHOST} \ --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx || return 1 - make || return 1 - make check || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --enable-cxx + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/gmp/gmp.install b/abs/core/gmp/gmp.install index 1c31ab3..cad3354 100644 --- a/abs/core/gmp/gmp.install +++ b/abs/core/gmp/gmp.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=(gmp.info gmp.info-1 gmp.info-2) post_install() { diff --git a/abs/core/gnupg/PKGBUILD b/abs/core/gnupg/PKGBUILD new file mode 100644 index 0000000..cfc51b0 --- /dev/null +++ b/abs/core/gnupg/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 156582 2012-04-21 09:42:46Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=gnupg +pkgver=2.0.19 +pkgrel=2 +pkgdesc='Complete and free implementation of the OpenPGP standard' +url='http://www.gnupg.org/' +license=('GPL') +arch=('i686' 'x86_64') +optdepends=('curl: gpg2keys_curl' + 'libldap: gpg2keys_ldap' + 'libusb-compat: scdaemon' + 'texinfo: documentation') +makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo') +depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') +source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' + 'f6e6830610a8629b0aad69d789373bf8ca481733') + +install=install + +conflicts=('gnupg2') +provides=("gnupg2=${pkgver}") +replaces=('gnupg2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpg2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz +} diff --git a/abs/core/gnupg/install b/abs/core/gnupg/install new file mode 100644 index 0000000..3a5dc9f --- /dev/null +++ b/abs/core/gnupg/install @@ -0,0 +1,20 @@ +info_dir=/usr/share/info +info_files=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} diff --git a/abs/core/gnutls/PKGBUILD b/abs/core/gnutls/PKGBUILD index ea0c443..e6d5075 100644 --- a/abs/core/gnutls/PKGBUILD +++ b/abs/core/gnutls/PKGBUILD @@ -1,22 +1,42 @@ -# $Id: PKGBUILD 72984 2010-03-21 17:04:24Z jgc $ +# $Id: PKGBUILD 162907 2012-07-03 15:25:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.8.6 -pkgrel=4 +pkgver=3.0.21 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install -options=('libtool') -depends=('gcc-libs>=4.4.3' 'libtasn1>=2.6' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5' 'texinfo') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('eb0a6d7d3cb9ac684d971c14f9f6d3ba') +options=('!libtool' '!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') +makedepends=('valgrind' 'strace') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('7480dff7115e5af85215893c06b3ac5c' + 'c84eb5e67f1498c60ea6fd6ba9045def') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-zlib --disable-guile || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr \ + --with-zlib \ + --disable-static \ + --disable-guile \ + --disable-valgrind-tests + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check # passes all || /bin/true +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman + # gzip -9 all files in infodir and manpages manually + find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; + find "$pkgdir/usr/share/man" -exec gzip -9 {} \; } diff --git a/abs/core/gnutls/gnutls.install b/abs/core/gnutls/gnutls.install index b9a5bae..e8c8e17 100644 --- a/abs/core/gnutls/gnutls.install +++ b/abs/core/gnutls/gnutls.install @@ -1,9 +1,10 @@ -infodir=/usr/share/info -filelist=(gnutls.info gnutls.info-1 gnutls.info-2 gnutls.info-3) +infodir=usr/share/info +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + install-info $infodir/$file $infodir/dir 2> /dev/null done } @@ -12,7 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } diff --git a/abs/core/gobject-introspection/PKGBUILD b/abs/core/gobject-introspection/PKGBUILD index ce2809c..972a8a9 100644 --- a/abs/core/gobject-introspection/PKGBUILD +++ b/abs/core/gobject-introspection/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 97051 2010-10-26 08:54:52Z ibiru $ +# $Id: PKGBUILD 157399 2012-04-28 09:26:41Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=gobject-introspection -pkgver=0.9.12 -pkgrel=1 +pkgver=1.32.1 +pkgrel=2 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') -depends=('libffi>=3.0.9' 'glib2>=2.26.0' 'python2') +depends=('glib2' 'python2') makedepends=('cairo') -conflicts=('gir-repository') -replaces=('gir-repository') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make || return 1 + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" \ - "${pkgdir}"/usr/lib/gobject-introspection/giscanner/*.py + sed -i '1s|#!/usr/bin/env python$|&2|' \ + "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py } - diff --git a/abs/core/gperf/PKGBUILD b/abs/core/gperf/PKGBUILD index b7f186f..7c3ec52 100644 --- a/abs/core/gperf/PKGBUILD +++ b/abs/core/gperf/PKGBUILD @@ -1,25 +1,34 @@ -#$Id: PKGBUILD 37370 2009-05-01 06:37:35Z eric $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 140657 2011-10-17 19:09:57Z andrea $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gperf pkgver=3.0.4 -pkgrel=1 -pkgdesc="Perfect hash function generator." +pkgrel=4 +pkgdesc="Perfect hash function generator" arch=('x86_64' 'i686') url="http://www.gnu.org/software/gperf/" license=('GPL3') depends=('gcc-libs' 'texinfo') install=gperf.install -source=(ftp://ftp.gnu.org/gnu/gperf/${pkgname}-${pkgver}.tar.gz) -md5sums=('c1f1db32fb6598d6a93e6e88796a8632') +source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('e32d4aff8f0c730c9a56554377b2c6d82d0951b8' + '85b8c44964a70a63d751afa5906796a0417e64ce') +options=('!makeflags') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --docdir=/usr/share/gperf/doc/ + make } + +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - gzip ${pkgdir}/usr/share/info/gperf.info + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/gperf/gperf.install b/abs/core/gperf/gperf.install index 1c20e2f..90ac2a8 100644 --- a/abs/core/gperf/gperf.install +++ b/abs/core/gperf/gperf.install @@ -1,11 +1,9 @@ -infodir=/usr/share/info -filelist=(gperf.info.gz) +infodir=usr/share/info +file=gperf.info.gz post_install() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done + install-info $infodir/$file $infodir/dir 2> /dev/null } post_upgrade() { @@ -14,7 +12,5 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done + install-info --delete $infodir/$file $infodir/dir 2> /dev/null } diff --git a/abs/core/gpgme/PKGBUILD b/abs/core/gpgme/PKGBUILD new file mode 100644 index 0000000..8c1150e --- /dev/null +++ b/abs/core/gpgme/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 154388 2012-03-27 12:00:19Z bisson $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Sarah Hay <sarah@archlinux.org> + +pkgname=gpgme +pkgver=1.3.1 +pkgrel=4 +pkgdesc="A C wrapper library for GnuPG" +arch=('i686' 'x86_64') +url="http://www.gnupg.org/related_software/gpgme/" +license=('GPL') +depends=('libgpg-error' 'pth' 'gnupg>=2') +install=${pkgname}.install +options=('!libtool' '!emptydirs') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('90afa8436ce2b2683c001c824bd22601' + 'a032ddc27177ef4ee54e25a231e62da5') +sha1sums=('7d19a95a2239da13764dad7f97541be884ec5a37' + '93316a81a8f903c5b604716b6937884ea7b0917a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/abs/core/gpgme/gpgme.install b/abs/core/gpgme/gpgme.install new file mode 100644 index 0000000..b54620d --- /dev/null +++ b/abs/core/gpgme/gpgme.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(gpgme.info gpgme.info-1 gpgme.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/gpm/ChangeLog b/abs/core/gpm/ChangeLog deleted file mode 100644 index 847bb4d..0000000 --- a/abs/core/gpm/ChangeLog +++ /dev/null @@ -1,39 +0,0 @@ -2009-12-05 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.6-5 - * Fixed gpm.sh such that disable-paste is only run when gpm is running - -2009-12-05 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.6-4 - * Added profile for extra security on multi-user-console (close FS#17243) - * Removed the need of texinfo depends - -2009-09-20 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.6-3 - * Updated /dev/psaux to /dev/input/mice in stock config (close FS#16289) - -2009-09-20 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.6-2 - * Updated stock config and fixed rc.d script (close FS#16126) - * Removed array in install scriptlet - -2009-02-09 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.6-1 - * Upstream update - * Added info file support - -2008-06-16 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.5-1 - * Upstream update - * Added sanity checks - -2008-04-17 Eric Belanger <eric@archlinux.org> - - * gpm 1.20.3-1 - * Upstream update - * Added missing /usr/lib/libgpm.so.1 symlink (close FS#9949) diff --git a/abs/core/gpm/PKGBUILD b/abs/core/gpm/PKGBUILD index 12ecf4d..eae4b2a 100644 --- a/abs/core/gpm/PKGBUILD +++ b/abs/core/gpm/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 60782 2009-12-07 00:52:55Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 163618 2012-07-17 05:32:49Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.6 -pkgrel=5 +pkgrel=10 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') -url="http://unix.schottelius.org/gpm/" +url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') -depends=('ncurses') +depends=('ncurses' 'bash') backup=('etc/conf.d/gpm') options=('!makeflags') install=gpm.install -source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \ - gpm gpm.conf.d gpm.sh) -md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\ - '63e599950946e5f5a649432510aacf4c' 'e391fe4599ce102615f9cd449c380d41') -sha1sums=('f3bb9272878b7934968381c8b25edab359114150' '19e1feb1493373512a77801699df012d186336ea'\ - 'e483f893b4e6b9e1221a208527d728ffefe5438e' '88fe5ff10916c68a87abc8418a56eb0073f69fa9') +source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ + gpm gpm.conf.d gpm.sh gpm.service) +sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' + '19e1feb1493373512a77801699df012d186336ea' + '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' + '88fe5ff10916c68a87abc8418a56eb0073f69fa9' + '20b92360f0ad38a2032fcae37bdbd01b31e43f77') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" || return 1 - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" || return 1 - install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" + install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" + install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" + install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" # library fixes cd "${pkgdir}/usr/lib/" - ln -s libgpm.so.2.* libgpm.so || return 1 - chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* || return 1 + ln -s libgpm.so.2.* libgpm.so + chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* } diff --git a/abs/core/gpm/gpm.conf.d b/abs/core/gpm/gpm.conf.d index 9d8c981..ab43bb7 100644 --- a/abs/core/gpm/gpm.conf.d +++ b/abs/core/gpm/gpm.conf.d @@ -1,4 +1,4 @@ # # Parameters to be passed to gpm # -GPM_ARGS="-m /dev/input/mice" +GPM_ARGS="-m /dev/input/mice -t imps2" diff --git a/abs/core/gpm/gpm.service b/abs/core/gpm/gpm.service new file mode 100644 index 0000000..59e837d --- /dev/null +++ b/abs/core/gpm/gpm.service @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/grep/PKGBUILD b/abs/core/grep/PKGBUILD index 918ef58..b878e71 100644 --- a/abs/core/grep/PKGBUILD +++ b/abs/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.9 -pkgrel=1 +pkgver=2.13 +pkgrel=2 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -13,12 +13,13 @@ groups=('base') depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('25e41b2aa201104354740961ef36005a') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('5894d484e6c02249f9702d0d8a472115' + '99acaa4d45ab931be2ecba49a1766df7') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --bindir=/bin --without-included-regex + ./configure --prefix=/usr --without-included-regex make } diff --git a/abs/core/grep/grep-2.11-exclude-dir-crash.patch b/abs/core/grep/grep-2.11-exclude-dir-crash.patch new file mode 100644 index 0000000..6b17317 --- /dev/null +++ b/abs/core/grep/grep-2.11-exclude-dir-crash.patch @@ -0,0 +1,44 @@ +From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 +From: Allan McRae <allan@archlinux.org> +Date: Mon, 12 Mar 2012 09:28:01 +0100 +Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand + +* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. +* NEWS (Bug fixes): Mention it. +--- + NEWS | 5 +++++ + src/main.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index d0a63d5..d4d70f5 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ grep no longer segfaults with -r --exclude-dir and no file operand. ++ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. ++ + + * Noteworthy changes in release 2.11 (2012-03-02) [stable] + +diff --git a/src/main.c b/src/main.c +index 2f6c761..f4f1235 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) + struct stats const *ancestor; + char *name_space; + int status = 1; +- if (excluded_directory_patterns ++ if (dir && excluded_directory_patterns + && excluded_file_name (excluded_directory_patterns, dir)) + return 1; + +-- +1.7.9.3 + diff --git a/abs/core/groff/PKGBUILD b/abs/core/groff/PKGBUILD index fac0af8..f007e1d 100644 --- a/abs/core/groff/PKGBUILD +++ b/abs/core/groff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71613 2010-03-07 21:58:14Z paul $ +# $Id: PKGBUILD 142313 2011-11-08 10:57:28Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=groff -pkgver=1.20.1 -pkgrel=4 +pkgver=1.21 +pkgrel=2 pkgdesc="GNU troff text-formatting system" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gnu.org/software/groff/groff.html" license=('GPL') depends=('perl' 'gcc-libs' 'texinfo') @@ -13,16 +13,23 @@ optdepends=('netpbm: for use together with man -H command interaction in browser 'psutils: for use together with man -H command interaction in browsers') source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz site.tmac) +options=(!makeflags !docs) install=groff.install -md5sums=('48fa768dd6fdeb7968041dd5ae8e2b02' +md5sums=('8b8cd29385b97616a0f0d96d0951c5bf' 'a1fedafd7863b37968d32ad9ae1d8c13') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --without-x mkdir -p $pkgdir/usr - make -j1 || return 1 + make } + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install @@ -31,8 +38,7 @@ package() { ln -s eqn geqn ln -s tbl gtbl ln -s soelim zsoelim - rm -rf $pkgdir/usr/lib - + rm -rf $pkgdir/usr/lib/groff/site-tmac # Fix some issues when encoding to utf8 man pages # The output chars don't match keyboard chars... cat $srcdir/site.tmac >> \ diff --git a/abs/core/grub/040_all_grub-0.96-nxstack.patch b/abs/core/grub/040_all_grub-0.96-nxstack.patch deleted file mode 100644 index 121941c..0000000 --- a/abs/core/grub/040_all_grub-0.96-nxstack.patch +++ /dev/null @@ -1,623 +0,0 @@ -Fix NX segfaulting on amd64. - -Patch by Peter Jones. - -http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html - ---- grub-0.97/grub/asmstub.c -+++ grub-0.97/grub/asmstub.c -@@ -42,6 +42,7 @@ - #include <sys/time.h> - #include <termios.h> - #include <signal.h> -+#include <sys/mman.h> - - #ifdef __linux__ - # include <sys/ioctl.h> /* ioctl */ -@@ -79,7 +80,7 @@ - struct apm_info apm_bios_info; - - /* Emulation requirements. */ --char *grub_scratch_mem = 0; -+void *grub_scratch_mem = 0; - - struct geometry *disks = 0; - -@@ -103,14 +104,62 @@ - static unsigned int serial_speed; - #endif /* SIMULATE_SLOWNESS_OF_SERIAL */ - -+/* This allocates page-aligned storage of the specified size, which must be -+ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE) -+ */ -+#ifdef __linux__ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE; -+ -+#ifdef MAP_32BIT -+ mmap_flags |= MAP_32BIT; -+#endif -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0); -+} -+#else /* !defined(__linux__) */ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int fd = 0, offset = 0, ret = 0; -+ void *pa = MAP_FAILED; -+ char template[] = "/tmp/grub_mmap_alloc_XXXXXX"; -+ errno_t e; -+ -+ fd = mkstemp(template); -+ if (fd < 0) -+ return pa; -+ -+ unlink(template); -+ -+ ret = ftruncate(fd, len); -+ if (ret < 0) -+ return pa; -+ -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, -+ MAP_PRIVATE|MAP_EXECUTABLE, fd, offset); -+ -+ e = errno; -+ close(fd); -+ errno = e; -+ return pa; -+} -+#endif /* defined(__linux__) */ -+ - /* The main entry point into this mess. */ - int - grub_stage2 (void) - { - /* These need to be static, because they survive our stack transitions. */ - static int status = 0; -- static char *realstack; -- char *scratch, *simstack; -+ static void *realstack; -+ void *simstack_alloc_base, *simstack; -+ size_t simstack_size, page_size; - int i; - - /* We need a nested function so that we get a clean stack frame, -@@ -140,9 +189,35 @@ - } - - assert (grub_scratch_mem == 0); -- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15); -- assert (scratch); -- grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4); -+ -+ /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and -+ * make sure the memory is aligned to a multiple of the system's -+ * page size */ -+ page_size = sysconf (_SC_PAGESIZE); -+ simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15); -+ if (simstack_size % page_size) -+ { -+ /* If we're not on a page_size boundary, round up to the next one */ -+ simstack_size &= ~(page_size-1); -+ simstack_size += page_size; -+ } -+ -+ /* Add one for a PROT_NONE boundary page at each end. */ -+ simstack_size += 2 * page_size; -+ -+ simstack_alloc_base = grub_mmap_alloc(simstack_size); -+ assert (simstack_alloc_base != MAP_FAILED); -+ -+ /* mark pages above and below our simstack area as innaccessable. -+ * If the implementation we're using doesn't support that, then the -+ * new protection modes are undefined. It's safe to just ignore -+ * them, though. It'd be nice if we knew that we'd get a SEGV for -+ * touching the area, but that's all. it'd be nice to have. */ -+ mprotect (simstack_alloc_base, page_size, PROT_NONE); -+ mprotect ((void *)((unsigned long)simstack_alloc_base + -+ simstack_size - page_size), page_size, PROT_NONE); -+ -+ grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size); - - /* FIXME: simulate the memory holes using mprot, if available. */ - -@@ -215,7 +290,7 @@ - device_map = 0; - free (disks); - disks = 0; -- free (scratch); -+ munmap(simstack_alloc_base, simstack_size); - grub_scratch_mem = 0; - - if (serial_device) ---- grub-0.97/stage2/builtins.c -+++ grub-0.97/stage2/builtins.c -@@ -131,63 +131,98 @@ - } - - -+/* blocklist_read_helper nee disk_read_blocklist_func was a nested -+ * function, to which pointers were taken and exposed globally. Even -+ * in the GNU-C nested functions extension, they have local linkage, -+ * and aren't guaranteed to be accessable *at all* outside of their -+ * containing scope. -+ * -+ * Above and beyond all of that, the variables within blocklist_func_context -+ * are originally local variables, with local (not even static) linkage, -+ * from within blocklist_func. These were each referenced by -+ * disk_read_blocklist_func, which is only called from other functions -+ * through a globally scoped pointer. -+ * -+ * The documentation in GCC actually uses the words "all hell will break -+ * loose" to describe this scenario. -+ * -+ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn -+ * about it (possibly because of the scoping madness?) -+ */ -+ -+static struct { -+ int start_sector; -+ int num_sectors; -+ int num_entries; -+ int last_length; -+} blocklist_func_context = { -+ .start_sector = 0, -+ .num_sectors = 0, -+ .num_entries = 0, -+ .last_length = 0 -+}; -+ -+/* Collect contiguous blocks into one entry as many as possible, -+ and print the blocklist notation on the screen. */ -+static void -+blocklist_read_helper (int sector, int offset, int length) -+{ -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ int *last_length = &blocklist_func_context.last_length; -+ -+ if (*num_sectors > 0) -+ { -+ if (*start_sector + *num_sectors == sector -+ && offset == 0 && *last_length == SECTOR_SIZE) -+ { -+ *num_sectors++; -+ *last_length = length; -+ return; -+ } -+ else -+ { -+ if (*last_length == SECTOR_SIZE) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); -+ else if (*num_sectors > 1) -+ grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors-1, -+ *start_sector + *num_sectors-1 - part_start, -+ *last_length); -+ else -+ grub_printf ("%s%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *last_length); -+ *num_entries++; -+ *num_sectors = 0; -+ } -+ } -+ -+ if (offset > 0) -+ { -+ grub_printf("%s%d[%d-%d]", *num_entries ? "," : "", -+ sector-part_start, offset, offset+length); -+ *num_entries++; -+ } -+ else -+ { -+ *start_sector = sector; -+ *num_sectors = 1; -+ *last_length = length; -+ } -+} -+ - /* blocklist */ - static int - blocklist_func (char *arg, int flags) - { - char *dummy = (char *) RAW_ADDR (0x100000); -- int start_sector; -- int num_sectors = 0; -- int num_entries = 0; -- int last_length = 0; -- -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Collect contiguous blocks into one entry as many as possible, -- and print the blocklist notation on the screen. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (num_sectors > 0) -- { -- if (start_sector + num_sectors == sector -- && offset == 0 && last_length == SECTOR_SIZE) -- { -- num_sectors++; -- last_length = length; -- return; -- } -- else -- { -- if (last_length == SECTOR_SIZE) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -- else if (num_sectors > 1) -- grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, num_sectors-1, -- start_sector + num_sectors-1 - part_start, -- last_length); -- else -- grub_printf ("%s%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, last_length); -- num_entries++; -- num_sectors = 0; -- } -- } -- -- if (offset > 0) -- { -- grub_printf("%s%d[%d-%d]", num_entries ? "," : "", -- sector-part_start, offset, offset+length); -- num_entries++; -- } -- else -- { -- start_sector = sector; -- num_sectors = 1; -- last_length = length; -- } -- } - -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ - /* Open the file. */ - if (! grub_open (arg)) - return 1; -@@ -204,15 +241,15 @@ - grub_printf (")"); - - /* Read in the whole file to DUMMY. */ -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = blocklist_read_helper; - if (! grub_read (dummy, -1)) - goto fail; - - /* The last entry may not be printed yet. Don't check if it is a - * full sector, since it doesn't matter if we read too much. */ -- if (num_sectors > 0) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -+ if (*num_sectors > 0) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); - - grub_printf ("\n"); - -@@ -1868,6 +1905,77 @@ - - - /* install */ -+static struct { -+ int saved_sector; -+ int installaddr; -+ int installlist; -+ char *stage2_first_buffer; -+} install_func_context = { -+ .saved_sector = 0, -+ .installaddr = 0, -+ .installlist = 0, -+ .stage2_first_buffer = NULL, -+}; -+ -+/* Save the first sector of Stage2 in STAGE2_SECT. */ -+/* Formerly disk_read_savesect_func with local scope inside install_func */ -+static void -+install_savesect_helper(int sector, int offset, int length) -+{ -+ if (debug) -+ printf ("[%d]", sector); -+ -+ /* ReiserFS has files which sometimes contain data not aligned -+ on sector boundaries. Returning an error is better than -+ silently failing. */ -+ if (offset != 0 || length != SECTOR_SIZE) -+ errnum = ERR_UNALIGNED; -+ -+ install_func_context.saved_sector = sector; -+} -+ -+/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */ -+/* Formerly disk_read_blocklist_func with local scope inside install_func */ -+static void -+install_blocklist_helper (int sector, int offset, int length) -+{ -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* Was the last sector full? */ -+ static int last_length = SECTOR_SIZE; -+ -+ if (debug) -+ printf("[%d]", sector); -+ -+ if (offset != 0 || last_length != SECTOR_SIZE) -+ { -+ /* We found a non-sector-aligned data block. */ -+ errnum = ERR_UNALIGNED; -+ return; -+ } -+ -+ last_length = length; -+ -+ if (*((unsigned long *) (*installlist - 4)) -+ + *((unsigned short *) *installlist) != sector -+ || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4) -+ { -+ *installlist -= 8; -+ -+ if (*((unsigned long *) (*installlist - 8))) -+ errnum = ERR_WONT_FIT; -+ else -+ { -+ *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4); -+ *((unsigned long *) (*installlist - 4)) = sector; -+ } -+ } -+ -+ *((unsigned short *) *installlist) += 1; -+ *installaddr += 512; -+} -+ - static int - install_func (char *arg, int flags) - { -@@ -1875,8 +1983,12 @@ - char *stage1_buffer = (char *) RAW_ADDR (0x100000); - char *stage2_buffer = stage1_buffer + SECTOR_SIZE; - char *old_sect = stage2_buffer + SECTOR_SIZE; -- char *stage2_first_buffer = old_sect + SECTOR_SIZE; -- char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; -+ /* stage2_first_buffer used to be defined as: -+ * char *stage2_first_buffer = old_sect + SECTOR_SIZE; */ -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* and stage2_second_buffer was: -+ * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */ -+ char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE; - /* XXX: Probably SECTOR_SIZE is reasonable. */ - char *config_filename = stage2_second_buffer + SECTOR_SIZE; - char *dummy = config_filename + SECTOR_SIZE; -@@ -1885,10 +1997,11 @@ - int src_drive, src_partition, src_part_start; - int i; - struct geometry dest_geom, src_geom; -- int saved_sector; -+ int *saved_sector = &install_func_context.saved_sector; - int stage2_first_sector, stage2_second_sector; - char *ptr; -- int installaddr, installlist; -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; - /* Point to the location of the name of a configuration file in Stage 2. */ - char *config_file_location; - /* If FILE is a Stage 1.5? */ -@@ -1897,67 +2010,13 @@ - int is_open = 0; - /* If LBA is forced? */ - int is_force_lba = 0; -- /* Was the last sector full? */ -- int last_length = SECTOR_SIZE; -- -+ -+ *stage2_first_buffer = old_sect + SECTOR_SIZE; - #ifdef GRUB_UTIL - /* If the Stage 2 is in a partition mounted by an OS, this will store - the filename under the OS. */ - char *stage2_os_file = 0; - #endif /* GRUB_UTIL */ -- -- auto void disk_read_savesect_func (int sector, int offset, int length); -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Save the first sector of Stage2 in STAGE2_SECT. */ -- auto void disk_read_savesect_func (int sector, int offset, int length) -- { -- if (debug) -- printf ("[%d]", sector); -- -- /* ReiserFS has files which sometimes contain data not aligned -- on sector boundaries. Returning an error is better than -- silently failing. */ -- if (offset != 0 || length != SECTOR_SIZE) -- errnum = ERR_UNALIGNED; -- -- saved_sector = sector; -- } -- -- /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and -- INSTALLSECT. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (debug) -- printf("[%d]", sector); -- -- if (offset != 0 || last_length != SECTOR_SIZE) -- { -- /* We found a non-sector-aligned data block. */ -- errnum = ERR_UNALIGNED; -- return; -- } -- -- last_length = length; -- -- if (*((unsigned long *) (installlist - 4)) -- + *((unsigned short *) installlist) != sector -- || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4) -- { -- installlist -= 8; -- -- if (*((unsigned long *) (installlist - 8))) -- errnum = ERR_WONT_FIT; -- else -- { -- *((unsigned short *) (installlist + 2)) = (installaddr >> 4); -- *((unsigned long *) (installlist - 4)) = sector; -- } -- } -- -- *((unsigned short *) installlist) += 1; -- installaddr += 512; -- } - - /* First, check the GNU-style long option. */ - while (1) -@@ -1987,10 +2049,10 @@ - addr = skip_to (0, file); - - /* Get the installation address. */ -- if (! safe_parse_maxint (&addr, &installaddr)) -+ if (! safe_parse_maxint (&addr, installaddr)) - { - /* ADDR is not specified. */ -- installaddr = 0; -+ *installaddr = 0; - ptr = addr; - errnum = 0; - } -@@ -2084,17 +2146,17 @@ - = (dest_drive & BIOS_FLAG_FIXED_DISK); - - /* Read the first sector of Stage 2. */ -- disk_read_hook = disk_read_savesect_func; -- if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) -+ disk_read_hook = install_savesect_helper; -+ if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_first_sector = saved_sector; -+ stage2_first_sector = *saved_sector; - - /* Read the second sector of Stage 2. */ - if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_second_sector = saved_sector; -+ stage2_second_sector = *saved_sector; - - /* Check for the version of Stage 2. */ - if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS)) -@@ -2110,27 +2172,27 @@ - - /* If INSTALLADDR is not specified explicitly in the command-line, - determine it by the Stage 2 id. */ -- if (! installaddr) -+ if (! *installaddr) - { - if (! is_stage1_5) - /* Stage 2. */ -- installaddr = 0x8000; -+ *installaddr = 0x8000; - else - /* Stage 1.5. */ -- installaddr = 0x2000; -+ *installaddr = 0x2000; - } - - *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR)) - = stage2_first_sector; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS)) -- = installaddr; -+ = *installaddr; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT)) -- = installaddr >> 4; -+ = *installaddr >> 4; - -- i = (int) stage2_first_buffer + SECTOR_SIZE - 4; -+ i = (int) *stage2_first_buffer + SECTOR_SIZE - 4; - while (*((unsigned long *) i)) - { -- if (i < (int) stage2_first_buffer -+ if (i < (int) *stage2_first_buffer - || (*((int *) (i - 4)) & 0x80000000) - || *((unsigned short *) i) >= 0xA00 - || *((short *) (i + 2)) == 0) -@@ -2144,13 +2206,13 @@ - i -= 8; - } - -- installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4; -- installaddr += SECTOR_SIZE; -+ *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4; -+ *installaddr += SECTOR_SIZE; - - /* Read the whole of Stage2 except for the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = install_blocklist_helper; - if (! grub_read (dummy, -1)) - goto fail; - -@@ -2233,7 +2295,7 @@ - /* Skip the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_savesect_func; -+ disk_read_hook = install_savesect_helper; - if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -@@ -2303,7 +2365,7 @@ - else - #endif /* GRUB_UTIL */ - { -- if (! devwrite (saved_sector - part_start, 1, stage2_buffer)) -+ if (! devwrite (*saved_sector - part_start, 1, stage2_buffer)) - goto fail; - } - } -@@ -2325,7 +2387,7 @@ - goto fail; - } - -- if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) -+ if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) - { - fclose (fp); - errnum = ERR_WRITE; -@@ -2352,7 +2414,7 @@ - goto fail; - - if (! devwrite (stage2_first_sector - src_part_start, 1, -- stage2_first_buffer)) -+ *stage2_first_buffer)) - goto fail; - - if (! devwrite (stage2_second_sector - src_part_start, 1, ---- grub-0.97/stage2/shared.h -+++ grub-0.97/stage2/shared.h -@@ -36,8 +36,8 @@ - - /* Maybe redirect memory requests through grub_scratch_mem. */ - #ifdef GRUB_UTIL --extern char *grub_scratch_mem; --# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem) -+extern void *grub_scratch_mem; -+# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem) - # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4) - #else - # define RAW_ADDR(x) (x) diff --git a/abs/core/grub/05-grub-0.97-initrdaddr.diff b/abs/core/grub/05-grub-0.97-initrdaddr.diff deleted file mode 100644 index ccf5f3e..0000000 --- a/abs/core/grub/05-grub-0.97-initrdaddr.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- grub-0.96/stage2/boot.c -+++ grub-0.96/stage2/boot.c -@@ -824,8 +824,11 @@ - moveto = (mbi.mem_upper + 0x400) << 10; - - moveto = (moveto - len) & 0xfffff000; -- max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203 -- ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS); -+ max_addr = LINUX_INITRD_MAX_ADDRESS; -+ if (lh->header == LINUX_MAGIC_SIGNATURE && -+ lh->version >= 0x0203 && -+ lh->initrd_addr_max < max_addr) -+ max_addr = lh->initrd_addr_max; - if (moveto + len >= max_addr) - moveto = (max_addr - len) & 0xfffff000; - diff --git a/abs/core/grub/20_memtest86+ b/abs/core/grub/20_memtest86+ new file mode 100644 index 0000000..1d3096f --- /dev/null +++ b/abs/core/grub/20_memtest86+ @@ -0,0 +1,29 @@ +#! /bin/sh -e +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix="/usr" +exec_prefix="${prefix}" + +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then + # image exists, create menu entry + echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 + cat << EOF +menuentry "Memory test (memtest86+)" $CLASS { +EOF + prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" + cat << EOF + linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` +} +EOF +fi diff --git a/abs/core/grub/PKGBUILD b/abs/core/grub/PKGBUILD index 38c6a28..1bf094b 100644 --- a/abs/core/grub/PKGBUILD +++ b/abs/core/grub/PKGBUILD @@ -1,75 +1,249 @@ -# $Id: PKGBUILD 22874 2008-12-29 18:25:08Z tpowa $ # Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -pkgname=grub -pkgver=0.97 -pkgrel=31 -pkgdesc="A GNU multiboot boot loader" +_grub_lua_ver=24 +_grub_ntldr_ver=21 +_grub_915_ver=9 + +pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') +pkgbase=grub +pkgver=2.00 +pkgrel=1 +url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/grub/" -groups=('base') -depends=('ncurses' 'diffutils' 'sed') -source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz - menu.lst - install-grub - 040_all_grub-0.96-nxstack.patch - 05-grub-0.97-initrdaddr.diff - i2o.patch - special-devices.patch - more-raid.patch - intelmac.patch - grub-inode-size.patch - ext4.patch) -backup=('boot/grub/menu.lst') -install=grub.install +license=('GPL3') +makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python2' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') + +source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" + 'archlinux_grub_mkconfig_fixes.patch' + 'grub.default' + 'grub.cfg' + '20_memtest86+' + 'grub_bzr_export.sh') + +noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") + +sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' + '89290031b974780c6df76893836d2477d4add895' + 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' + 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' + '26e4e946190bea1f03632658cf08ba90e11dec57' + 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5' + '76ae862a945a8848e6999adf8ad1847f0f7008b9' + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' + '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') + +_build_grub-common_and_bios() { + + ## copy the source for building the common/bios package + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}" + cd "${srcdir}/grub_bios-${pkgver}" + #sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h + ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs + patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" + echo + + ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files + sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" + + ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" + + ## add the grub-extra sources + export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/" + install -d "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + + ## Requires python2 + sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh" + + ## start the actual build process + cd "${srcdir}/grub_bios-${pkgver}" + ./autogen.sh + echo + + CFLAGS="" ./configure \ + --with-platform="pc" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + "${_EFIEMU}" \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + echo + + CFLAGS="" make + echo + +} + +_build_grub-efi-i386() { + + ## copy the source for building the efi package + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}" + cd "${srcdir}/grub_efi-${pkgver}" + #sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h + export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/" + install -d "${srcdir}/grub_efi-${pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_efi-${pkgver}/grub-extras" + + cd "${srcdir}/grub_efi-${pkgver}" + ./autogen.sh + echo + + CFLAGS="" ./configure \ + --with-platform="efi" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + --disable-efiemu \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + echo + + CFLAGS="" make + echo + +} build() { - cd $srcdir/$pkgname-$pkgver - - #set destination architecture here - DESTARCH="i686" - #DESTARCH="x86_64" - # optimizations break the build -- disable them - # adding special devices to grub, patches are from fedora - patch -Np1 -i ../special-devices.patch || return 1 - patch -Np1 -i ../i2o.patch || return 1 - patch -Np1 -i ../more-raid.patch || return 1 - patch -Np1 -i ../intelmac.patch || return 1 - # Add support for bigger inode size to e2fs_stage1_5 - patch -Np1 -i ../grub-inode-size.patch || return 1 - # Add ext4 support - # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html - patch -Np1 -i ../ext4.patch || return 1 - - #arch64 fixes for static build - if [ "$CARCH" = "x86_64" ]; then - echo "this package has to be built on i686, won't compile on x86_64" - sleep 5 - else - if [ "$DESTARCH" = "x86_64" ]; then - # patch from gentoo for fixing a segfault - patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1 - # patch from frugalware to make it boot when more than 2GB ram installed - patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1 - CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ - --mandir=/usr/share/man --infodir=/usr/share/info - else - CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ - --mandir=/usr/share/man --infodir=/usr/share/info - fi - fi - - CFLAGS= make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst - install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub - - rm -f $pkgdir/usr/share/info/dir || return 1 - gzip /$pkgdir/usr/share/info/* - - if [ "$DESTARCH" = "x86_64" ]; then - # fool makepkg into building a x86_64 package - export CARCH="x86_64" - fi + + ## set architecture dependent variables + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + _HOST="${CARCH}" + + cd "${srcdir}/grub-${pkgver}" + # _get_locale_files + sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h + _build_grub-common_and_bios + echo + + _build_grub-efi-i386 + echo + +} + +package_grub-common() { + + pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files" + depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') + conflicts=('grub-legacy' 'grub') + replaces=('grub2-common') + provides=('grub2-common') + backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') + optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: for grub-mkrescue FAT FS support') + install="grub.install" + options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') + + cd "${srcdir}/grub_bios-${pkgver}" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + echo + + ## install extra /etc/grub.d/ files + install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + + ## install /etc/default/grub (used by grub-mkconfig) + install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + + ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) + install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" + + # remove platform specific files + rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" + +} + +package_grub-bios() { + + pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules" + depends=("grub-common=${pkgver}") + options=('!strip' '!emptydirs') + replaces=('grub2-bios') + provides=('grub2-bios') + + cd "${srcdir}/grub_bios-${pkgver}" + make DESTDIR="${pkgdir}/" install + echo + + ## remove non platform-specific files + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + +} + +package_grub-efi-i386() { + + pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules" + depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr') + options=('!strip' '!emptydirs') + replaces=('grub2-efi-i386') + provides=('grub2-efi-i386') + + cd "${srcdir}/grub_efi-${pkgver}" + make DESTDIR="${pkgdir}/" install + echo + + ## remove non platform-specific files + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + } diff --git a/abs/core/grub/__changelog b/abs/core/grub/__changelog new file mode 100644 index 0000000..0be82a4 --- /dev/null +++ b/abs/core/grub/__changelog @@ -0,0 +1 @@ + -e '/gets is a security/d' grub-core/gnulib/stdio.in.h diff --git a/abs/core/grub/archlinux_grub_mkconfig_fixes.patch b/abs/core/grub/archlinux_grub_mkconfig_fixes.patch new file mode 100644 index 0000000..c8bd3e4 --- /dev/null +++ b/abs/core/grub/archlinux_grub_mkconfig_fixes.patch @@ -0,0 +1,143 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 516be86..5f37db2 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 765bfdc..b148558 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -115,6 +115,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 14402e8..64c9bb5 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -87,6 +87,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -100,7 +102,7 @@ linux_entry () + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | sed -e "s/^/\t/" + fi + +@@ -132,7 +134,8 @@ linux_entry () + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ ++ message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$message' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + ++ if test -e "/etc/arch-release" ; then ++ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then ++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" ++ ++ if [ "x${version}" = "x" ] ; then ++ version="core repo kernel" ++ else ++ version="`echo "${version}" | sed -e 's,-,,g'`" ++ version="${version} kernel" ++ fi ++ fi ++ fi ++ + initrd= ++ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" ++ + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ +@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ +- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ ++ "${initrd_arch}.img" ; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break +@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do + linux_root_device_thisversion=${GRUB_DEVICE} + fi + ++ if test -e "/etc/arch-release" ; then ++ is_first_entry="false" ++ ++ linux_entry "${OS}" "${version}" true \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do ++ if test -e "${dirname}/${i}" ; then ++ initrd="${i}" ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ break ++ fi ++ done ++ fi ++ + if [ "x$is_first_entry" = xtrue ]; then + linux_entry "${OS}" "${version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" +@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + fi + ++ if ! test -e "/etc/arch-release" ; then + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +@@ -252,8 +290,10 @@ done + + # If at least one kernel was found, then we need to + # add a closing '}' for the submenu command. ++if ! test -e "/etc/arch-release" ; then + if [ x"$is_first_entry" != xtrue ]; then + echo '}' + fi ++fi + + echo "$title_correction_code" diff --git a/abs/core/grub/ext4.patch b/abs/core/grub/ext4.patch deleted file mode 100644 index 8a2f9bd..0000000 --- a/abs/core/grub/ext4.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -ruNp grub-0.97/stage2/fsys_ext2fs.c grub-0.97-patch/stage2/fsys_ext2fs.c ---- grub-0.97/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ grub-0.97-patch/stage2/fsys_ext2fs.c 2007-12-29 16:25:19.000000000 -+0100 -@@ -51,6 +51,9 @@ typedef unsigned int __u32; - #define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) - #define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -+/* Inode flags */ -+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ -+ - /* include/linux/ext2_fs.h */ - struct ext2_super_block - { -@@ -191,6 +194,42 @@ struct ext2_dir_entry - #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ - ~EXT2_DIR_ROUND) - -+/* linux/ext4_fs_extents.h */ -+/* -+ * This is the extent on-disk structure. -+ * It's used at the bottom of the tree. -+ */ -+struct ext4_extent { -+ __u32 ee_block; /* first logical block extent covers */ -+ __u16 ee_len; /* number of blocks covered by extent */ -+ __u16 ee_start_hi; /* high 16 bits of physical block */ -+ __u32 ee_start; /* low 32 bits of physical block */ -+}; -+ -+/* -+ * This is index on-disk structure. -+ * It's used at all the levels except the bottom. -+ */ -+struct ext4_extent_idx { -+ __u32 ei_block; /* index covers logical blocks from 'block' */ -+ __u32 ei_leaf; /* pointer to the physical block of the next * -+ * level. leaf or next index could be there */ -+ __u16 ei_leaf_hi; /* high 16 bits of physical block */ -+ __u16 ei_unused; -+}; -+ -+/* -+ * Each block (leaves and indexes), even inode-stored has header. -+ */ -+struct ext4_extent_header { -+ __u16 eh_magic; /* probably will support different formats */ -+ __u16 eh_entries; /* number of valid entries */ -+ __u16 eh_max; /* capacity of store in entries */ -+ __u16 eh_depth; /* has tree real underlying blocks? */ -+ __u32 eh_generation; /* generation of the tree */ -+}; -+ -+#define EXT4_EXT_MAGIC 0xf30a - - /* ext2/super.c */ - #define log2(n) ffz(~(n)) -@@ -279,6 +318,26 @@ ext2_rdfsb (int fsblock, int buffer) - EXT2_BLOCK_SIZE (SUPERBLOCK), (char *) buffer); - } - -+/* Walk through extents index tree to find the good leaf */ -+static struct ext4_extent_header * -+ext4_recurse_extent_index(struct ext4_extent_header *extent_block, int logical_block) -+{ -+ int i; -+ struct ext4_extent_idx *index = (struct ext4_extent_idx *) (extent_block + 1); -+ if (extent_block->eh_magic != EXT4_EXT_MAGIC) -+ return NULL; -+ if (extent_block->eh_depth == 0) -+ return extent_block; -+ for (i = 0; i < extent_block->eh_entries; i++) -+ { -+ if (logical_block < index[i].ei_block) -+ break; -+ } -+ if (i == 0 || !ext2_rdfsb(index[i-1].ei_leaf, DATABLOCK1)) -+ return NULL; -+ return (ext4_recurse_extent_index((struct ext4_extent_header *) DATABLOCK1, logical_block)); -+} -+ - /* from - ext2/inode.c:ext2_bmap() - */ ---- grub-0.97/stage2/fsys_ext2fs.c~ 2008-12-28 20:19:00.000000000 +0100 -+++ grub-0.97/stage2/fsys_ext2fs.c 2008-12-28 20:19:00.000000000 +0100 -@@ -366,83 +366,106 @@ - } - printf ("logical block %d\n", logical_block); - #endif /* E2DEBUG */ -- -- /* if it is directly pointed to by the inode, return that physical addr */ -- if (logical_block < EXT2_NDIR_BLOCKS) -- { --#ifdef E2DEBUG -- printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -- printf ("returning %d\n", INODE->i_block[logical_block]); --#endif /* E2DEBUG */ -- return INODE->i_block[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_NDIR_BLOCKS; -- /* try the indirect block */ -- if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ /* standard ext2 inode */ -+ if (!(INODE->i_flags & EXT4_EXTENTS_FL)) - { -- if (mapblock1 != 1 -- && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 1; -- return ((__u32 *) DATABLOCK1)[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -- /* now try the double indirect block */ -- if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -- { -- int bnum; -- if (mapblock1 != 2 -- && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 2; -- if ((bnum = (((__u32 *) DATABLOCK1) -- [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -- != mapblock2 -- && !ext2_rdfsb (bnum, DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock2 = bnum; -+ /* if it is directly pointed to by the inode, return that physical addr */ -+ if (logical_block < EXT2_NDIR_BLOCKS) -+ { -+#ifdef E2DEBUG -+ printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -+ printf ("returning %d\n", INODE->i_block[logical_block]); -+#endif /* E2DEBUG */ -+ return INODE->i_block[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_NDIR_BLOCKS; -+ /* try the indirect block */ -+ if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ { -+ if (mapblock1 != 1 -+ && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 1; -+ return ((__u32 *) DATABLOCK1)[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -+ /* now try the double indirect block */ -+ if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -+ { -+ int bnum; -+ if (mapblock1 != 2 -+ && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 2; -+ if ((bnum = (((__u32 *) DATABLOCK1) -+ [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -+ != mapblock2 -+ && !ext2_rdfsb (bnum, DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock2 = bnum; -+ return ((__u32 *) DATABLOCK2) -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -+ } -+ /* else */ -+ mapblock2 = -1; -+ logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -+ if (mapblock1 != 3 -+ && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 3; -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -+ [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -+ * 2)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -+ [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -+ & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } - return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -- } -- /* else */ -- mapblock2 = -1; -- logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -- if (mapblock1 != 3 -- && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } -- mapblock1 = 3; -- if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -- [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -- * 2)], -- DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -- [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -- & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -- DATABLOCK2)) -+ /* inode is in extents format */ -+ else - { -+ int i; -+ struct ext4_extent_header *extent_hdr = ext4_recurse_extent_index((struct ext4_extent_header *) INODE->i_block, logical_block); -+ struct ext4_extent *extent = (struct ext4_extent *) (extent_hdr + 1); -+ if ( extent_hdr == NULL || extent_hdr->eh_magic != EXT4_EXT_MAGIC) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ for (i = 0; i<extent_hdr->eh_entries; i++) -+ { -+ if (extent[i].ee_block <= logical_block && logical_block < extent[i].ee_block + extent[i].ee_len && !(extent[i].ee_len>>15)) -+ return (logical_block - extent[i].ee_block + extent[i].ee_start); -+ } -+ /* We should not arrive here */ - errnum = ERR_FSYS_CORRUPT; - return -1; - } -- return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } - - /* preconditions: all preconds of ext2fs_block_map */ diff --git a/abs/core/grub/grub-0.97-gpt.patch b/abs/core/grub/grub-0.97-gpt.patch deleted file mode 100644 index 7b1a55c..0000000 --- a/abs/core/grub/grub-0.97-gpt.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/builtins.c grub-0.96-patched/stage2/builtins.c ---- grub-0.96/stage2/builtins.c 2004-06-20 09:33:04.000000000 -0400 -+++ grub-0.96-patched/stage2/builtins.c 2007-01-04 13:56:06.000000000 -0500 -@@ -1229,14 +1229,15 @@ - for (drive = 0x80; drive < 0x88; drive++) - { - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int type, entry; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int type, entry, gpt_count, gpt_size; - char buf[SECTOR_SIZE]; - - current_drive = drive; - while (next_partition (drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, buf)) -+ &ext_offset, &gpt_offset, -+ &gpt_count, &gpt_size, buf)) - { - if (type != PC_SLICE_TYPE_NONE - && ! IS_PC_SLICE_TYPE_BSD (type) -@@ -2806,8 +2807,8 @@ - { - int new_type; - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int entry, type; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int entry, type, gpt_count, gpt_size; - char mbr[512]; - - /* Get the drive and the partition. */ -@@ -2844,7 +2845,14 @@ - /* Look for the partition. */ - while (next_partition (current_drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, mbr)) -+ &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) -+ /* The partition may not be a GPT partition. */ -+ if (gpt_offset != 0) -+ { -+ errnum = ERR_BAD_ARGUMENT; -+ return 1; -+ } -+ - { - if (part == current_partition) - { -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/disk_io.c grub-0.96-patched/stage2/disk_io.c ---- grub-0.96/stage2/disk_io.c 2004-05-23 12:35:24.000000000 -0400 -+++ grub-0.96-patched/stage2/disk_io.c 2007-01-04 14:01:08.000000000 -0500 -@@ -21,6 +21,7 @@ - - #include <shared.h> - #include <filesys.h> -+#include <gpt.h> - - #ifdef SUPPORT_NETBOOT - # define GRUB 1 -@@ -502,8 +503,8 @@ - set_partition_hidden_flag (int hidden) - { - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int entry, type; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int entry, type, gpt_count, gpt_size; - char mbr[512]; - - /* The drive must be a hard disk. */ -@@ -524,7 +525,14 @@ - /* Look for the partition. */ - while (next_partition (current_drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, mbr)) -+ &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) -+ /* The partition may not be a GPT partition. */ -+ if (gpt_offset != 0) -+ { -+ errnum = ERR_BAD_ARGUMENT; -+ return 1; -+ } -+ - { - if (part == current_partition) - { -@@ -577,11 +585,14 @@ - unsigned long *partition, int *type, - unsigned long *start, unsigned long *len, - unsigned long *offset, int *entry, -- unsigned long *ext_offset, char *buf) -+ unsigned long *ext_offset, -+ unsigned long *gpt_offset, int *gpt_count, -+ int *gpt_size, char *buf) - { - /* Forward declarations. */ - auto int next_bsd_partition (void); - auto int next_pc_slice (void); -+ auto int next_gpt_slice(void); - - /* Get next BSD partition in current PC slice. */ - int next_bsd_partition (void) -@@ -666,6 +677,40 @@ - return 0; - } - -+ /* If this is a GPT partition table, read it as such. */ -+ if (*entry == -1 && *offset == 0 && PC_SLICE_TYPE (buf, 0) == PC_SLICE_TYPE_GPT) -+ { -+ struct grub_gpt_header *hdr = (struct grub_gpt_header *) buf; -+ -+ /* Read in the GPT Partition table header. */ -+ if (! rawread (drive, 1, 0, SECTOR_SIZE, buf)) -+ return 0; -+ -+ if (hdr->magic == GPT_HEADER_MAGIC && hdr->version == 0x10000) -+ { -+ /* Let gpt_offset point to the first entry in the GPT -+ partition table. This can also be used by callers of -+ next_partition to determine if a entry comes from a -+ GPT partition table or not. */ -+ *gpt_offset = hdr->partitions; -+ *gpt_count = hdr->maxpart; -+ *gpt_size = hdr->partentry_size; -+ -+ return next_gpt_slice(); -+ } -+ else -+ { -+ /* This is not a valid header for a GPT partition table. -+ Re-read the MBR or the boot sector of the extended -+ partition. */ -+ if (! rawread (drive, *offset, 0, SECTOR_SIZE, buf)) -+ return 0; -+ } -+ } -+ -+ /* Not a GPT partition. */ -+ *gpt_offset = 0; -+ - /* Increase the entry number. */ - (*entry)++; - -@@ -710,6 +755,43 @@ - return 1; - } - -+ /* Get the next GPT slice. */ -+ int next_gpt_slice (void) -+ { -+ struct grub_gpt_partentry *gptentry = (struct grub_gpt_partentry *) buf; -+ /* Make GPT partitions show up as PC slices. */ -+ int pc_slice_no = (*partition & 0xFF0000) >> 16; -+ -+ /* If this is the first time... */ -+ if (pc_slice_no == 0xFF) -+ { -+ pc_slice_no = -1; -+ *entry = -1; -+ } -+ -+ do { -+ (*entry)++; -+ -+ if (*entry >= *gpt_count) -+ { -+ errnum = ERR_NO_PART; -+ return 0; -+ } -+ /* Read in the GPT Partition table entry. */ -+ if (! rawread (drive, (*gpt_offset) + GPT_ENTRY_SECTOR (*gpt_size, *entry), GPT_ENTRY_INDEX (*gpt_size, *entry), *gpt_size, buf)) -+ return 0; -+ } while (! (gptentry->type1 && gptentry->type2)); -+ -+ pc_slice_no++; -+ *start = gptentry->start; -+ *len = gptentry->end - gptentry->start + 1; -+ *type = PC_SLICE_TYPE_EXT2FS; -+ *entry = pc_slice_no; -+ *partition = (*entry << 16) | 0xFFFF; -+ -+ return 1; -+ } -+ - /* Start the body of this function. */ - - #ifndef STAGE1_5 -@@ -717,6 +799,9 @@ - return 0; - #endif - -+ if (*partition != 0xFFFFFF && *gpt_offset != 0) -+ return next_gpt_slice (); -+ - /* If previous partition is a BSD partition or a PC slice which - contains BSD partitions... */ - if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff)) -@@ -755,6 +840,9 @@ - unsigned long dest_partition = current_partition; - unsigned long part_offset; - unsigned long ext_offset; -+ unsigned long gpt_offset; -+ int gpt_count; -+ int gpt_size; - int entry; - char buf[SECTOR_SIZE]; - int bsd_part, pc_slice; -@@ -766,7 +854,8 @@ - int ret = next_partition (current_drive, dest_partition, - ¤t_partition, ¤t_slice, - &part_start, &part_length, -- &part_offset, &entry, &ext_offset, buf); -+ &part_offset, &entry, &ext_offset, -+ &gpt_offset, &gpt_count, &gpt_size, buf); - bsd_part = (current_partition >> 8) & 0xFF; - pc_slice = current_partition >> 16; - return ret; -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/gpt.h grub-0.96-patched/stage2/gpt.h ---- grub-0.96/stage2/gpt.h 1969-12-31 19:00:00.000000000 -0500 -+++ grub-0.96-patched/stage2/gpt.h 2007-01-04 13:52:14.000000000 -0500 -@@ -0,0 +1,68 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2002,2005,2006 Free Software Foundation, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef _GPT_H -+#define _GPT_H -+ -+typedef signed char grub_int8_t; -+typedef signed short grub_int16_t; -+typedef signed int grub_int32_t; -+typedef signed long long int grub_int64_t; -+typedef unsigned char grub_uint8_t; -+typedef unsigned short grub_uint16_t; -+typedef unsigned int grub_uint32_t; -+typedef unsigned long long int grub_uint64_t; -+ -+struct grub_gpt_header -+{ -+ grub_uint64_t magic; -+ grub_uint32_t version; -+ grub_uint32_t headersize; -+ grub_uint32_t crc32; -+ grub_uint32_t unused1; -+ grub_uint64_t primary; -+ grub_uint64_t backup; -+ grub_uint64_t start; -+ grub_uint64_t end; -+ grub_uint8_t guid[16]; -+ grub_uint64_t partitions; -+ grub_uint32_t maxpart; -+ grub_uint32_t partentry_size; -+ grub_uint32_t partentry_crc32; -+} __attribute__ ((packed)); -+ -+struct grub_gpt_partentry -+{ -+ grub_uint64_t type1; -+ grub_uint64_t type2; -+ grub_uint8_t guid[16]; -+ grub_uint64_t start; -+ grub_uint64_t end; -+ grub_uint8_t attrib; -+ char name[72]; -+} __attribute__ ((packed)); -+ -+#define GPT_HEADER_MAGIC 0x5452415020494645UL -+ -+#define GPT_ENTRY_SECTOR(size,entry) \ -+ ((((entry) * (size) + 1) & ~(SECTOR_SIZE - 1)) >> SECTOR_BITS) -+#define GPT_ENTRY_INDEX(size,entry) \ -+ ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1) -+ -+#endif /* _GPT_H */ -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/pc_slice.h grub-0.96-patched/stage2/pc_slice.h ---- grub-0.96/stage2/pc_slice.h 2003-07-09 07:45:53.000000000 -0400 -+++ grub-0.96-patched/stage2/pc_slice.h 2007-01-04 13:52:14.000000000 -0500 -@@ -115,6 +115,7 @@ - #define PC_SLICE_TYPE_LINUX_EXTENDED 0x85 - #define PC_SLICE_TYPE_VSTAFS 0x9e - #define PC_SLICE_TYPE_DELL_UTIL 0xde -+#define PC_SLICE_TYPE_GPT 0xee - #define PC_SLICE_TYPE_LINUX_RAID 0xfd - - -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/shared.h grub-0.96-patched/stage2/shared.h ---- grub-0.96/stage2/shared.h 2004-06-19 12:40:09.000000000 -0400 -+++ grub-0.96-patched/stage2/shared.h 2007-01-04 13:52:15.000000000 -0500 -@@ -934,7 +934,9 @@ - unsigned long *partition, int *type, - unsigned long *start, unsigned long *len, - unsigned long *offset, int *entry, -- unsigned long *ext_offset, char *buf); -+ unsigned long *ext_offset, -+ unsigned long *gpt_offset, int *gpt_count, -+ int *gpt_size, char *buf); - - /* Sets device to the one represented by the SAVED_* parameters. */ - int make_saved_active (void); diff --git a/abs/core/grub/grub-inode-size.patch b/abs/core/grub/grub-inode-size.patch deleted file mode 100644 index bef3bc1..0000000 --- a/abs/core/grub/grub-inode-size.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c ---- a/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ b/stage2/fsys_ext2fs.c 2008-01-30 14:27:20.000000000 +0100 -@@ -79,7 +79,52 @@ struct ext2_super_block - __u32 s_rev_level; /* Revision level */ - __u16 s_def_resuid; /* Default uid for reserved blocks */ - __u16 s_def_resgid; /* Default gid for reserved blocks */ -- __u32 s_reserved[235]; /* Padding to the end of the block */ -+ /* -+ * These fields are for EXT2_DYNAMIC_REV superblocks only. -+ * -+ * Note: the difference between the compatible feature set and -+ * the incompatible feature set is that if there is a bit set -+ * in the incompatible feature set that the kernel doesn't -+ * know about, it should refuse to mount the filesystem. -+ * -+ * e2fsck's requirements are more strict; if it doesn't know -+ * about a feature in either the compatible or incompatible -+ * feature set, it must abort and not try to meddle with -+ * things it doesn't understand... -+ */ -+ __u32 s_first_ino; /* First non-reserved inode */ -+ __u16 s_inode_size; /* size of inode structure */ -+ __u16 s_block_group_nr; /* block group # of this superblock */ -+ __u32 s_feature_compat; /* compatible feature set */ -+ __u32 s_feature_incompat; /* incompatible feature set */ -+ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ -+ __u8 s_uuid[16]; /* 128-bit uuid for volume */ -+ char s_volume_name[16]; /* volume name */ -+ char s_last_mounted[64]; /* directory where last mounted */ -+ __u32 s_algorithm_usage_bitmap; /* For compression */ -+ /* -+ * Performance hints. Directory preallocation should only -+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. -+ */ -+ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ -+ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ -+ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */ -+ /* -+ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. -+ */ -+ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ -+ __u32 s_journal_inum; /* inode number of journal file */ -+ __u32 s_journal_dev; /* device number of journal file */ -+ __u32 s_last_orphan; /* start of list of inodes to delete */ -+ __u32 s_hash_seed[4]; /* HTREE hash seed */ -+ __u8 s_def_hash_version; /* Default hash version to use */ -+ __u8 s_jnl_backup_type; /* Default type of journal backup */ -+ __u16 s_reserved_word_pad; -+ __u32 s_default_mount_opts; -+ __u32 s_first_meta_bg; /* First metablock group */ -+ __u32 s_mkfs_time; /* When the filesystem was created */ -+ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ -+ __u32 s_reserved[172]; /* Padding to the end of the block */ - }; - - struct ext2_group_desc -@@ -218,6 +263,9 @@ struct ext2_dir_entry - #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) - #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) - -+#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) -+#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) -+ - /* linux/ext2_fs.h */ - #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) - /* kind of from ext2/super.c */ -@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname) - gdp = GROUP_DESC; - ino_blk = gdp[desc].bg_inode_table + - (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) -- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); -+ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); - #ifdef E2DEBUG - printf ("inode table fsblock=%d\n", ino_blk); - #endif /* E2DEBUG */ -@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname) - /* reset indirect blocks! */ - mapblock2 = mapblock1 = -1; - -- raw_inode = INODE + -- ((current_ino - 1) -- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); -+ raw_inode = (struct ext2_inode *)((char *)INODE + -+ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) * -+ EXT2_INODE_SIZE (SUPERBLOCK)); - #ifdef E2DEBUG - printf ("ipb=%d, sizeof(inode)=%d\n", -- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), -- sizeof (struct ext2_inode)); -+ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK)); - printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); - printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); - for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode; diff --git a/abs/core/grub/grub.cfg b/abs/core/grub/grub.cfg new file mode 100644 index 0000000..1f08102 --- /dev/null +++ b/abs/core/grub/grub.cfg @@ -0,0 +1,139 @@ +# +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub +# + +### BEGIN /etc/grub.d/00_header ### +insmod part_gpt +insmod part_msdos +if [ -s $prefix/grubenv ]; then + load_env +fi +set default="0" + +if [ x"${feature_menuentry_id}" = xy ]; then + menuentry_id_option="--id" +else + menuentry_id_option="" +fi + +export menuentry_id_option + +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} + +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else +insmod part_msdos +insmod ext2 +set root='hd0,msdos5' +if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 +else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 +fi + font="/usr/share/grub/unicode.pf2" +fi + +if loadfont $font ; then + set gfxmode=auto + load_video + insmod gfxterm + set locale_dir=$prefix/locale + set lang=en_US + insmod gettext +fi +terminal_input console +terminal_output gfxterm +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Arch GNU/Linux, with Linux core repo kernel' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod ext2 + set root='hd0,msdos5' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 + else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 + fi + echo 'Loading Linux core repo kernel ...' + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initramfs-linux.img +} +menuentry 'Arch GNU/Linux, with Linux core repo kernel (Fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { + load_video + set gfxpayload=keep + insmod gzio + insmod part_msdos + insmod ext2 + set root='hd0,msdos5' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467 + else + search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 + fi + echo 'Loading Linux core repo kernel ...' + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initramfs-linux-fallback.img +} + +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_memtest86+ ### +### END /etc/grub.d/20_memtest86+ ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### + +### BEGIN /etc/grub.d/41_custom ### +if [ -f ${config_directory}/custom.cfg ]; then + source ${config_directory}/custom.cfg +elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/abs/core/grub/grub.default b/abs/core/grub/grub.default new file mode 100644 index 0000000..fdd1fc3 --- /dev/null +++ b/abs/core/grub/grub.default @@ -0,0 +1,47 @@ +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Arch" +GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX="" + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable Hidden Menu, and optionally hide the timeout count +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +#GRUB_COLOR_NORMAL="light-blue/black" +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/path/to/wallpaper" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" + +#GRUB_SAVEDEFAULT="true" diff --git a/abs/core/grub/grub.install b/abs/core/grub/grub.install index bf52382..9188b35 100644 --- a/abs/core/grub/grub.install +++ b/abs/core/grub/grub.install @@ -1,22 +1,33 @@ -info_dir=/usr/share/info -info_files=(grub.info multiboot.info) +infodir="usr/share/info" +filelist=('grub.info' 'grub-dev.info') post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + if [ -f /boot/grub/grub.cfg.pacsave ]; then + echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" + install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg + fi + + cat << 'EOM' +Generating grub.cfg.example config file... +This may fail on some machines running a custom kernel. +EOM + + grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null + echo "done." + + for file in ${filelist[@]}; do + install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null done } post_upgrade() { - post_install + for file in ${filelist[@]}; do + install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null + done } pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null done } - - - - diff --git a/abs/core/grub/grub_bzr_export.sh b/abs/core/grub/grub_bzr_export.sh new file mode 100644 index 0000000..ff8f99e --- /dev/null +++ b/abs/core/grub/grub_bzr_export.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +## For actual repos + +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution + +## For launchpad mirror + +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img +# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution + +## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. + +_WD="${PWD}/" +_OUTPUT_DIR="${_WD}/" + +_ACTUAL_PKGVER="2.00" + +_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" +_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" +_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" + +_MAIN_SNAPSHOT() { + + cd "${_GRUB_BZR_REPO_DIR}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + + xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" + echo + +} + +_EXP_SNAPSHOT() { + + cd "${_GRUB_BZR_EXP_REPO_DIR}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + + xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" + echo + +} + +_EXTRAS_SNAPSHOT() { + + cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" + echo + + _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" + bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" + echo + + cd "${_OUTPUT_DIR}/" + echo + + xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" + echo + +} + +echo + +set -x -e + +echo + +_MAIN_SNAPSHOT + +echo + +# _EXP_SNAPSHOT + +echo + +_GRUB_EXTRAS_NAME="lua" +_EXTRAS_SNAPSHOT + +# _GRUB_EXTRAS_NAME="gpxe" +# _EXTRAS_SNAPSHOT + +_GRUB_EXTRAS_NAME="ntldr-img" +_EXTRAS_SNAPSHOT + +_GRUB_EXTRAS_NAME="915resolution" +_EXTRAS_SNAPSHOT + +echo + +set +x +e + +echo + +unset _WD +unset _OUTPUT_DIR +unset _GRUB_BZR_REPO_DIR +unset _GRUB_EXTRAS_REPOS_DIR +unset _GRUB_EXTRAS_NAME diff --git a/abs/core/grub/i2o.patch b/abs/core/grub/i2o.patch deleted file mode 100644 index 2af846c..0000000 --- a/abs/core/grub/i2o.patch +++ /dev/null @@ -1,45 +0,0 @@ -Only in grub-0.94/docs: grub.info -Only in grub-0.94/docs: multiboot.info -diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c ---- grub-0.94/lib/device.c 2004-05-07 04:50:36.375238696 +0200 -+++ grub-0.94.new/lib/device.c 2004-05-07 04:48:57.611253104 +0200 -@@ -419,6 +419,12 @@ - { - sprintf (name, "/dev/rd/c%dd%d", controller, drive); - } -+ -+static void -+get_i2o_disk_name (char *name, int unit) -+{ -+ sprintf (name, "/dev/i2o/hd%c", unit + 'a'); -+} - #endif - - /* Check if DEVICE can be read. If an error occurs, return zero, -@@ -789,6 +795,26 @@ - } - } - } -+ -+ /* I2O disks. */ -+ for (i = 0; i < 8; i++) -+ { -+ char name[16]; -+ -+ get_i2o_disk_name (name, i); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ - #endif /* __linux__ */ - - /* OK, close the device map file if opened. */ diff --git a/abs/core/grub/install-grub b/abs/core/grub/install-grub deleted file mode 100644 index 0015a31..0000000 --- a/abs/core/grub/install-grub +++ /dev/null @@ -1,543 +0,0 @@ -#! /bin/sh - -# Install GRUB on your drive. -# Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Initialize some variables. -prefix=/ -exec_prefix=${prefix} -sbindir=${exec_prefix}/sbin -libdir=${exec_prefix}/lib -PACKAGE=grub -VERSION=0.95 -host_cpu=i386 -host_os=linux-gnu -host_vendor=pc -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} - -grub_shell=${sbindir}/grub -log_file=/tmp/grub-install.log.$$ -img_file=/tmp/grub-install.img.$$ -rootdir= -grub_prefix=/boot/grub - -install_device= -no_floppy= -force_lba= -recheck=no -sync_sleep=20 -debug=no - -# look for secure tempfile creation wrappers on this platform -if test -x /bin/tempfile; then - mklog="/bin/tempfile --prefix=grub" - mkimg="/bin/tempfile --prefix=grub" -elif test -x /bin/mktemp; then - mklog="/bin/mktemp /tmp/grub-install.log.XXXXXX" - mkimg="/bin/mktemp /tmp/grub-install.img.XXXXXX" -else - mklog="" - mkimg="" -fi - -# Usage: usage -# Print the usage. -usage () { - cat <<EOF -Usage: grub-install [OPTION] install_device -Install GRUB on your drive. - - -h, --help print this message and exit - -v, --version print the version information and exit - --root-directory=DIR install GRUB images under the directory DIR - instead of the root directory - --grub-shell=FILE use FILE as the grub shell - --no-floppy do not probe any floppy drive - --force-lba force GRUB to use LBA mode even for a buggy - BIOS - --recheck probe a device map even if it already exists - --sync-sleep number of seconds to sleep while trying to - sync XFS - -INSTALL_DEVICE can be a GRUB device name or a system device filename. - -grub-install copies GRUB images into the DIR/boot directory specfied by ---root-directory, and uses the grub shell to install grub into the boot -sector. - -Report bugs to <bug-grub@gnu.org>. -EOF -} - -# Usage: getraid_mdadm mddevice -# Routine to find a physical device from an md device -# If found, the first grub BIOS device (from device.map) is returned -# If no BIOS drives match the RAID devices, the first device returned -# from mdadm -D is returned -getraid_mdadm() { - device=$1 - mdadm=$(mdadm -D "$device") || { - echo "$PROG: mdadm -D $device failed" >&2 - exit 1 - } - eval "$( - echo "$mdadm" | awk ' - $1 == "Number" && $2 == "Major" { start = 1; next } - $1 == "UUID" { print "uuid=" $3; start = 0; next } - !start { next } - $2 == 0 && $3 == 0 { next } - { devices = devices "\n" $NF } - END { print "devices='\''" devices "'\''" } - ' - )" - - # Convert RAID devices list into a list of disks - tmp_disks=`echo "$devices" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ - -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ - -e 's%\(fd[0-9]*\)$%\1%' \ - -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \ - -e '/^$/d' | - sed -n '1h;2,$H;${g;s/\n/|/g;p}'` - - # Find first BIOS disk that's a member of the RAID array - # Default to first RAID member if no tmp_disks are BIOS devices - set -- `egrep $tmp_disks $device_map | \ - sort | \ - sed -n 1p ` - device=${2:-${tmp_disks%%|*}} - - # Return first partition on BIOS disk that's part of the RAID - echo "$devices" | \ - sed -n "\:${device}:p" | \ - sed -n 1p -} - -# Usage: xfs_hack -# Routine to flush xfs filesystem log (sync doesn't do this) -# sleep is needed to give time for the log to be flushed -xfs_hack () { - sync - if which xfs_freeze >/dev/null ; then - echo "Trying to sync filesystem, do not interrupt until complete." - xfs_freeze -f ${grubdir} 2>/dev/null - sleep $sync_sleep - xfs_freeze -u ${grubdir} 2>/dev/null - echo "Trying to sync filesystem is complete." - fi -} - -# Usage: convert os_device -# Convert an OS device to the corresponding GRUB drive. -# This part is OS-specific. -convert () { - # First, check if the device file exists. - if test -e "$1"; then - : - else - echo "$1: Not found or not a block device." 1>&2 - exit 1 - fi - - # Break the device name into the disk part and the partition part. - case "$host_os" in - linux*) - # Find an actual physical device if we're passed a RAID device - case $1 in - /dev/md*) set -- `getraid_mdadm $1` - esac - tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ - -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ - -e 's%\(fd[0-9]*\)$%\1%' \ - -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%'` - tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ - -e 's%.*d[0-9]*p*%%' \ - -e 's%.*/fd[0-9]*$%%' \ - -e 's%.*/floppy/[0-9]*$%%' \ - -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \ - -e 's%.*c[0-7]d[0-9]*p*%%'` - ;; - gnu*) - tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` - tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; - freebsd*) - tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \ - | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'` - tmp_part=`echo "$1" \ - | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \ - | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"` - ;; - netbsd*) - tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([sw]d[0-9]*\).*$%r\1d%' \ - | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'` - tmp_part=`echo "$1" \ - | sed "s%.*/r\{0,1\}[sw]d[0-9]\([abe-p]\)%\1%"` - ;; - *) - echo "grub-install does not support your OS yet." 1>&2 - exit 1 ;; - esac - - # Get the drive name. - tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk *$" \ - | sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'` - - # If not found, print an error message and exit. - if test "x$tmp_drive" = x; then - echo "$1 does not have any corresponding BIOS drive." 1>&2 - exit 1 - fi - - if test "x$tmp_part" != x; then - # If a partition is specified, we need to translate it into the - # GRUB's syntax. - case "$host_os" in - linux*) - echo "$tmp_drive" | sed "s%)$%,`expr $tmp_part - 1`)%" ;; - gnu*) - if echo $tmp_part | grep "^s" >/dev/null; then - tmp_pc_slice=`echo $tmp_part \ - | sed "s%s\([0-9]*\)[a-g]*$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"` - fi - if echo $tmp_part | grep "[a-g]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%[^a-g]*\([a-g]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - freebsd*) - if echo $tmp_part | grep "^s" >/dev/null; then - tmp_pc_slice=`echo $tmp_part \ - | sed "s%s\([0-9]*\)[a-h]*$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"` - fi - if echo $tmp_part | grep "[a-h]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%s\{0,1\}[0-9]*\([a-h]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - netbsd*) - if echo $tmp_part | grep "^[abe-p]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%\([a-p]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - esac - else - # If no partition is specified, just print the drive name. - echo "$tmp_drive" - fi -} - -# Usage: resolve_symlink file -# Find the real file/device that file points at -resolve_symlink () { - tmp_fname=$1 - # Resolve symlinks - while test -L $tmp_fname; do - tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'` - if test -z "$tmp_new_fname"; then - echo "Unrecognized ls output" 2>&1 - exit 1 - fi - - # Convert relative symlinks - case $tmp_new_fname in - /*) tmp_fname="$tmp_new_fname" - ;; - *) tmp_fname="`echo $tmp_fname | sed 's%/[^/]*$%%'`/$tmp_new_fname" - ;; - esac - done - echo "$tmp_fname" -} - -# Usage: find_device file -# Find block device on which the file resides. -find_device () { - # For now, this uses the program `df' to get the device name, but is - # this really portable? - tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'` - - if test -z "$tmp_fname"; then - echo "Could not find device for $1" 2>&1 - exit 1 - fi - - tmp_fname=`resolve_symlink $tmp_fname` - - echo "$tmp_fname" -} - -# Check the arguments. -for option in "$@"; do - case "$option" in - -h | --help) - usage - exit 0 ;; - -v | --version) - echo "grub-install (GNU GRUB ${VERSION})" - exit 0 ;; - --root-directory=*) - rootdir=`echo "$option" | sed 's/--root-directory=//'` ;; - --grub-shell=*) - grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;; - --no-floppy) - no_floppy="--no-floppy" ;; - --force-lba) - force_lba="--force-lba" ;; - --recheck) - recheck=yes ;; - --sync-sleep=*) - sync_sleep=`echo "$option" | sed 's/--sync-sleep=//'` ;; - # This is an undocumented feature... - --debug) - debug=yes ;; - -*) - echo "Unrecognized option \`$option'" 1>&2 - usage - exit 1 - ;; - *) - if test "x$install_device" != x; then - echo "More than one install_devices?" 1>&2 - usage - exit 1 - fi - install_device="${option}" ;; - esac -done - -if test "x$install_device" = x; then - echo "install_device not specified." 1>&2 - usage - exit 1 -fi - -# If the debugging feature is enabled, print commands. -if test $debug = yes; then - set -x -fi - -# Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd*) - # Because /boot is used for the boot block in NetBSD, use /grub - # instead of /boot/grub. - grub_prefix=/grub - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/grub -device_map=${grubdir}/device.map - -# Check if GRUB is installed. -# This is necessary, because the user can specify "grub --read-only". -set $grub_shell dummy -if test -f "$1"; then - : -else - echo "$1: Not found." 1>&2 - exit 1 -fi - -if test -f "$pkglibdir/stage1"; then - : -else - echo "${pkglibdir}/stage1: Not found." 1>&2 - exit 1 -fi - -if test -f "$pkglibdir/stage2"; then - : -else - echo "${pkglibdir}/stage2: Not found." 1>&2 - exit 1 -fi - -# Don't check for *stage1_5, because it is not fatal even if any -# Stage 1.5 does not exist. - -# Create the GRUB directory if it is not present. -test -d "$bootdir" || mkdir "$bootdir" || exit 1 -test -d "$grubdir" || mkdir "$grubdir" || exit 1 - -# If --recheck is specified, remove the device map, if present. -if test $recheck = yes; then - rm -f $device_map -fi - -# Create the device map file if it is not present. -if test -f "$device_map"; then - : -else - # Create a safe temporary file. - test -n "$mklog" && log_file=`$mklog` - - xfs_hack - $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file -quit -EOF - if grep "Error [0-9]*: " $log_file >/dev/null; then - cat $log_file 1>&2 - exit 1 - fi - - rm -f $log_file -fi - -# Make sure that there is no duplicated entry. -tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \ - | sort | uniq -d | sed -n 1p` -if test -n "$tmp"; then - echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2 - exit 1 -fi - -# Check for INSTALL_DEVICE. -case "$install_device" in -/dev/*) - install_device=`resolve_symlink "$install_device"` - install_drive=`convert "$install_device"` - # I don't know why, but some shells wouldn't die if exit is - # called in a function. - if test "x$install_drive" = x; then - exit 1 - fi ;; -\([hf]d[0-9]*\)) - install_drive="$install_device" ;; -[hf]d[0-9]*) - # The GRUB format with no parenthesis. - install_drive="($install_device)" ;; -*) - echo "Format of install_device not recognized." 1>&2 - usage - exit 1 ;; -esac - -# Get the root drive. -root_device=`find_device ${rootdir}` -bootdir_device=`find_device ${bootdir}` - -# Check if the boot directory is in the same device as the root directory. -if test "x$root_device" != "x$bootdir_device"; then - # Perhaps the user has a separate boot partition. - root_device=$bootdir_device - grub_prefix="/grub" -fi - -# Convert the root device to a GRUB drive. -root_drive=`convert "$root_device"` -if test "x$root_drive" = x; then - exit 1 -fi - -# Check if the root directory exists in the same device as the grub -# directory. -grubdir_device=`find_device ${grubdir}` - -if test "x$grubdir_device" != "x$root_device"; then - # For now, cannot deal with this situation. - cat <<EOF 1>&2 -You must set the root directory by the option --root-directory, because -$grubdir does not exist in the root device $root_device. -EOF - exit 1 -fi - -# Copy the GRUB images to the GRUB directory. -for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do - rm -f $file || exit 1 -done -for file in \ - ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do - cp -f $file ${grubdir} || exit 1 -done -xfs_hack - -# Make sure that GRUB reads the same images as the host OS. -test -n "$mkimg" && img_file=`$mkimg` -test -n "$mklog" && log_file=`$mklog` - -for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do - count=5 - tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` - while test $count -gt 0; do - $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file -dump ${root_drive}${tmp} ${img_file} -quit -EOF - if grep "Error [0-9]*: " $log_file >/dev/null; then - : - elif cmp $file $img_file >/dev/null; then - break - fi - sleep 1 - count=`expr $count - 1` - done - if test $count -eq 0; then - echo "The file $file not read correctly." 1>&2 - exit 1 - fi -done - -rm -f $img_file -rm -f $log_file - -# Create a safe temporary file. -test -n "$mklog" && log_file=`$mklog` - -# Now perform the installation. -xfs_hack -$grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file -root $root_drive -setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive -quit -EOF - -if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then - cat $log_file 1>&2 - exit 1 -fi - -rm -f $log_file - -# Prompt the user to check if the device map is correct. -echo "Installation finished. No error reported." -echo "This is the contents of the device map $device_map." -echo "Check if this is correct or not. If any of the lines is incorrect," -echo "fix it and re-run the script \`grub-install'." -echo - -cat $device_map - -# Bye. -exit 0 diff --git a/abs/core/grub/install-grub.orig b/abs/core/grub/install-grub.orig deleted file mode 100755 index 3eb7ce5..0000000 --- a/abs/core/grub/install-grub.orig +++ /dev/null @@ -1,187 +0,0 @@ -#!/bin/bash - -# -# This is a little helper script that tries to convert linux-style device -# names to grub-style. It's not very smart, so it -# probably won't work for more complicated setups. -# -# If it doesn't work for you, try installing grub manually: -# -# # mkdir -p /boot/grub -# # cp /usr/lib/grub/i386-pc/* /boot/grub/ -# -# Then start up the 'grub' shell and run something like the following: -# -# grub> root(hd0,0) -# grub> setup(hd0) -# -# The "root" line should point to the partition your kernel is located on, -# /boot if you have a separate boot partition, otherwise your root (/). -# -# The "setup" line tells grub which disc/partition to install the -# bootloader to. In the example above, it will install to the MBR of the -# primary master hard drive. -# - -usage() { - echo "usage: install-grub <install_device> [boot_device]" - echo - echo "where <install_device> is the device where Grub will be installed" - echo "and [boot_device] is the partition that contains the /boot" - echo "directory (auto-detected if omitted)" - echo - echo "examples: install-grub /dev/hda" - echo " install-grub /dev/hda /dev/hda1" - echo - exit 0 -} - -## new install-grub, code was taken from setup script -ROOTDEV=$1 -PART_ROOT=$2 -VMLINUZ=vmlinuz26 - -if [ "$ROOTDEV" = "" ]; then - usage -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on /boot type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on / type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - echo "error: could not determine BOOT_DEVICE, please specify manually" >&2 - exit 1 -fi - - -get_grub_map() { - [ -e /tmp/dev.map ] && rm /tmp/dev.map - /sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 <<EOF -quit -EOF -} - -mapdev() { - partition_flag=0 - device_found=0 - devs=$(cat /tmp/dev.map | grep -v fd | sed 's/ *\t/ /' | sed ':a;$!N;$!ba;s/\n/ /g') - linuxdevice=$(echo $1 | cut -b1-8) - if [ "$(echo $1 | egrep '[0-9]$')" ]; then - # /dev/hdXY - pnum=$(echo $1 | cut -b9-) - pnum=$(($pnum-1)) - partition_flag=1 - fi - for dev in $devs - do - if [ "(" = $(echo $dev | cut -b1) ]; then - grubdevice="$dev" - else - if [ "$dev" = "$linuxdevice" ]; then - device_found=1 - break - fi - fi - done - if [ "$device_found" = "1" ]; then - if [ "$partition_flag" = "0" ]; then - echo "$grubdevice" - else - grubdevice_stringlen=${#grubdevice} - let grubdevice_stringlen-- - grubdevice=$(echo $grubdevice | cut -b1-$grubdevice_stringlen) - echo "$grubdevice,$pnum)" - fi - else - echo " DEVICE NOT FOUND" - fi -} - -dogrub() { - get_grub_map - if [ ! -f /boot/grub/menu.lst ]; then - echo "Error: Couldn't find /boot/grub/menu.lst. Is GRUB installed?" - exit 1 - fi - # try to auto-configure GRUB... - if [ "$PART_ROOT" != "" -a "$S_GRUB" != "1" ]; then - grubdev=$(mapdev $PART_ROOT) - # look for a separately-mounted /boot partition - bootdev=$(mount | grep /boot | cut -d' ' -f 1) - if [ "$grubdev" != "" -o "$bootdev" != "" ]; then - cp /boot/grub/menu.lst /tmp/.menu.lst - # remove the default entries by truncating the file at our little tag (#-*) - head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1) /tmp/.menu.lst >/boot/grub/menu.lst - rm -f /tmp/.menu.lst - echo "" >>/boot/grub/menu.lst - echo "# (0) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux" >>/boot/grub/menu.lst - subdir= - if [ "$bootdev" != "" ]; then - grubdev=$(mapdev $bootdev) - else - subdir="/boot" - fi - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - # adding fallback/full image - echo "# (1) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux Fallback" >>/boot/grub/menu.lst - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26-fallback.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - fi - fi - - echo "Installing the GRUB bootloader..." - cp -a /usr/lib/grub/i386-pc/* /boot/grub/ - sync - # freeze xfs filesystems to enable grub installation on xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 - fi - # look for a separately-mounted /boot partition - bootpart=$(mount | grep /boot | cut -d' ' -f 1) - if [ "$bootpart" = "" ]; then - bootpart=$PART_ROOT - fi - bootpart=$(mapdev $bootpart) - bootdev=$(mapdev $ROOTDEV) - if [ "$bootpart" = "" ]; then - echo "Error: Missing/Invalid root device: $bootpart" - exit 1 - fi - /sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 <<EOF -root $bootpart -setup $bootdev -quit -EOF -cat /tmp/grub.log - # unfreeze xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 - fi - - if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then - echo "Error installing GRUB. (see /tmp/grub.log for output)" - exit 1 - fi - echo "GRUB was successfully installed." - -rm -f /tmp/grub.log - -exit 0 -} - -dogrub
\ No newline at end of file diff --git a/abs/core/grub/intelmac.patch b/abs/core/grub/intelmac.patch deleted file mode 100644 index a3fabc7..0000000 --- a/abs/core/grub/intelmac.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- grub-0.97.orig/stage2/asm.S 2004-06-19 18:55:22.000000000 +0200 -+++ grub-0.97/stage2/asm.S 2006-04-21 11:10:52.000000000 +0200 -@@ -1651,7 +1651,29 @@ - jnz 3f - ret - --3: /* use keyboard controller */ -+3: /* -+ * try to switch gateA20 using PORT92, the "Fast A20 and Init" -+ * register -+ */ -+ mov $0x92, %dx -+ inb %dx, %al -+ /* skip the port92 code if it's unimplemented (read returns 0xff) */ -+ cmpb $0xff, %al -+ jz 6f -+ -+ /* set or clear bit1, the ALT_A20_GATE bit */ -+ movb 4(%esp), %ah -+ testb %ah, %ah -+ jz 4f -+ orb $2, %al -+ jmp 5f -+4: and $0xfd, %al -+ -+ /* clear the INIT_NOW bit don't accidently reset the machine */ -+5: and $0xfe, %al -+ outb %al, %dx -+ -+6: /* use keyboard controller */ - pushl %eax - - call gloop1 -@@ -1661,9 +1683,12 @@ - - gloopint1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloopint1_done - andb $K_IBUF_FUL, %al - jnz gloopint1 - -+gloopint1_done: - movb $KB_OUTPUT_MASK, %al - cmpb $0, 0x8(%esp) - jz gdoit -@@ -1684,6 +1709,8 @@ - - gloop1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloop2ret - andb $K_IBUF_FUL, %al - jnz gloop1 - -@@ -1991,6 +2018,11 @@ - ENTRY(console_getkey) - push %ebp - -+wait_for_key: -+ call EXT_C(console_checkkey) -+ incl %eax -+ jz wait_for_key -+ - call EXT_C(prot_to_real) - .code16 - diff --git a/abs/core/grub/menu.lst b/abs/core/grub/menu.lst deleted file mode 100644 index 1c19f8a..0000000 --- a/abs/core/grub/menu.lst +++ /dev/null @@ -1,48 +0,0 @@ -# Config file for GRUB - The GNU GRand Unified Bootloader -# /boot/grub/menu.lst - -# DEVICE NAME CONVERSIONS -# -# Linux Grub -# ------------------------- -# /dev/fd0 (fd0) -# /dev/sda (hd0) -# /dev/sdb2 (hd1,1) -# /dev/sda3 (hd0,2) -# - -# FRAMEBUFFER RESOLUTION SETTINGS -# +-------------------------------------------------+ -# | 640x480 800x600 1024x768 1280x1024 -# ----+-------------------------------------------- -# 256 | 0x301=769 0x303=771 0x305=773 0x307=775 -# 32K | 0x310=784 0x313=787 0x316=790 0x319=793 -# 64K | 0x311=785 0x314=788 0x317=791 0x31A=794 -# 16M | 0x312=786 0x315=789 0x318=792 0x31B=795 -# +-------------------------------------------------+ -# for more details and different resolutions see -# http://wiki.archlinux.org/index.php/GRUB#Framebuffer_Resolution - -# general configuration: -timeout 5 -default 0 -color light-blue/black light-cyan/blue - -# boot sections follow -# each is implicitly numbered from 0 in the order of appearance below -# -# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. -# -#-* - -# (0) Arch Linux -title Arch Linux [/boot/vmlinuz26] -root (hd0,0) -kernel /vmlinuz26 root=/dev/sda3 ro -initrd /kernel26.img - -# (1) Windows -#title Windows -#rootnoverify (hd0,0) -#makeactive -#chainloader +1 diff --git a/abs/core/grub/more-raid.patch b/abs/core/grub/more-raid.patch deleted file mode 100644 index 39db234..0000000 --- a/abs/core/grub/more-raid.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- grub-0.95/lib/device.c.moreraid 2004-11-30 17:09:36.736099360 -0500 -+++ grub-0.95/lib/device.c 2004-11-30 17:12:17.319686944 -0500 -@@ -544,6 +544,17 @@ - } - - static void -+get_cciss_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/cciss/c%dd%d", controller, drive); -+} -+ -+static void -+get_cpqarray_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/ida/c%dd%d", controller, drive); -+} -+static void - get_ataraid_disk_name (char *name, int unit) - { - sprintf (name, "/dev/ataraid/d%c", unit + '0'); -@@ -920,7 +931,7 @@ - - for (controller = 0; controller < 8; controller++) - { -- for (drive = 0; drive < 15; drive++) -+ for (drive = 0; drive < 32; drive++) - { - char name[24]; - -@@ -940,6 +951,70 @@ - } - } - #endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cciss - we have -+ /dev/cciss/c<controller>d<logical drive>p<partition>. -+ -+ cciss driver currently supports up to 8 controllers, 16 logical -+ drives, and 7 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 16; drive++) -+ { -+ char name[24]; -+ -+ get_cciss_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cpqarray - we have -+ /dev/ida/c<controller>d<logical drive>p<partition>. -+ -+ cpqarray driver currently supports up to 8 controllers, 16 logical -+ drives, and 15 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 15; drive++) -+ { -+ char name[24]; -+ -+ get_cpqarray_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ - - /* OK, close the device map file if opened. */ - if (fp) diff --git a/abs/core/grub/special-devices.patch b/abs/core/grub/special-devices.patch deleted file mode 100644 index 894f3e8..0000000 --- a/abs/core/grub/special-devices.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- grub-0.93/lib/device.c.raid 2002-05-20 05:53:46.000000000 -0400 -+++ grub-0.93/lib/device.c 2002-12-28 23:24:10.000000000 -0500 -@@ -689,7 +689,14 @@ - if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) - strcpy (dev + strlen(dev) - 5, "/part"); - } -- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1); -+ -+ sprintf (dev + strlen(dev), "%s%d", -+ /* Compaq smart and others */ -+ (strncmp(dev, "/dev/ida/", 9) == 0 || -+ strncmp(dev, "/dev/ataraid/", 13) == 0 || -+ strncmp(dev, "/dev/cciss/", 11) == 0 || -+ strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "", -+ ((partition >> 16) & 0xFF) + 1); - - /* Open the partition. */ - fd = open (dev, O_RDWR); diff --git a/abs/core/gsfonts/PKGBUILD b/abs/core/gsfonts/PKGBUILD index 325fffe..df44e7f 100644 --- a/abs/core/gsfonts/PKGBUILD +++ b/abs/core/gsfonts/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 73458 2010-03-26 07:43:21Z francois $ -# Maintainer: Firmicus <francois.archlinux.org> +# $Id: PKGBUILD 149058 2012-02-05 15:58:05Z bisson $ +# Contributor: Firmicus <francois.archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=gsfonts _realname=urw-fonts pkgver=1.0.7pre44 _fedoraver=2.4 -_fedorarel=9.fc13 -pkgrel=2 -pkgdesc="Ghostscript standard Type1 fonts from URW" -arch=(any) -url="http://sourceforge.net/projects/gs-fonts/" +_fedorarel=11.fc17 +pkgrel=3 +pkgdesc='Standard Ghostscript Type1 fonts from URW' +url='http://sourceforge.net/projects/gs-fonts/' +arch=('any') license=('GPL2') -depends=('xorg-font-utils' 'fontconfig') makedepends=('rpmextract') -provides=(${_realname}) -install=xfonts.install -source=(http://kojipkgs.fedoraproject.org/packages/${_realname}/${_fedoraver}/${_fedorarel}/src/${_realname}-${_fedoraver}-${_fedorarel}.src.rpm) -options=(force) -md5sums=('54935e7d6692792e414510490e3a0fa4') +depends=('xorg-font-utils' 'fontconfig') +source=("http://kojipkgs.fedoraproject.org/packages/${_realname}/${_fedoraver}/${_fedorarel}/src/${_realname}-${_fedoraver}-${_fedorarel}.src.rpm") +sha1sums=('c4b31e581c25bc497c915d6d81e60cfdbb9f529e') + +provides=("${_realname}") +install=install build() { - cd $srcdir || return 1 - /usr/bin/rpmextract.sh ${_realname}-${_fedoraver}-${_fedorarel}.src.rpm || return 1 - bsdtar xf *.tar.bz2 || return 1 - install -d ${pkgdir}/usr/share/fonts/Type1 - install -m644 *.{pfb,pfm,afm} \ - ${pkgdir}/usr/share/fonts/Type1/ || return 1 + cd "${srcdir}" + rpmextract.sh "${_realname}-${_fedoraver}-${_fedorarel}.src.rpm" + bsdtar xf *.tar.bz2 } +package() { + cd "${srcdir}" + install -d "${pkgdir}"/usr/share/fonts/Type1 + install -m644 *.{pfb,pfm,afm} "${pkgdir}"/usr/share/fonts/Type1 +} diff --git a/abs/core/gsfonts/install b/abs/core/gsfonts/install new file mode 100644 index 0000000..023e2ec --- /dev/null +++ b/abs/core/gsfonts/install @@ -0,0 +1,15 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -sf > /dev/null + mkfontscale /usr/share/fonts/Type1 + mkfontdir /usr/share/fonts/Type1 + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/abs/core/gsfonts/xfonts.install b/abs/core/gsfonts/xfonts.install deleted file mode 100644 index 3eb0455..0000000 --- a/abs/core/gsfonts/xfonts.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - echo -n "Updating font cache... " - fc-cache -f > /dev/null - mkfontscale /usr/share/fonts/Type1 - mkfontdir /usr/share/fonts/Type1 - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -op=$1 -shift - -$op $* diff --git a/abs/core/gsm/PKGBUILD b/abs/core/gsm/PKGBUILD new file mode 100644 index 0000000..b31a794 --- /dev/null +++ b/abs/core/gsm/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Maxime de Roucy <maxime.deroucy@gmail.com> +# Contributor: Darwin Bautista <djclue917@gmail.com> + +pkgname=gsm +pkgver=1.0.13 +pkgrel=7 +pkgdesc="Shared libraries for GSM 06.10 lossy speech compression" +arch=('i686' 'x86_64') +url="http://www.quut.com/gsm/" +license=('custom') +depends=('glibc') +source=("http://www.quut.com/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gsm.patch') +md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4' + '30f46c92d0a5e5654258e707a9e8b5a6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/" + + patch -Np0 -i "${srcdir}/${pkgname}.patch" + + # flags for shared lib + CFLAGS="${CFLAGS} -fPIC" + make CCFLAGS="-c ${CFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/" + + # Prepare directories + install -m755 -d "${pkgdir}"/usr/{bin,lib,include/gsm,share/{licenses/${pkgname},man/man{1,3}}} + + make -j1 INSTALL_ROOT="${pkgdir}/usr" \ + GSM_INSTALL_INC="${pkgdir}/usr/include/gsm" \ + GSM_INSTALL_MAN="${pkgdir}/usr/share/man/man3" \ + TOAST_INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ + install + + # Install license + install -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} diff --git a/abs/core/gsm/gsm.patch b/abs/core/gsm/gsm.patch new file mode 100644 index 0000000..821f3a5 --- /dev/null +++ b/abs/core/gsm/gsm.patch @@ -0,0 +1,198 @@ +--- Makefile 2006-04-26 15:14:26.000000000 -0400 ++++ Makefile 2010-06-19 16:53:25.000000000 -0400 +@@ -44,7 +44,7 @@ + # CCFLAGS = -c -O + + CC = gcc -ansi -pedantic +-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 ++CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1 + + LD = $(CC) + +@@ -96,11 +96,11 @@ + # Other tools + + SHELL = /bin/sh +-LN = ln ++LN = ln -s -f + BASENAME = basename + AR = ar + ARFLAGS = cr +-RMFLAGS = ++RMFLAGS = -f + FIND = find + COMPRESS = compress + COMPRESSFLAGS = +@@ -139,7 +139,7 @@ + + # Targets + +-LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO = $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -257,7 +257,7 @@ + # Install targets + + GSM_INSTALL_TARGETS = \ +- $(GSM_INSTALL_LIB)/libgsm.a \ ++ $(GSM_INSTALL_LIB)/libgsm.so \ + $(GSM_INSTALL_INC)/gsm.h \ + $(GSM_INSTALL_MAN)/gsm.3 \ + $(GSM_INSTALL_MAN)/gsm_explode.3 \ +@@ -279,7 +279,7 @@ + + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,24 +299,23 @@ + + # The basic API: libgsm + +-$(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) +- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) +- $(RANLIB) $(LIBGSM) +- ++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) ++ $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS) ++ $(LN) libgsm.so.1.0.13 $(LIBGSMSO).1 ++ $(LN) libgsm.so.1.0.13 $(LIBGSMSO) + + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + +-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO) ++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(UNTOAST) +- $(LN) $(TOAST) $(UNTOAST) ++ $(LN) toast $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(TCAT) +- $(LN) $(TOAST) $(TCAT) ++ $(LN) toast $(TCAT) + + + # The local bin and lib directories +@@ -351,53 +350,54 @@ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $(TOAST) $@ + chmod 755 $@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ +- cp $? $@ +- chmod 444 $@ +- +-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + ++$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO) ++ -rm $(RMFLAGS) $@ $@.1 $@.1.0.13 ++ cp $?.1.0.13 $@.1.0.13 ++ chmod 755 $@.1.0.13 ++ $(LN) libgsm.so.1.0.13 $@ ++ $(LN) libgsm.so.1.0.13 $@.1 + + # Distribution + +@@ -425,7 +425,7 @@ + -print | xargs rm $(RMFLAGS) + + clean: semi-clean +- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ ++ -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \ + $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + +@@ -473,22 +473,22 @@ + $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run + ( cd $(TST); ./run ) + +-$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) ++$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2txt \ +- $(TST)/lin2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM) ++$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2cod \ +- $(TST)/lin2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM) ++$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/gsm2cod \ +- $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM) ++$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2txt \ +- $(TST)/cod2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM) ++$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2lin \ +- $(TST)/cod2lin.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB) diff --git a/abs/core/gtk/PKGBUILD b/abs/core/gtk/PKGBUILD index 48c4972..30fc520 100644 --- a/abs/core/gtk/PKGBUILD +++ b/abs/core/gtk/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 @@ -9,24 +8,31 @@ pkgdesc="The GTK+ toolkit" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') -depends=('libxi' 'glib') -options=('!libtool' '!emptydirs') -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz \ - aclocal-fixes.patch) -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e') -sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') +depends=('libxi' 'glib' 'sh') +makedepends=('libxt') +options=('!libtool') +install=gtk.install +source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" + 'aclocal-fixes.patch') +md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' + 'c59d4906602d99a7468f7334b6fc3b4e') build() { - cd $startdir/src/gtk+-$pkgver - if [ "$CARCH" == "x86_64" ]; then + cd "${srcdir}/gtk+-${pkgver}" + if [ "${CARCH}" = "x86_64" ]; then rm config.guess config.sub - ln -s /usr/share/libtool/config.guess config.guess - ln -s /usr/share/libtool/config.sub config.sub + ln -s /usr/share/libtool/config/config.guess config.guess + ln -s /usr/share/libtool/config/config.sub config.sub fi - patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --with-xinput=xfree - make || return 1 - make DESTDIR=$startdir/pkg install - cd $startdir/pkg/usr/include - ln -s gtk-1.2/gtk gtk + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-xinput=xfree + make +} + +package() { + cd "${srcdir}/gtk+-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/gtk/__changelog b/abs/core/gtk/__changelog deleted file mode 100644 index 5d6d4d6..0000000 --- a/abs/core/gtk/__changelog +++ /dev/null @@ -1,3 +0,0 @@ -added !emptydir to options -!docs - diff --git a/abs/core/gtk/gtk.install b/abs/core/gtk/gtk.install new file mode 100644 index 0000000..8758beb --- /dev/null +++ b/abs/core/gtk/gtk.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gdk.info.gz gtk.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/gtk2/PKGBUILD b/abs/core/gtk2/PKGBUILD index 0526600..13d72a2 100644 --- a/abs/core/gtk2/PKGBUILD +++ b/abs/core/gtk2/PKGBUILD @@ -1,40 +1,56 @@ -# $Id: PKGBUILD 99604 2010-11-15 19:29:19Z ibiru $ +# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=gtk2 -pkgver=2.22.1 +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.11 pkgrel=1 -pkgdesc="The GTK+ Toolkit (v2)" arch=('i686' 'x86_64') url="http://www.gtk.org/" -install=gtk2.install -depends=('atk>=1.30.0' 'pango>=1.28.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.3' 'libxcomposite' 'libxdamage' 'heimdal>=1.3.2' 'gnutls>=2.8.6' 'shared-mime-info' 'cairo>=1.10.0' 'libcups>=1.4.4' 'gdk-pixbuf2>=2.22.1') -makedepends=('gtk-doc' 'gobject-introspection') -replaces=('gtkprint-cups' 'gail') -conflicts=('gtkprint-cups' 'gail') -provides=('gail=1.22.3') -options=('!libtool' '!docs') -backup=(etc/gtk-2.0/gtkrc) +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool') license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/gtk+-${pkgver}.tar.bz2 - xid-collision-debug.patch old-icon-symlinks.patch) -sha256sums=('965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '1298e4103f71d0304378f1e7503011150f6f68398ae8ebae5522a48feaea7c0d') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz + xid-collision-debug.patch) +sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - patch -Np1 -i "${srcdir}/old-icon-symlinks.patch" + cd "$srcdir/gtk+-$pkgver" + patch -Np1 -i "$srcdir/xid-collision-debug.patch" - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes - make - make DESTDIR="${pkgdir}" install + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes - sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + replaces=('gtk2-docs') + + cd "$srcdir/gtk+-$pkgver" + + make DESTDIR="$pkgdir" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm $pkgdir/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2>=2.24.1-3') + + cd "$srcdir/gtk+-$pkgver/gtk" + + install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache } diff --git a/abs/core/gtk2/__changelog b/abs/core/gtk2/__changelog deleted file mode 100644 index 1384183..0000000 --- a/abs/core/gtk2/__changelog +++ /dev/null @@ -1 +0,0 @@ -removed cups support -jm diff --git a/abs/core/gtk2/gtk2.install b/abs/core/gtk2/gtk2.install index 4e2b72f..a988c64 100644 --- a/abs/core/gtk2/gtk2.install +++ b/abs/core/gtk2/gtk2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules } pre_upgrade() { @@ -11,6 +11,6 @@ post_upgrade() { } pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null + rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null } diff --git a/abs/core/gtk2/old-icon-symlinks.patch b/abs/core/gtk2/old-icon-symlinks.patch deleted file mode 100644 index 046dd4d..0000000 --- a/abs/core/gtk2/old-icon-symlinks.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in ---- gtk+-2.22.0.orig//gtk/Makefile.in 2010-10-15 04:57:50.810006145 +0800 -+++ gtk+-2.22.0/gtk/Makefile.in 2010-10-15 05:13:49.083339478 +0800 -@@ -1598,7 +1598,172 @@ - stock-icons/24/folder-remote.png \ - stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-clear.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-out.png \ -+ stock-icons/48/gtk-dialog-error.png - - @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ - @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2869,7 +3034,91 @@ - && $(LN_S) folder.png user-desktop.png \ - && $(RM) text-x-generic.png \ - && $(LN_S) document-x-generic.png text-x-generic.png \ -+ && $(LN_S) application-exit.png gtk-quit.png \ -+ && $(LN_S) dialog-information.png gtk-info.png \ -+ && $(LN_S) document-new.png gtk-file.png \ -+ && $(LN_S) document-open.png gtk-open.png \ -+ && $(LN_S) document-print-preview.png gtk-print-preview.png \ -+ && $(LN_S) document-print.png gtk-print.png \ -+ && $(LN_S) document-properties.png gtk-properties.png \ -+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ -+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ -+ && $(LN_S) document-save-as.png gtk-save-as.png \ -+ && $(LN_S) document-x-generic.png gtk-new.png \ -+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ -+ && $(LN_S) edit-clear.png gtk-clear.png \ -+ && $(LN_S) edit-copy.png gtk-copy.png \ -+ && $(LN_S) edit-cut.png gtk-cut.png \ -+ && $(LN_S) edit-delete.png gtk-delete.png \ -+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ -+ && $(LN_S) edit-find.png gtk-find.png \ -+ && $(LN_S) edit-paste.png gtk-paste.png \ -+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ -+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ -+ && $(LN_S) edit-select-all.png gtk-select-all.png \ -+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ -+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ -+ && $(LN_S) folder.png gtk-directory.png \ -+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ -+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ -+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ -+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ -+ && $(LN_S) format-justify-center.png gtk-justify-center.png \ -+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ -+ && $(LN_S) format-justify-left.png gtk-justify-left.png \ -+ && $(LN_S) format-justify-right.png gtk-justify-right.png \ -+ && $(LN_S) format-text-bold.png gtk-bold.png \ -+ && $(LN_S) format-text-italic.png gtk-italic.png \ -+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ -+ && $(LN_S) format-text-underline.png gtk-underline.png \ -+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ -+ && $(LN_S) go-down.png gtk-go-down.png \ -+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ -+ && $(LN_S) go-home.png gtk-home.png \ -+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ -+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ -+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ -+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ -+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ -+ && $(LN_S) go-top.png gtk-goto-top.png \ -+ && $(LN_S) go-up.png gtk-go-up.png \ -+ && $(LN_S) help-about.png gtk-about.png \ -+ && $(LN_S) help-contents.png gtk-help.png \ -+ && $(LN_S) image-missing.png gtk-missing-image.png \ -+ && $(LN_S) list-add.png gtk-add.png \ -+ && $(LN_S) list-remove.png gtk-remove.png \ -+ && $(LN_S) media-floppy.png gtk-floppy.png \ -+ && $(LN_S) media-optical.png gtk-cdrom.png \ -+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ -+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ -+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ -+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ -+ && $(LN_S) media-record.png gtk-media-record.png \ -+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ -+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ -+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ -+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ -+ && $(LN_S) network-idle.png gtk-network.png \ -+ && $(LN_S) printer-error.png gtk-print-error.png \ -+ && $(LN_S) printer-info.png gtk-print-report.png \ -+ && $(LN_S) printer-paused.png gtk-print-paused.png \ -+ && $(LN_S) printer-warning.png gtk-print-warning.png \ -+ && $(LN_S) process-stop.png gtk-stop.png \ -+ && $(LN_S) system-run.png gtk-execute.png \ -+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ -+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ -+ && $(LN_S) view-refresh.png gtk-refresh.png \ -+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ -+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ -+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ -+ && $(LN_S) window-close.png gtk-close.png \ -+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ -+ && $(LN_S) zoom-in.png gtk-zoom-in.png \ -+ && $(LN_S) zoom-original.png gtk-zoom-100.png \ -+ && $(LN_S) zoom-out.png gtk-zoom-out.png \ - ) done \ -+ && (cd stock-icons/48 \ -+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \ - && touch stamp-icons - - gtkbuiltincache.h: @REBUILD@ stamp-icons diff --git a/abs/core/gzip/PKGBUILD b/abs/core/gzip/PKGBUILD index 96e6695..df04137 100644 --- a/abs/core/gzip/PKGBUILD +++ b/abs/core/gzip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64609 2010-01-21 11:31:50Z allan $ +# $Id: PKGBUILD 162088 2012-06-19 15:43:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="GNU compression utility" arch=('i686' 'x86_64') @@ -11,24 +11,23 @@ url="http://www.gnu.org/software/gzip/" license=('GPL3') groups=('base') depends=('glibc' 'bash') -makedepends=('patch') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz) -md5sums=('e381b8506210c794278f5527cba0e765') +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}) +md5sums=('2a431e169b6f62f7332ef6d47cc53bae' + '2de95937a3f65137acf9c55d4ad0447a') build() { - cd $srcdir/$pkgname-$pkgver - + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - install -dm755 $pkgdir/bin - cd $pkgdir/usr/bin - mv gzip gunzip zcat uncompress $pkgdir/bin - cd $pkgdir/bin - ln -sf $pkgname compress +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=${pkgdir}/usr install } diff --git a/abs/core/gzip/gzip.install b/abs/core/gzip/gzip.install index f25897b..43218d9 100644 --- a/abs/core/gzip/gzip.install +++ b/abs/core/gzip/gzip.install @@ -1,11 +1,8 @@ -infodir=/usr/share/info -filelist=(gzip.info) +infodir=usr/share/info post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + [ -x usr/bin/install-info ] || return 0 + usr/bin/install-info $infodir/gzip.info.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -13,9 +10,6 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + [ -x usr/bin/install-info ] || return 0 + usr/bin/install-info --delete $infodir/gzip.info.gz $infodir/dir 2> /dev/null } - diff --git a/abs/core/hdparm/PKGBUILD b/abs/core/hdparm/PKGBUILD index 4bc267f..5f79d6c 100644 --- a/abs/core/hdparm/PKGBUILD +++ b/abs/core/hdparm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 150217 2012-02-15 07:27:04Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm -pkgver=9.37 +pkgver=9.39 pkgrel=1 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=('BSD') url="http://sourceforge.net/projects/hdparm/" optdepends=('bash: for wiper.sh script') options=('emptydirs') -md5sums=('0bb94ddd1bedd5c02b1ca62f1caaf6de' +md5sums=('2bc17b72403885d4faf959682944243b' '74e368f384166a7710b447573cda120a') build() { diff --git a/abs/core/heirloom-mailx/PKGBUILD b/abs/core/heirloom-mailx/PKGBUILD new file mode 100644 index 0000000..d7e82f0 --- /dev/null +++ b/abs/core/heirloom-mailx/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 160422 2012-06-01 20:13:47Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> +# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> + +pkgname=heirloom-mailx +pkgver=12.5 +pkgrel=3 +pkgdesc="A commandline utility for sending and receiving email" +arch=('i686' 'x86_64') +url="http://heirloom.sourceforge.net/mailx.html" +license=('custom') +groups=('base') +depends=('openssl' 'krb5') +optdepends=('smtp-forwarder: for sending mail') +replaces=('mailx' 'mailx-heirloom') +provides=('mailx' 'mailx-heirloom') +conflicts=('mailx' 'mailx-heirloom') +backup=(etc/mail.rc) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056') +options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1 + +# source PKGBUILD && mksource +mksource() { + export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail + D=nail + [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}" + + _dirname=${pkgname}-${pkgver} + mv $D ${_dirname} + tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname} + rm -rf ${_dirname} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1 + + # For Linux and BSD, this should be set. + echo "set bsdcompat" >> nail.rc + + sed -i "s/pg/less/" cmd1.c + + echo PREFIX=/usr \ + MAILRC=/etc/mail.rc \ + SENDMAIL=/usr/sbin/sendmail \ + MAILSPOOL=/var/spool/mail \ + UCBINSTALL=/usr/bin/install > makeflags + + make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" `cat makeflags` install + + # For compatibility with the old mailx program + ln -sf mailx "${pkgdir}"/usr/bin/mail + ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz + + install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/core/hwids/PKGBUILD b/abs/core/hwids/PKGBUILD new file mode 100644 index 0000000..ea682a7 --- /dev/null +++ b/abs/core/hwids/PKGBUILD @@ -0,0 +1,17 @@ +# $Id: PKGBUILD 163600 2012-07-16 16:55:13Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +pkgname=hwids +pkgver=20120711 +pkgrel=1 +pkgdesc="hardware identification databases" +url=https://github.com/gentoo/hwids +license=('GPL2') +arch=('any') +source=("https://github.com/gentoo/${pkgname}/tarball/${pkgname}-${pkgver}") + +package() { + cd ${srcdir}/* + mkdir -p "${pkgdir}/usr/share/hwdata" + cp pci.ids usb.ids "${pkgdir}/usr/share/hwdata/" +} +md5sums=('f28b77e9793330ed1cd3568a8f715237') diff --git a/abs/core/iana-etc/PKGBUILD b/abs/core/iana-etc/PKGBUILD index 1c528a6..ef85afb 100644 --- a/abs/core/iana-etc/PKGBUILD +++ b/abs/core/iana-etc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 86037 2010-07-23 23:13:34Z thomas $ +# $Id: PKGBUILD 129440 2011-06-27 17:40:46Z dan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iana-etc pkgver=2.30 -pkgrel=1 +pkgrel=2 pkgdesc="/etc/protocols and /etc/services provided by IANA" arch=('any') url="http://sethwklein.net/iana-etc" license=('custom') makedepends=('awk') -source=(http://sethwklein.net/$pkgname-$pkgver.tar.bz2 +source=(http://sethwklein.net/iana-etc-2.30.tar.bz2 Makefile.patch) sha256sums=('b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d' '3e6db7adb8a67b765b8be65825f2a0e6c525eb42367385193c678af6b75d0321') @@ -21,10 +21,16 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + + make test +} + package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/iana-etc/LICENSE" } diff --git a/abs/core/idnkit/PKGBUILD b/abs/core/idnkit/PKGBUILD new file mode 100644 index 0000000..2a5fd25 --- /dev/null +++ b/abs/core/idnkit/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 142702 2011-11-13 10:10:08Z bisson $ +# Contributor: Igor Nemilentsev <trezorg@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=idnkit +pkgver=1.0 +pkgrel=2 +pkgdesc='Provides functionalities about Internationalized Domain Name processing' +url='http://www.nic.ad.jp/ja/idn/idnkit/download/' +license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('glibc') +options=('!makeflags' '!libtool') +source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") +sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') + +backup=('etc/idnalias.conf' 'etc/idn.conf') + +build() { + cd "${srcdir}/idnkit-${pkgver}-src" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --enable-static=no + make +} + +check() { + cd "${srcdir}/idnkit-${pkgver}-src" + make check +} + +package() { + cd "${srcdir}/idnkit-${pkgver}-src" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm "${pkgdir}"/etc/*.sample +} diff --git a/abs/core/ilmbase/PKGBUILD b/abs/core/ilmbase/PKGBUILD index b8930a5..fd95d6f 100644 --- a/abs/core/ilmbase/PKGBUILD +++ b/abs/core/ilmbase/PKGBUILD @@ -2,21 +2,34 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 depends=('gcc-libs') -pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR" +pkgdesc="Base libraries from ILM for OpenEXR" arch=(i686 x86_64) license=('custom') options=('!libtool') -source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz) -url="http://www.openexr.org" -md5sums=('f76f094e69a6079b0beb93d97e2a217e') +source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz + tests-compile-fixes.patch) +url="http://www.openexr.com" +md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4' + '2687ab9ac01b417ee5cf8c0174b72e43') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/tests-compile-fixes.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +check() { + cd ${srcdir}/$pkgname-$pkgver + # one of the tests fails randomly for an unknown reason + make check || true +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/abs/core/ilmbase/tests-compile-fixes.patch b/abs/core/ilmbase/tests-compile-fixes.patch new file mode 100644 index 0000000..27dc24a --- /dev/null +++ b/abs/core/ilmbase/tests-compile-fixes.patch @@ -0,0 +1,12 @@ +diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h +--- ilmbase-1.0.2/Imath/ImathMatrix.h 2010-07-17 00:48:40.000000000 +0200 ++++ ilmbase-1.0.2.new/Imath/ImathMatrix.h 2011-04-25 10:15:21.121608420 +0200 +@@ -49,6 +49,8 @@ + #include "ImathVec.h" + #include "ImathShear.h" + ++#include <cstdlib> ++#include <cstring> + #include <iostream> + #include <iomanip> + diff --git a/abs/core/imagemagick/PKGBUILD b/abs/core/imagemagick/PKGBUILD index c02552b..e2426fc 100644 --- a/abs/core/imagemagick/PKGBUILD +++ b/abs/core/imagemagick/PKGBUILD @@ -1,60 +1,82 @@ -# $Id: PKGBUILD 90849 2010-09-18 00:00:00Z eric $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Maintainer: DAniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> -pkgname=imagemagick -pkgver=6.6.5.10 +pkgbase=imagemagick +pkgname=('imagemagick' 'imagemagick-doc') +pkgver=6.7.8.7 pkgrel=1 -pkgdesc="An image viewing/manipulation program" arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig' 'libxext') -makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') -optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support') -options=('!makeflags' '!docs' 'force') +makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - libpng_mmx_patch_x86_64.patch - perlmagick.rpath.patch) + perlmagick.rpath.patch) build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - if [ "${CARCH}" = 'x86_64' ]; then - patch -Np1 < ../libpng_mmx_patch_x86_64.patch - fi + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf --install + patch -p0 -i ../perlmagick.rpath.patch - patch -p0 < ../perlmagick.rpath.patch + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \ + --without-gvc --without-djvu --without-autotrace --without-webp \ + --without-jbig --without-fpx --without-dps --without-fftw + make +} - ./configure --prefix=/usr --with-modules --disable-static \ - --enable-openmp --with-x --with-wmf --with-openexr --with-xml \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --with-jp2 \ - --without-jbig --without-fpx --without-dps - make +check() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make check } -package() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} +package_imagemagick() { + pkgdesc="An image viewing/manipulation program" + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') + optdepends=('ghostscript: for Ghostscript support' + 'openexr: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support' + 'libpng: for PNG support') + backup=('etc/ImageMagick/coder.xml' + 'etc/ImageMagick/colors.xml' + 'etc/ImageMagick/delegates.xml' + 'etc/ImageMagick/log.xml' + 'etc/ImageMagick/magic.xml' + 'etc/ImageMagick/mime.xml' + 'etc/ImageMagick/policy.xml' + 'etc/ImageMagick/quantization-table.xml' + 'etc/ImageMagick/thresholds.xml' + 'etc/ImageMagick/type.xml' + 'etc/ImageMagick/type-dejavu.xml' + 'etc/ImageMagick/type-ghostscript.xml' + 'etc/ImageMagick/type-windows.xml') + options=('!docs' 'libtool' '!emptydirs') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - make DESTDIR="${pkgdir}" install +#Cleaning + find "${pkgdir}" -name '*.bs' -delete + rm -f "${pkgdir}"/usr/lib/*.la +} - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" +package_imagemagick-doc() { + pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - #Cleaning - find "${pkgdir}" -name '*.bs' -exec rm {} \; - rm -f "${pkgdir}"/usr/lib/*.la + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install-data-html + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" } -md5sums=('dd8ae557c11472df1a5643c7d1e24c33' - '069980fc2590c02aed86420996259302' - 'ff9974decbfe9846f8e347239d87e4eb') -md5sums=('973d2f13d0daffa7fe2efc9d080e0b04' - '069980fc2590c02aed86420996259302' +md5sums=('c12aa1fafac9ebdca42464ba872fac86' 'ff9974decbfe9846f8e347239d87e4eb') diff --git a/abs/core/imagemagick/libpng_mmx_patch_x86_64.patch b/abs/core/imagemagick/libpng_mmx_patch_x86_64.patch deleted file mode 100644 index d86449a..0000000 --- a/abs/core/imagemagick/libpng_mmx_patch_x86_64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ImageMagick-6.2.7.orig/coders/png.c ImageMagick-6.2.7/coders/png.c ---- ImageMagick-6.2.7.orig/coders/png.c 2006-05-21 12:35:55.784852536 +0200 -+++ ImageMagick-6.2.7/coders/png.c 2006-05-21 12:36:50.698504392 +0200 -@@ -164,6 +164,8 @@ - #define PNG_MAX_UINT (png_uint_32) 0x7fffffffL - #endif - -+#undef PNG_ASSEMBLER_CODE_SUPPORTED -+ - /* - Constant strings for known chunk types. If you need to add a chunk, - add a string holding the name here. To make the code more diff --git a/abs/core/imake/PKGBUILD b/abs/core/imake/PKGBUILD index 9a879d8..74a7527 100644 --- a/abs/core/imake/PKGBUILD +++ b/abs/core/imake/PKGBUILD @@ -1,46 +1,53 @@ -# $Id: PKGBUILD 87585 2010-08-17 07:28:34Z jgc $ +# $Id: PKGBUILD 152805 2012-03-09 17:06:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=(glibc) -makedepends=(pkgconfig xproto perl) +depends=('glibc') +makedepends=('pkgconfig' 'xproto' 'perl') optdepends=('perl: for mkhtmlindex') -source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.3.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.bz2 - linuxconfig.patch - xorg-cf-files-1.0.2-xprint.patch - LICENSE) -md5sums=('ff553c4646edcc9e76b7308991ad421a' - 'b533c0771dbbaf9b041ff35bb941d3a2' - '619acbb2ed766d7762f02328513b1f72' - '62e58330fe8d1e3e28c7a45779833a48' - '10546b5ddda3cdda7950bb56bf98e0ea' - 'b3385d8efbbe7c7fc50ed3a96ce37a16' - '82356cfc8a761c85b0b37736fc91f604' - 'f5767133ef7a98a0bfa15139e0e3d32e') +source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" + 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2' + 'linuxconfig.patch' + 'LICENSE') +sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1' + 'a3d971a507a460233afd8ed46e9f06135fed634d' + 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' + '1f0f8aea1526c6c022f2cf16f7a6c67118c68336' + 'c58b7252df481572ec1ccd77b9f1ab561ed89e45' + '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' + 'c5ecffb25ad079ba3858e3aec047d046df603a89') build() { - cd ${srcdir}/xorg-cf-files-1.0.3* - patch -Np1 -i "${srcdir}/linuxconfig.patch" || return 1 - patch -Np1 -i "${srcdir}/xorg-cf-files-1.0.2-xprint.patch" || return 1 + cd ${srcdir}/xorg-cf-files-1.0.4 + patch -p1 -i "${srcdir}/linuxconfig.patch" cd "${srcdir}" for i in *; do if [ -d "${i}" ]; then pushd "${i}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make popd fi done - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 +} + +package() { + cd "${srcdir}" + for i in *; do + if [ -d "${i}" ]; then + pushd "${i}" + make DESTDIR="${pkgdir}" install + popd + fi + done + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch b/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch deleted file mode 100644 index 3926d72..0000000 --- a/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- xorg-cf-files-1.0.3/X11.tmpl.xprint 2005-10-01 12:45:48.000000000 -0400 -+++ xorg-cf-files-1.0.3/X11.tmpl 2006-04-25 20:24:02.000000000 -0400 -@@ -3920,21 +3920,13 @@ - #endif - - #ifndef ExtraXawReqs --# if BuildXaw --# define ExtraXawReqs $(XPLIB) --# else --# define ExtraXawReqs /**/ --# endif -+# define ExtraXawReqs /**/ - #endif - - EXTRAXAWREQS = ExtraXawReqs - - #ifndef ExtraXawClientDepLibs --# if BuildXaw --# define ExtraXawClientDepLibs $(DEPXPLIB) --# else --# define ExtraXawClientDepLibs /**/ --# endif -+# define ExtraXawClientDepLibs /**/ - #endif - - EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs -@@ -3944,11 +3936,7 @@ - #endif - - #ifndef ExtraXawClientLibs --# if BuildXaw --# define ExtraXawClientLibs $(XPLIB) --# else --# define ExtraXawClientLibs /**/ --# endif -+# define ExtraXawClientLibs /**/ - #endif - - EXTRAXAWCLIENTLIBS = ExtraXawClientLibs diff --git a/abs/core/imap/PKGBUILD b/abs/core/imap/PKGBUILD new file mode 100644 index 0000000..7e00106 --- /dev/null +++ b/abs/core/imap/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 132404 2011-07-24 11:35:43Z pierre $ + +pkgname=imap +pkgver=2007f +pkgrel=1 +pkgdesc="An IMAP/POP server" +arch=('i686' 'x86_64') +license=('APACHE') +url="http://www.washington.edu/imap" +depends=('openssl' 'pam') +provides=('imap-server' 'pop3-server') +conflicts=('courier-mta' 'courier-imap') +source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz" + 'imap' 'ipop2' 'ipop3') +backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem) +md5sums=('2126fd125ea26b73b20f01fcd5940369' + 'e77dedb80c2fec9bf2ef784ed5f976fb' + 'cc3eba6453242aa0b1bc8881160b2136' + '0a5e27183a9b7e8ec5f6703125371e0a') + +build() { + sed \ + -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ + -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ + -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ + -i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile + + cd $srcdir/$pkgname-$pkgver + # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd + + if [ "$CARCH" == "x86_64" ]; then + yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1 + else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1 + fi + + # create ssl certs for secure imap + for i in imapd ipop3d; do + PEM1=$srcdir/pem1 + PEM2=$srcdir/pem2 + /usr/bin/openssl req -newkey rsa:1024 -keyout $PEM1 \ + -nodes -x509 -days 365 -out $PEM2 << EOF +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +localhost.localdomain +root@localhost.localdomain +EOF + + cat $PEM1 > ${i}.pem + echo "" >> ${i}.pem + cat $PEM2 >> ${i}.pem + rm $PEM1 $PEM2 + umask 022 + done +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -d $pkgdir/usr/sbin + install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd + install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d + install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d + for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ + osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do + install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h + done + install -D -m644 c-client/c-client.a $pkgdir/usr/lib/c-client.a + ln -sf c-client.a $pkgdir/usr/lib/libc-client.a + + # install certs + install -D -m600 imapd.pem $pkgdir/etc/ssl/certs/imapd.pem + install -D -m600 ipop3d.pem $pkgdir/etc/ssl/certs/ipop3d.pem + + # install xinetd.d configs + install -D -m644 ../imap $pkgdir/etc/xinetd.d/imap + install -D -m644 ../ipop2 $pkgdir/etc/xinetd.d/ipop2 + install -D -m644 ../ipop3 $pkgdir/etc/xinetd.d/ipop3 +} diff --git a/abs/core/rsync/rsync.xinetd b/abs/core/imap/imap index f5b6b1e..da45739 100644 --- a/abs/core/rsync/rsync.xinetd +++ b/abs/core/imap/imap @@ -1,10 +1,9 @@ -service rsync +service imap2 { socket_type = stream wait = no user = root - server = /usr/bin/rsync - server_args = --daemon + server = /usr/sbin/imapd log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/abs/core/imap/ipop2 b/abs/core/imap/ipop2 new file mode 100644 index 0000000..bd74c83 --- /dev/null +++ b/abs/core/imap/ipop2 @@ -0,0 +1,10 @@ +service pop2 +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/ipop2d + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/abs/core/imap/ipop3 b/abs/core/imap/ipop3 new file mode 100644 index 0000000..410a45a --- /dev/null +++ b/abs/core/imap/ipop3 @@ -0,0 +1,10 @@ +service pop3 +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/ipop3d + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/abs/core/imlib2/PKGBUILD b/abs/core/imlib2/PKGBUILD index e13c50d..1918169 100644 --- a/abs/core/imlib2/PKGBUILD +++ b/abs/core/imlib2/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 79752 2010-05-06 13:39:04Z ronald $ +# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=2 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') license=('BSD') -depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8') +depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') options=('!libtool') source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b') +sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # disable optimizations, they cause problems (e.g. FS#12268) [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" @@ -25,10 +25,14 @@ build() { # Configure and Build ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ - --x-libraries=/usr/lib $EXTRAOPTS || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + --x-libraries=/usr/lib $EXTRAOPTS + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # Install License - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/abs/core/inetutils/PKGBUILD b/abs/core/inetutils/PKGBUILD new file mode 100644 index 0000000..aeea05d --- /dev/null +++ b/abs/core/inetutils/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 157926 2012-04-30 06:14:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=inetutils +pkgver=1.9.1 +pkgrel=2 +pkgdesc="A collection of common network programs" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/inetutils/" +license=('GPL3') +groups=('base') +depends=('readline' 'ncurses' 'pam') +backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ + 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') +options=('!emptydirs') +install=inetutils.install +source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ + ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ + dnsdomainname) +sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' + 'ff0aad9946a38915580b094dadf67e790e8a2f87' + '84dc802b5e57b5e04c847572225a3b9612017155' + '68a590083b45997dfdb80e666b2de762f494ba74' + 'bfad98a4a62f1fff8779f076c6019ed07f9111af' + '27d99b910eec0fc26bd79ccc2c1de26608330298' + '81f10b3b688e3952f793b35bcef63b5bf257a92b' + '81f4a8da823cf0bb14284fc71ee6108849691eda' + 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/gets is a security hole/d' lib/stdio.in.h + + ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ + --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ + --without-wrap --with-pam \ + --enable-ftp --enable-ftpd \ + --enable-telnet --enable-telnetd \ + --enable-talk --enable-talkd \ + --enable-rlogin --enable-rlogind \ + --enable-rsh --enable-rshd \ + --enable-rcp --enable-hostname \ + --disable-rexec --disable-rexecd \ + --disable-tftp --disable-tftpd \ + --disable-ping --disable-ping6 \ + --disable-logger --disable-syslogd \ + --disable-inetd --disable-whois \ + --disable-uucpd --disable-ifconfig --disable-traceroute + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/bin" + ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" + install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" + install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" + install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" + install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" + install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" + install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" +} diff --git a/abs/core/inetutils/__changelog b/abs/core/inetutils/__changelog new file mode 100644 index 0000000..b5d6eea --- /dev/null +++ b/abs/core/inetutils/__changelog @@ -0,0 +1,2 @@ +sed -i '/gets is a security hole/d' lib/stdio.in.h + diff --git a/abs/core/inetutils/dnsdomainname b/abs/core/inetutils/dnsdomainname new file mode 100644 index 0000000..a1b8a8c --- /dev/null +++ b/abs/core/inetutils/dnsdomainname @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/hostname -d "$@" diff --git a/abs/core/inetutils/ftpd.conf b/abs/core/inetutils/ftpd.conf new file mode 100644 index 0000000..f660f00 --- /dev/null +++ b/abs/core/inetutils/ftpd.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to ftpd +# +FTPD_ARGS="" diff --git a/abs/core/rsync/rsyncd b/abs/core/inetutils/ftpd.rc index e1313dc..3d0d344 100644 --- a/abs/core/rsync/rsyncd +++ b/abs/core/inetutils/ftpd.rc @@ -2,27 +2,27 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/ftpd +PID=$(pidof -o %PPID /usr/sbin/ftpd) case "$1" in start) - stat_busy "Starting rsyncd" - [ ! -f /var/run/daemons/rsyncd ] && /usr/bin/rsync --daemon + stat_busy "Starting ftpd" + [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS if [ $? -gt 0 ]; then stat_fail else - pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid - add_daemon rsyncd + add_daemon ftpd stat_done fi ;; - stop) - stat_busy "Stopping rsyncd" - [ -f /var/run/rsyncd.pid ] && kill `cat /var/run/rsyncd.pid` + stat_busy "Stopping ftpd" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon rsyncd + rm_daemon ftpd stat_done fi ;; diff --git a/abs/core/inetutils/inetutils.install b/abs/core/inetutils/inetutils.install new file mode 100644 index 0000000..b338fa4 --- /dev/null +++ b/abs/core/inetutils/inetutils.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(inetutils.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/inetutils/rlogin.xinetd b/abs/core/inetutils/rlogin.xinetd new file mode 100644 index 0000000..5c72f86 --- /dev/null +++ b/abs/core/inetutils/rlogin.xinetd @@ -0,0 +1,10 @@ +service login +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/rlogind + log_on_failure += USERID + disable = yes +} diff --git a/abs/core/inetutils/rsh.xinetd b/abs/core/inetutils/rsh.xinetd new file mode 100644 index 0000000..a13738c --- /dev/null +++ b/abs/core/inetutils/rsh.xinetd @@ -0,0 +1,10 @@ +service shell +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/rshd + log_on_failure += USERID + disable = yes +} diff --git a/abs/core/inetutils/talk.xinetd b/abs/core/inetutils/talk.xinetd new file mode 100644 index 0000000..6abef35 --- /dev/null +++ b/abs/core/inetutils/talk.xinetd @@ -0,0 +1,10 @@ +service ntalk +{ + flags = REUSE + socket_type = dgram + wait = yes + user = root + server = /usr/sbin/talkd + log_on_failure += USERID + disable = yes +} diff --git a/abs/core/inetutils/telnet.xinetd b/abs/core/inetutils/telnet.xinetd new file mode 100644 index 0000000..bd3a5e4 --- /dev/null +++ b/abs/core/inetutils/telnet.xinetd @@ -0,0 +1,10 @@ +service telnet +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/telnetd + log_on_failure += USERID + disable = yes +} diff --git a/abs/core/initscripts/ChangeLog b/abs/core/initscripts/ChangeLog deleted file mode 100644 index a8c7a23..0000000 --- a/abs/core/initscripts/ChangeLog +++ /dev/null @@ -1,2194 +0,0 @@ -commit 2c5e306be0bcc8d91662176bfcfb55ec95777bc3 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Wed Jan 21 13:10:34 2009 -0800 - - Adjust copyright year to 2009 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit ad81ddafabd95ee1ea7169880a6a80f04babf9a6 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Dec 23 14:45:30 2008 -0800 - - Add some simple status display functions - - This is useful for displaying daemon status in functions - like /etc/rc.d/$DAEMON status - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit fa4f2f14870500eeab3233da07647a7c2c5e1648 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Dec 23 14:43:51 2008 -0800 - - Adjust minilogd's maximums - - A max of 200000 lines stored, at 8K per line, was a little - ridiculous and soaked up way to much memory if a syslogger - was not started. Drop the max to 10000 so that we don't kill - the user's system. - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 0e4ff39e5a5c72b7d4e8d251d029d4342f68b7b6 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Dec 23 14:41:09 2008 -0800 - - chmod /var/run/utmp to 664 when creating - - This allows X terminals to write to /var/run/utmp - so that they are reported properly to commands like - who and w - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit af3ac0dc954d96855555aa8cb12633494d465a77 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Thu Dec 4 09:40:14 2008 -0800 - - unset the TZ envvar in 'functions' - - This prevents a local TZ variable from breaking - daemon's when started by root. Daemon's should always - respect the system's /etc/localtime - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9ac428a113d5dee2b4d5469fdfdb383eda90d4c6 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Mon Nov 24 07:50:45 2008 -0800 - - Switch commented kdm path - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 572019c5a188d22a1e833c1a27081227a65133f9 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Thu Sep 25 00:33:32 2008 -0500 - - Added missing slash - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit af5516dc690a3b2fab88188cfcde898ca0efbf4b -Author: Thomas Bächler <thomas@archlinux.org> -Date: Thu Sep 18 22:21:39 2008 +0200 - - Fix bug #11229 - -commit 8f1628613cc5746b7c85c6f84776b365833f1dad -Author: Thomas Bächler <thomas@archlinux.org> -Date: Thu Sep 18 18:55:14 2008 +0200 - - Respawn udev properly when running 'init s'. Fixes #9739 - -commit ce600eea3b9383f167cb91d784aff04821fa0528 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Sep 14 19:46:14 2008 +0200 - - Remove references to start_udev from rc.sysinit - -commit d399979d08be1ae2cc8e4ab60a68c57b120d08a0 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Sep 14 19:41:14 2008 +0200 - - Revert "Create udev required device nodes if missing" - - This reverts commit 119b8df1fb1258231750309f01e747e72f382493. - These nodes are created like 10 lines above, the [ -f ... ] check would always return false anyway (-f == regular file) - -commit 119b8df1fb1258231750309f01e747e72f382493 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Sat Aug 30 21:11:39 2008 -0500 - - Create udev required device nodes if missing - - Udev requires /dev/console, /dev/null, and /dev/zero to exist - before running. Create these on init if they're missing - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit d2ae38c8b06d057c7593b7ba836bf24a1f8f6c4f -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Aug 5 14:34:53 2008 -0400 - - Set kbd_mode on all virtual consoles - - Previous behavior only set the mode for vc0. - See FS#11093 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit b7d66decca5117aaba3b73d2eccb97594ef1ea98 -Author: Daniel Kaminski <maniel.rulez@gmail.com> -Date: Tue Jul 22 17:50:02 2008 -0400 - - ipv6 over ipv4 tunneling support in /etc/rc.d/network - - This is done by checking the route config for a double colon - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 04899c1b829f1a4708a04e2188b256901845770f -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Fri Jul 18 11:47:22 2008 -0400 - - Remount filesystems RO if umounting fails - - Just a safeguard, suggested by FS#10947 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit e13ee23fd2d0035150d178fc683079696fb446fc -Author: James Rayner <james@archlinux.org> -Date: Mon Jul 14 21:24:33 2008 +1000 - - Add some useful error messages to wireless code - - Additionally add optional WIRELESS_TIMEOUT parameter - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 84f76aafc5f6d7f3d2c2141d2930e42dcb82def0 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Mon Jun 30 12:35:21 2008 -0400 - - Decouple ISO release name from initscripts - - This should aleviate some gripes - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9dcd7a9fed510dacd14e4cf4497e73a98f847fac -Author: Natanael Copa <natanael.copa@gmail.com> -Date: Fri Jun 20 13:46:10 2008 -0400 - - Minor simplication for /etc/rc.d/functions.d/ - - Trivial simplification to make code more readable. - Removes one fork so booting should be "faster". Probably not mesureable - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit fa73767d19ea505ec32533b8856122968207db2f -Author: Anton Fiuman <llexiw@gmail.com> -Date: Sun May 25 00:55:56 2008 +0200 - - Allow users to ovverride daemon start and stop in rc.multi and rc.shutdown - - Signed-off-by: Anton Fiuman <llexiw@gmail.com> - -commit 63db98c2a8e256f9219c5c6501b40846040bf089 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Thu May 22 13:02:55 2008 -0400 - - Remove source_functions in favor of always sourcing the dir - - This is an obvious oversight on my part - this change allows - the overridden functions to work in daemon scripts and - anything else that uses /etc/rc.d/functions by itself. - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit de031161e02772aaeaefed1398f8ad59621bd8bc -Author: Thomas Bächler <thomas@archlinux.org> -Date: Wed May 14 13:49:16 2008 +0200 - - Fix commit 521d7678cecb3018923f7c869bc8a5f74dc29268, this makes more sense - -commit af36e8dd3c025d7593bda4f310612989927149d1 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 13 18:32:43 2008 +0200 - - Always quote $TIMEZONE to fix FS#10178 - -commit 521d7678cecb3018923f7c869bc8a5f74dc29268 -Author: Pierre Schmitz <pierre@archlinux.de> -Date: Sat Apr 12 13:37:22 2008 +0200 - - fixing udev hotplugging Some devices like scanners do not work with recent udev/initscript changes. This patch seems to fix such issues. - -commit 42c5f304ad361fd9e16d08a5230043e47437c399 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Tue Apr 8 20:12:55 2008 +0200 - - Just some whitespace fixes - -commit 391cfa71285cfca49aed0d6d2a05c9a949cb9857 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Mon Apr 7 15:33:20 2008 +0200 - - Remove setterm screen blanking from rc.sysinit - Contrary to what one may think, screen blanking not only affects the - console, but also the X server. This line may lead to unwanted blank screens - although one has DPMS disabled in X. Furthermore, it adds a hardcoded, - non-configurable default setting to Arch. - This should either be made configurable (but IMO, we don't need more stuff - in rc.conf) or added to rc.local by the user if needed. As this is a - one-liner, the second solution sounds good to me. - -commit a58228bfe3764008ecf971d420fb7fa0bb704b54 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 23:37:17 2008 +0200 - - Remove extra newline from udev status output - -commit 307c850a0c345a092a21fff50da2f0658c3c03c4 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 23:30:48 2008 +0200 - - Remove the "interface is already up" check from ifup - As stated in commit f589387f0b9ef56de8ab30f50a3c562e010baeeb, even an - interface that is 'UP' may need configuring. However, the check introduced - in this commit is nonsense (causing bug #9960, possibly others). The best - idea is to remove the check altogether: This may cause duplicate dhcpcd - processes to run (should be fixed), but otherwise ensures the interface is - brought up when it should be. - -commit 89355a468670983476d29b415c12e097d5d79ca5 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 23:20:37 2008 +0200 - - Fix USEDIRECTISA in rc.shutdown as well - -commit b55845f7d0e3c81f1936d471370dcb40822463b0 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 15:55:23 2008 +0200 - - Remove old initrd hacks - We haven't been using initrd for a while, so these hacks are unnecessary. - The "encrypted root device hack" was obsoleted by proper udev rules long - ago. The code to umount and free the initrd is not critical, so if somebody - insists on using initrd, it can be done in rc.local. - -commit 4c493ec5599b1a30dadc51567e2546a63feb87ef -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 15:50:57 2008 +0200 - - Make USEDIRECTISA default to no, which is a sane default according to hwlock's manpage. This is contrary to the behaviour in older initscripts. - -commit 4a4cb51a138d73753bb967c27a9f7ea8bf9f88b3 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 15:48:22 2008 +0200 - - Move /sys mounting to the beginning, together with /proc and /dev and clean up some comments - -commit f3e064ec822b3dae191e1ae5d2bb921a970af86e -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Apr 6 15:40:08 2008 +0200 - - Remove any special handling of usbfs from rc.sysinit - libusb has migrated to /dev/bus/usb, which is managed by udev and thus more - flexible. Some legacy applications (like VirtualBox) still use it. However, - since users need special permissions to access usbfs, they have to be - specified via mount options in fstab. So there are two cases: - 1) a user does not need usbfs - 2) a user needs it, but must add it to fstab to force the right permissions - Our old special handling in rc.sysinit is thus obsolete (and it was ugly - anyway). - -commit 5386d7332dd77ecf4113dfc10773b529f583e797 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Wed Mar 19 11:12:19 2008 +0200 - - Use actual device number for creating /dev/misc/rtc0 - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 6e37620983c107e13120d1e249a37b3be6d0b12d -Author: Roman Kyrylych <roman@archlinux.org> -Date: Tue Mar 18 22:43:38 2008 +0200 - - Do not try to create /dev/pts and /dev/shm twice - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit a71b075e90154073e3ba331de9b74b8bc088ec45 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Mar 18 12:33:24 2008 -0500 - - Fix a directory typo - - Looks like a 'bin/' slipped in there somewhere. Whoops - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 52a6990bc7ab0b48d6d227a8dcb782cb1d419dd5 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Mon Mar 17 11:34:12 2008 -0500 - - Variable expansion quoting - - This was missed, and caused some gross output if a user - mistakenly had a space in their timezone (we should fail - gracefully here, not let bash error). - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 15647a9f42a00406ec1c1c02515fe1e90825bd9b -Author: Roman Kyrylych <roman@archlinux.org> -Date: Tue Mar 11 00:02:22 2008 +0200 - - Remove the 'makedevs' script - - * last touched somewhere in 2005 - * not used by anything - * sits in /sbin but uses software from /usr/bin - * makedev in Extra exists - * if one wants a static /dev - just use mknod - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 12ee0a4fe0108fe952dc31c5f42648037b9c5cde -Author: Roman Kyrylych <roman@archlinux.org> -Date: Mon Mar 10 17:58:48 2008 +0200 - - Fix a typo in /dev/rtc creation steps - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 7526db5d0405188fee94d16fbcfbdf13a17e6a45 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sun Mar 9 17:22:11 2008 +0200 - - More full-path fixes - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 2c9681f461a0cde98a88de65e232369df68ed859 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 8 20:02:09 2008 +0200 - - Add basic support for dependencies in rc.d scripts - - Example of use: - DEPENDS=('dbus' 'acpid') - . . . - ck_depends ${DEPENDS[@]} - and those daemons will be started if not running already - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 45e331302268490cfb532ea6fe827cba1351ec5b -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 8 19:22:48 2008 +0200 - - Use full path to binaries everywhere - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 6214a05ea023b8bc3014d8032af18b2404276d00 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 8 18:45:24 2008 +0200 - - Create /dev/rtc before running hwclock (FS#9636) - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 973c1b65ad9fb92c6a0e017a7b8bfb40c38b3bcd -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 8 19:28:08 2008 +0200 - - Fix indentation in rc.d/functions - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 646862aa989d82c35d267d5771c6cc620275bf4c -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Fri Mar 7 14:35:31 2008 -0600 - - Additional /dev/ setup that udev doesn't do - - These nodes are not covered by default udev, so lets make - sure they're added properly. - - Ref: FS#9726 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit abe6dcb83d16c6e40fed99c202085c78cb356fa1 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Fri Mar 7 14:34:26 2008 -0600 - - Add my name to the copyright output - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 91b86efedd70e6b83232057fbf2b089a47b76333 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Thu Mar 6 00:24:20 2008 +0200 - - Revert back to not loading defkeymap - - * There is a patch for the kernel now, so no need to workaround the bug - * Add a missing check for an empty KEYMAP - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 56fffa9954db654c1731e07f753c3de105896455 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sun Mar 2 16:31:34 2008 +0200 - - Always load defkeymap - - It seems that there's a bug in the kernel 2.6.24, - which makes the built-in defkeymap to produce incorrect composite chars. - Thus keymaps that don't have 'include "compose.latin1"' have issues (FS#9593). - While it is better to fix this bug in kernel and all affected keymaps - loading defkeymaps before other keymaps seems to not hurt anyway. - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit f94f52e5ab877ffc3160d0bf20c70be9865d45b2 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 1 00:40:02 2008 +0200 - - Set up vc/0 as well - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 1b5eeefa5a859a9c26a717603bd4c0e9fb74de82 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sat Mar 1 00:04:01 2008 +0200 - - Do not mount /proc/bus/usb if commented in fstab - - Fixes FS#9451 - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 4d0920ede7ce9c3d67e03c67b9ee584cf1a3fe9d -Author: Roman Kyrylych <roman@archlinux.org> -Date: Thu Feb 28 13:55:41 2008 +0200 - - Make non-UTF-8 consoles work correctly in .24+ kernels - - * Since 2.6.24 the virtual terminal is in UTF-8 mode - and the keyboard is in Unicode mode by default, - and configurable only at run-time. - - * To make non-UTF-8 consoles work correctly: - - the non-UTF-8 mode is set for the virtual terminal, - - the XLATE mode is set for the keyboard. - - * UTF-8 mode is still set explicitly (not relying on default), - so console works correctly even in a case when user set vt.default_utf8=0 - in kernel commandline, but LOCALE in rc.conf is *.UTF-8. - - * % is a special symbol for printf, so it should be written twice. - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit ef86e38e9fd750db35e23aa949aa60e4c9f60f0c -Author: Roman Kyrylych <roman@archlinux.org> -Date: Thu Feb 21 18:07:44 2008 +0200 - - Remove trailing whitespaces and do some little reformatting - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit bb639b33167e13602aacf34bab6032992e7b3d6a -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Wed Feb 20 23:46:57 2008 -0600 - - Add some udev stats output - - So we can see timing and all that jazz - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit e658f681e1d36a75b527d182ce28ee0781ed4492 -Author: Dan McGee <dan@archlinux.org> -Date: Thu Feb 14 20:16:49 2008 -0600 - - rc.shutdown: Fix hwclock double calls - - Commit 9673449ac0af77751eab62423114f27e7dbc497c added --directisa - configuration to rc.shutdown, but didn't remove the old hwclock calls and - instead just added a second call. Remove the original calls. - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit e16e2d17c97f91cdb9eda0ad3525ee7977ad40a6 -Merge: 626037f... fbb8d26... -Author: Dan McGee <dan@archlinux.org> -Date: Thu Feb 14 19:56:02 2008 -0600 - - Merge branch 'posix' into working - -commit 626037f6043596f21511b76b088dca86fc079f42 -Author: Dan McGee <dan@archlinux.org> -Date: Thu Feb 14 19:53:03 2008 -0600 - - functions:source_functions(): don't fail on empty dir - - Instead of using globbing which will fail on an empty directory, use an ls - call similar to other places in the initscripts which is not prone to - failure. (See rc.single in the daemon shutdown for example.) - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit fbb8d26a81dc220d7795be871e09c89fd0e03a76 -Author: Dan McGee <dan@archlinux.org> -Date: Fri Nov 30 09:30:05 2007 -0600 - - Remove echo -e usage from rc.sysinit - - Use the always available (in sh) printf method instead. - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit 7b6fddfb12106c9485a9ceb8fa1876a501d1f181 -Author: Dan McGee <dan@archlinux.org> -Date: Fri Nov 30 09:23:02 2007 -0600 - - Remove some bashisms from network, even though we cannot convert it - - Since netfs and network source rc.conf, we cannot fully convert it to an sh - script. However, we can get rid of a few things that are not sh compatible. - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit e3985084056bb80c886ea649674c3da5b906ccab -Author: Dan McGee <dan@archlinux.org> -Date: Fri Nov 30 09:18:26 2007 -0600 - - Make install.sh sh compatible - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit 980791fd888b6efff6319c77363aab473166ca6b -Author: Dan McGee <dan@archlinux.org> -Date: Fri Nov 30 09:17:15 2007 -0600 - - Make functions sh compatible - - There is no reason to use bashisms in functions, so eliminate any and use - printf instead of echo options which are not guaranteed to be implemented in - a POSIX sh. - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit dc4cee8f5987098a07a8b272573424b599a52598 -Author: Dan McGee <dan@archlinux.org> -Date: Sat Nov 17 12:03:59 2007 -0600 - - Don't assume sh == bash - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit ccc90d4d211a61a21c835c1e51c807ddd485a136 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Thu Feb 14 14:51:40 2008 -0600 - - Add support for (un)mounting nfs4 - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9673449ac0af77751eab62423114f27e7dbc497c -Author: Roman Kyrylych <roman@archlinux.org> -Date: Wed Jan 23 17:46:03 2008 -0600 - - Use --directisa configuration in rc.shutdown as well - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit f589387f0b9ef56de8ab30f50a3c562e010baeeb -Author: Loic Nageleisen <lloeki@gmail.com> -Date: Tue Jan 8 09:14:42 2008 -0600 - - Enhance interface 'up' state checking - - Using the 'UP' state to imply operational status is wrong and even if a - device is 'UP' we may still need to run ifconfig/dhcp - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9e341d31cd15172941268412d258c38591ff4988 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Jan 8 09:09:46 2008 -0600 - - network script logic cleanups/enhancements - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 7719cd7c0ac6d3f316ed8595becf29ef418d9af9 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Jan 8 09:07:05 2008 -0600 - - Remove the hotplug functionality from the network script - - Hotplug hasn't been supported in Arch for ages - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit c2d7f40b2e0837f5544e6e2bfc22dc12e994ed16 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Jan 8 03:35:05 2008 -0600 - - Create some basic device nodes on initialization - - We need, at the very least, these three device nodes - (null, console, and zero) created before we get udev - up and running - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit cd0b3911131ee0eddc32c5e3992036c2e769948f -Author: Jonathan Frazier <eyeswide@gmail.com> -Date: Tue Jan 8 03:26:12 2008 -0600 - - minilogd cleanup and warning fixes - - gcc gives a warning about signed/unsigned ints, and it tries to write to - syslog's /dev/log with a dgram socket which gives an EPROTOCOL error. - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9bf2014b750579d9720c13c9dfb9d358e0c27665 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Tue Jan 8 03:06:56 2008 -0600 - - Allow --directisa configuration for hwclock calls - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit ab5595c4f8cdea8e6b1813701828576cbfee2fc2 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Thu Dec 20 12:32:12 2007 -0600 - - Deprecate MOD_BLACKLIST via some comments - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 2694f1224dfb5b5c734a781fc813e639139feb39 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Thu Dec 20 12:19:56 2007 -0600 - - Mount our ram /dev as soon as possible - - On readonly root systems, lots of fdup calls fail on device nodes, for - instance in minilogd. So we'll mount /dev as early as we can - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 25811badce84cd157a8b66c84e78f931cad1d129 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Thu Dec 20 12:15:26 2007 -0600 - - Set hwclock *before* udev is loaded - - This prevents /dev/ timestamps from being 'in the future' when the hwclock - is not in UTC. - - Closes FS#8665 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit b82f9d580d1ab70e78de4c81c180c5a308bd1238 -Author: James Rayner <james@archlinux.org> -Date: Thu Dec 20 10:53:25 2007 -0600 - - Tidy up rc.conf - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit a4a35bda6ef3fd3e444e90ab362369f0b1f511dc -Author: Simo Leone <simo@archlinux.org> -Date: Thu Dec 20 01:30:59 2007 -0600 - - Make the background black on all status text - - This is the easiest way to cleanup the script output on white terminals - without resorting to shutting off color. - - It won't make everyone happy, though. - - Ref: FS#1186 - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 5ccb8edb591213e03fc3909aa7db7242b9f54b30 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Mon Dec 17 16:16:38 2007 -0600 - - Modify comment above MOD_AUTOLOAD to indicate that it autoloads - - Some people thought the comment was unclear - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 20d6e1081ec7105207c01e9d8d2a58bb4a145331 -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Mon Dec 17 16:08:05 2007 -0600 - - Save dmesg output at the end of the boot process - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 9d86b8814583509069ad6707688e2b41fc0d292f -Author: Roman Kyrylych <roman@archlinux.org> -Date: Wed Dec 12 10:28:37 2007 -0600 - - Fix FS#8843 (no colors in rc.sysinit output with separate /usr) - - when tput returns exit code 3 - assume it output '8' - (as written in the /usr/share/terminfo/l/linux file) - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - - Converted to if/elsif form - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 662a52c15343338e9d843c6f70d39acefd3a2c4c -Author: Dan McGee <dan@archlinux.org> -Date: Sun Nov 18 11:47:54 2007 -0600 - - Move start_udev actions to rc.sysinit - - start_udev has been deprecated upstream for some time. We shouldn't use - some hacked up version of it either. - - Signed-off-by: Dan McGee <dan@archlinux.org> - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit b1d0ec7cb6e8cea9f2fd7b0c11a0b607467615bd -Author: James Rayner <james@archlinux.org> -Date: Sat Nov 10 13:26:39 2007 +1100 - - Removing netcfg from initscripts - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit b8e558d5784c8054a91dcefd8495b739a664dbae -Author: Aaron Griffin <aaronmgriffin@gmail.com> -Date: Wed Nov 28 14:47:09 2007 -0600 - - Source /etc/rc.d/functions.d/ for additional initscript functions - - Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> - -commit 57879c6d6c51918b8106142e70643b53a9a8c7da -Author: Roman Kyrylych <roman@archlinux.org> -Date: Fri Nov 9 16:47:44 2007 +0200 - - Improve error handling and allow multiple keymaps to be loaded - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 9af6022b841c84283a061d6a7a5be943057ac3ae -Author: Dan McGee <dan@archlinux.org> -Date: Sun Oct 21 20:29:16 2007 -0500 - - Add a few more comments and examples to inittab - - Signed-off-by: Dan McGee <dan@archlinux.org> - -commit c5cffb501763c355299e593d16089fa5e56097b2 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 18:51:51 2007 +0200 - - Fix broken terminal detection, disable colors when the terminal is unknown. - -commit e3f7fc94d40e13f65e00adb3d7c48fb6f790c7d7 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sun Oct 21 16:39:24 2007 +0300 - - make non-ASCII chars work before login too - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit bbc2f945cb5df2ff103759ccb6de5183a87487b7 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 15:11:20 2007 +0200 - - yes, I fixed a trailing whitespace - -commit 59f89b4a25fbc100551a814f5bcf81aa05b6c2e7 -Author: Roman Kyrylych <roman@archlinux.org> -Date: Sun Oct 21 15:24:57 2007 +0300 - - Fix locale handling - - Signed-off-by: Roman Kyrylych <roman@archlinux.org> - -commit 956e12f7f57a38ed382032d361ac22196d015170 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 11:45:43 2007 +0200 - - change install.sh to exit on failure with return code 1 - -commit 7d018e6ba90b1b006068502f443b69e258795061 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 11:40:50 2007 +0200 - - Added install script - -commit affd2bf9f3f84d507ab4c4a9998b4d1c2697300c -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 11:31:45 2007 +0200 - - Make daemon shutdown fix more consistent with the other init scripts and simplify it a bit - -commit 1b8636ed76e4bf5ef23c3b357e991c66e18714c5 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 11:06:07 2007 +0200 - - fixing second part of #6959 - -commit bc1b5289228e74641a61cff3bb8b3751713dcf54 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 10:53:28 2007 +0200 - - replace all remaining backticks with $(...) - -commit 1828938d4406d5a95b7c89828f61600f9e6975a6 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 10:41:21 2007 +0200 - - fix the utf8 activating code: there are 63 virtual terminals, not 12 - -commit c8030f33082229530ef2f0ed699eddea4465dad9 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 10:18:36 2007 +0200 - - Release name: "Don't Panic" -> "Core Dump" - -commit e064575e7842d55371db39991593f3ea0bf03b9b -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 10:15:47 2007 +0200 - - Remove hwdetect as it is maintained as a separate package and this version isn't up to date anyway. - -commit cfab94bc71dc2e072c691122df82f4b6f2bdef29 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Oct 21 10:05:28 2007 +0200 - - disable colors on stupid terminals - (fixes #7369) - -commit bb0984ad899ab3ae85ef8bf2c0e178a2b485885c -Author: Thomas Bächler <thomas@archlinux.org> -Date: Fri Oct 19 22:22:52 2007 +0000 - - added (barely tested) improvement of ASK keyword in crypttab - -commit 39a8c53bd8c2b82e824d9299a4a18d81c9e530bd -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Oct 19 07:02:14 2007 +0000 - - 'upgpkg: removed double entry of ifconfig lo' - -commit 31dbcc786457dd92d9f56618e7c946b94ec04646 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Oct 19 06:08:19 2007 +0000 - - 'upgpkg: added /sys/class/net/lo check' - -commit 24e468641b51e5e0a05e631d62ad706b5c0a2dd7 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Oct 18 16:50:26 2007 +0000 - - 'upgpkg: added loopbackhardcoded to rc.sysinit and remove it from rc.conf' - -commit 6f35411f5ee1db8db1e27faf91c7b03e900c5bee -Author: Dan McGee <dan@archlinux.org> -Date: Thu Oct 18 16:15:58 2007 +0000 - - removing unnecessary isatty.c, replaced by shell test -t option - -commit a7c1404def678e27e0ac808397f46f81a1d2c8d4 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Oct 18 14:27:56 2007 +0000 - - 'upgpkg: fixed utf typo' - -commit fa4866f0adce9c3e0bfc09fb878eebb99797c338 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Oct 18 08:43:28 2007 +0000 - - 'upgpkg: trying to fix #6237,7554,7165,7641,5740' - -commit 8649f79e8e0027bd46da8b13f6d8ac5465471c35 -Author: Dan McGee <dan@archlinux.org> -Date: Wed Aug 15 04:01:59 2007 +0000 - - upgpkg: initscripts 2007.08-2 - -commit e3c06e981af869d6a00ec8cde34bde1e15cb53ad -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Jul 30 20:24:42 2007 +0000 - - 'upgpgk: fixed nocpfs netfs bug and bump to don't panic release' - -commit 6852a33372052c1374248f6727e6f7755aeadd30 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun May 13 13:40:40 2007 +0000 - - upgpkg: initscripts 0.8-11 - -commit aca95b25037ee1085c70a2e73b609a5d8cdff44b -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun May 13 12:01:11 2007 +0000 - - upgpkg: initscripts 0.8-10 - -commit cc2c8b1fa2a709b405e3efc65222b984a63e13c6 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat May 12 12:55:37 2007 +0000 - - 'upgpkg: bump to Duke and cleanup rc.sysinit and netds' - -commit 352dda7e7ba2c62686579e2c58b519ebb961b8be -Author: James Rayner <james@archlinux.org> -Date: Thu May 10 00:18:05 2007 +0000 - - upgpkg: initscripts 0.8-8 - fixing flyspray #7004 #6859, change in dhcpcd state directory. - -commit 3fc84b485213763335a5b820f8a4b4d6483be20d -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sun Apr 22 13:37:53 2007 +0000 - - 'upgpkg: added autoloading of standard acpi modules during boot, with the possibility to blacklist by default methods' - -commit b04f18c15cef8f6d48aa0aa63fa8104b551fe1db -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sat Feb 10 09:14:34 2007 +0000 - - fixed typo, fixed verbose booting - -commit fff26e7f1fecaec1bf4c07cc07d1a426b160168b -Author: Thomas Bächler <thomas@archlinux.org> -Date: Tue Jan 30 18:56:37 2007 +0000 - - forgot to add rc.local.shutdown - -commit 36e129004f1dfb2e890edc55f99c8eb0df89c668 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Jan 29 21:51:35 2007 +0000 - - 'upgpkg: added network listing help to rc.conf' - -commit 78b5f6beee0453dd938f1a3c6a6ab5776e6d78f3 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Mon Jan 29 20:45:25 2007 +0000 - - fix 6038 - -commit 1bad30cc17f6cec15668f2bae9d6b72dd44788ee -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Jan 22 21:52:41 2007 +0000 - - 'upgpkg: fixed verbose boot option' - -commit bced30e91fea71c05e3e521aa7cf04583f0dadbb -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Jan 18 19:21:26 2007 +0000 - - 'upgpkg: fixed usb removal' - -commit 221f3c66ca47ccf283f8ebbe7f8799cc24176def -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sun Dec 31 16:11:52 2006 +0000 - - 'added a bunch of new options' - -commit c323a4ae268d20d293351dc5e195e34d19ed28e7 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Mon Dec 18 21:54:53 2006 +0000 - - upgpkg: initscripts 0.8-2 - finally fixed 5445 - -commit f9b90969a7669044f098b90babe203b145bf55a9 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Dec 18 19:24:54 2006 +0000 - - 'upgpkg: added --keymap option' - -commit 4b00503d2d25e40b0e962df08005d749cf3a4c87 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sun Dec 17 12:53:22 2006 +0000 - - added stat_append to functions, fixed fsck bugs when clock is not set - -commit 779bd2abb1b67431b6e353eaba569779fb718833 -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sat Dec 16 23:49:35 2006 +0000 - - let lvm start quietly - -commit 9b58da29d7ce93bf3dc258a28d2fae00eb181f7e -Author: Thomas Bächler <thomas@archlinux.org> -Date: Sat Dec 16 22:03:29 2006 +0000 - - rc.sysinit, rc.shutdown: - - Code cleanup - - Added "verbose" commandline option for debugging - - Fixed #5968 - - Fixed #4648 - -commit 567edd5aa95d5728b50f9fff6d71c368a7f3966a -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat Dec 16 13:31:00 2006 +0000 - - 'upgpkg: readded rc.sysinit and hwdetect for 0.8 package' - -commit 9a73b01bb6ea96b81b9ed887f8808b47b4fc5f19 -Author: Andreas Radke <andyrtr@archlinux.org> -Date: Sun Dec 10 21:21:20 2006 +0000 - - cuurent x86_64 updated - -commit 3fcefcf13b87883216dd5331b2aed84db473de04 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sun Dec 10 14:34:46 2006 +0000 - - 'upgpkg: added voodoo tag and new hwdetect' - -commit 6b671f7901477d36fca5f8901731e4c0d5e7948f -Author: Aaron Griffin <aaron@archlinux.org> -Date: Thu Nov 16 01:01:16 2006 +0000 - - upgpkg: initscripts 0.7.3-1 - Bugfix #5529: Set timezone before hwclock calls - -commit c632bec83a37945e5bb4e7cedf4f4d96f0a955ec -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Nov 13 00:00:27 2006 +0000 - - FS#5385: Fixed RAID setup code - -commit ef6a41ebd7e2ab216e4b950df2a6d0826aef39b7 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Nov 8 20:01:06 2006 +0000 - - patch from Paul to disable NIS domainname before shutting down (syslog-ng was hanging). Also added a 2>/dev/null to fsck during startup - -commit 01f15f89c1cf4cdb77c7d0a8ddb37ddabd7df012 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Oct 2 14:50:41 2006 +0000 - - 'upgpkg: added psmouse workaround for new broken lappies' - -commit 9c34c7c5c8c525ce17a5bf447e40d78741ee15ba -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Sep 28 19:25:16 2006 +0000 - - added CONSOLE check to UTF-8/Locale stuff to avoid doing it when running scripts from cron - -commit 00081d09b7ab18b8672a299d61a1281819904890 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Sep 26 06:34:35 2006 +0000 - - Added --directisa switch to hwclock in rc.shutdown - -commit 2f49e1bb285fc9ad7259caf5edb957d7c891c974 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Wed Sep 20 10:36:16 2006 +0000 - - 'upgpkg: added udev persistent rules check' - -commit 8d399cf84d6d6192a13286e33258aaa369eee1bb -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Aug 4 07:54:32 2006 +0000 - - 'upgpkg: added kexec support to rc.shutdown' - -commit 977797d7a67033d03c4be04dba5b789ecdf2a36f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Jul 25 22:36:42 2006 +0000 - - set a default for LOCALE so it's no longer needed in /etc/profile - -commit 87132356080924e00822a4b24d593e94bb18e24a -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 21 19:40:00 2006 +0000 - - added --directisa to hwclock calls, support for additional options in crypttab for non-LUKS partitions, fixed the WPA_OPTS varname typo in netcfg - -commit 8d214daab85c043f87ed21912b68172cc0e33635 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Jul 7 15:17:34 2006 +0000 - - 'upgpkg: fixed usbfs mounting again' - -commit 93ba858cb8f3684506bcc5854ce32b637e108d00 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jun 30 19:40:10 2006 +0000 - - various fixes -- netcfg fixes, md device node creation fixes w/ mkinitcpio, 2.4 kernel support removed - -commit 4d91b544b6f666a12b84f82576b4309622806e83 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jun 30 15:54:33 2006 +0000 - - Fixed --menu when using gpm (#4916) - -commit 09bb556bf07b89130d27dc137190ff354beadecc -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jun 28 17:27:47 2006 +0000 - - handle ESSID fields that contain spaces - -commit 6cc15eeb857f9a01e7199c4c665866c7728244aa -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Jun 15 21:54:12 2006 +0000 - - added patch from James Rayner to auto-configure WPA through netcfg - -commit 96971f91453600f1d94d3e333dfb8773d1e4f596 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Jun 12 17:36:12 2006 +0000 - - fixed the path to the console maps in the comment area of rc.conf - -commit 5d708a122229e99d1f09f9cfd8297370e1778732 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Wed Jun 7 17:12:17 2006 +0000 - - 'upgpkg: removed the rest of 2.4 kernel' - -commit b4306a3ede324f6bdbfa5c7b80d0cff15f22c1be -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Wed Jun 7 16:49:32 2006 +0000 - - 'upgpkg: removed kernel24 stuff eg. devfsd support and lvm1' - -commit ddac836cdbb67ba5b89d21aa3b25a67919efeb88 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 9 18:23:41 2006 +0000 - - upgpkg: initscripts 0.7.2 - -commit dfb74ab60c8bb84f3e02d89cfe8127e55aeb7984 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Mar 27 18:13:56 2006 +0000 - - fix for #4296 - -commit 7cc268dcf5d2e64a3f10b808e8b1b90a8f6fec4a -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Feb 26 19:15:58 2006 +0000 - - Additional fix for locale stuff, re-enabled the depmod -A call at bootup - -commit befe253687d69267cac5e5953e0ca55d18bef000 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Feb 24 06:57:54 2006 +0000 - - 'upgpkg: added depmod -A again' - -commit 7ad516d1a7bf6fb5eed4e43669a7fb2a0832a552 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Tue Feb 21 07:35:10 2006 +0000 - - 'upgpkg: fixed module loading and udev startup' - -commit e0074ab78392be117c4cc63b4e0832fef95f2009 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Feb 20 05:33:27 2006 +0000 - - default LOCALE is now en_US.utf8 - -commit d4bd7c245c018d9de3f25eca580515cfc3048217 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Feb 20 05:26:07 2006 +0000 - - fix for terminal/locale bug (3996) - -commit a33f5477d845f3919cd746ab2be1180cb025b415 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Feb 16 17:56:33 2006 +0000 - - hwdetect->udev, removed default usbserial blacklist - -commit 655d3db463145facd994e5e3cfd0c0a911b30297 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Feb 16 17:12:06 2006 +0000 - - added note about disallowed hyphens in bash variable names - -commit 207256890573ce867d4391c362b34f31a1a60865 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Feb 16 10:23:38 2006 +0000 - - 'upgpkg: put loading modules in front of udev and disabled depmod -A during boot' - -commit 9058c034c77ab62b91f2cd7d3637a2cb04f7c7d7 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Feb 13 04:47:51 2006 +0000 - - removed unnecessary line from netfs - -commit 6411dc721549d99335367f5643c0887095fc7818 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Feb 9 18:48:17 2006 +0000 - - added note about dialog package required for netcfg menus - -commit 0d286b02f2c425d28c1908a82d99f266d3549919 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Feb 6 19:38:45 2006 +0000 - - moved swap activation after local filesystem mounting, so people can use swap files - -commit 8172dd9403fa216479c458e222c9d01c5b293437 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Feb 6 18:13:03 2006 +0000 - - 'upgpkg: fixed weird scsi raid controllers' - -commit f137bbe79f4249a296c0e9064a29f5c76f38273d -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Feb 1 21:24:08 2006 +0000 - - utf8 little fix - -commit affcb39fd921774f48b79fb9d48d68f3a917fd4f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Jan 31 01:30:55 2006 +0000 - - added --mknodes switch to the vgscan call (LVM) - -commit bd6701616508c5bb21de9166e9b1daa6fe1de769 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Jan 21 20:58:24 2006 +0000 - - fixed random-seed restoration - -commit e4af7e36ba40ab49993fcc4232dcebdedc1763b9 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Jan 19 16:25:38 2006 +0000 - - 'upgpkg: update to new udev module loading' - -commit 8f67fcb5f1fb15d67f024f16bf3249da85375418 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Jan 14 08:34:09 2006 +0000 - - added hook for rc.local.shutdown - -commit cef7bab5145b923577aeea7431d7b19f2dd3946b -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Jan 3 09:06:09 2006 +0000 - - changed xdm path in inittab - -commit 33d5e65a50fa302f6863277c52c061af721a3c44 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Dec 19 18:43:03 2005 +0000 - - final touches for utf8 stuff (Thanks Roman\!) - -commit e4439a61bca626d05d3c6073ac94740db5c446c4 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Dec 17 18:33:46 2005 +0000 - - re-fixed my utf fix (yea, that's right, i fell down a lot when i was a kid) - -commit 00b620075a21e293db4b55a8d451ecd2930dbce1 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Dec 17 02:16:47 2005 +0000 - - added sr link to makedevs - -commit 0d08cad43172cc04df237a4a4271525ad1d527b3 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Dec 17 00:59:04 2005 +0000 - - final utf8 fixes, a couple small fixes for hwdetect and netcfg - -commit cee3cbb3a261ce0ba812618493e9bd253424ea3f -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Dec 15 18:56:19 2005 +0000 - - added scsi CD nodes - -commit f14a9cc609ce341ef2327c3ae93aa2695b58b392 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Tue Dec 13 21:43:08 2005 +0000 - - 'upgpkg: added kernel_verion=, cleaned up some parts added --modules for MODULES= generation for rc.conf use' - -commit c4c551a2f870f579438ae38b07ff9c14008cd6c9 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 13 04:12:28 2005 +0000 - - makedevs fix - -commit a8db77d46d74fa3a8a0e13870b94c916a60358b8 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 13 04:06:46 2005 +0000 - - latest utf fixes - -commit fcdcb21e2c33b1d3e359dc847638b936caf2aeee -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 13 01:55:31 2005 +0000 - - makedevs: added ternary and quaternary ide/scsi devices - -commit 675e9d69d02233e0079672f6c10cbe07da3027ad -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Dec 12 10:40:15 2005 +0000 - - 'upgpkg: removed unneeded utf stuff, umlauts in user names do not work, you even cannot create them, - added quiet option to filsystem check, fixed garbeled fonts if no framebuffer is used' - -commit d768a9c95a254e09a34c39aa86840c01cb6d97dd -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Dec 7 00:21:45 2005 +0000 - - changed both network scripts to use good ol' /bin/kill instead of dhcpcd's -k switch (I forgot about #2942) - -commit f45c3abd5697fa89d1a6431d8dbf5e96e6804ca8 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 6 06:45:42 2005 +0000 - - Added interface param to dhcpcd -k calls in network and netcfg - -commit cfaa5552fcbe964a172138e5e6c87e54abb6ce4c -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Dec 5 18:59:11 2005 +0000 - - dhcpcd fix in rc.d/network - -commit cec2d46513c7cd557f219fa2ede3c7a816a526dc -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat Dec 3 13:25:37 2005 +0000 - - 'upgpkg: fixed ide check' - -commit 7e18ec8806c28d52c771cacda045aa3bd81ba0b2 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Dec 1 21:04:15 2005 +0000 - - fixed wpa_cli path in netcfg - -commit 78365fe57d61645c1b8282784d863a0cd8537eb5 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 29 01:26:11 2005 +0000 - - finished crypttab work, fixed a bug in hwdetect related to custom kernels - -commit 0d7cb77c48fc6232a8342fba9056a1896898b066 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Nov 28 22:32:00 2005 +0000 - - 'upgpkg: fixed custom kernels' - -commit 2c90c8af7bee4f06cf05c481e658406df35fe401 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Nov 28 19:36:56 2005 +0000 - - added USEWPA to template to enable/disable wpa_supplicant - -commit 15c49deac15f97e647afc081c7b5e210ad4bdcd3 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Nov 28 19:14:53 2005 +0000 - - moved sysctl config stuff to precede daemon startup (#3530) - -commit fb8a47586d0c5c5833a6bee2adc162a22b646d5a -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sun Nov 27 18:55:30 2005 +0000 - - 'upgpkg: fixed lock on kernels <= 2.6.12' - -commit 66779d909c3a08f2c3fa0811de12f0e3b5c54bc0 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat Nov 26 15:55:36 2005 +0000 - - 'upgpkg: fixed non ide systems, fixed usb modules' - -commit b087f41b86014ba5dfc0b23ea79d6897573fb562 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Wed Nov 23 12:54:55 2005 +0000 - - 'upgpkg: fixed hwdetect syntax for rc.sysinit' - -commit a03faeb98fbe82a01977a9900b0d1b6974aac3c6 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Wed Nov 23 12:45:41 2005 +0000 - - 'upgpkg: fixed mtp modules, added modules-order option, changes options to -- syntax' - -commit d8df29152b8401e4c56a07b8920f34fdf9252bc1 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Nov 23 01:58:50 2005 +0000 - - added check for /sys/devices - -commit fca87ebae05b19c0da51c1b996f4bddad82c3115 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Mon Nov 21 08:52:49 2005 +0000 - - 'upgpkg: hwdetect fixed module order, added load_modules=off to rc.sysinit' - -commit d7695ef38916be8e806b84f8e195a45a7b2ec217 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat Nov 19 15:44:02 2005 +0000 - - 'upgpkg: added more modules' - -commit 561ff8a3abbda0a86cc2a479d8e1a9e1b965b0d1 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Nov 19 01:47:31 2005 +0000 - - added crypttab stuff - -commit 23f08df5cb31d38347582e4d62f9279385c612ba -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Fri Nov 18 19:00:25 2005 +0000 - - 'upgpkg : added full ide,scsi detection to hwdetect' - -commit 6931feb5463b3ce9119753bda74279ec87ed447a -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Thu Nov 17 07:52:21 2005 +0000 - - 'upgpkg: added new PNP software and some workarounds' - -commit 0cddbac760aa1b38e5fb68d54b315cb01c67b7b6 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 15 09:07:13 2005 +0000 - - cosmetics - -commit 2dc0038155b978eb70be482313cc8535dadc436d -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 15 02:51:52 2005 +0000 - - added variables for autoloading modules, cleaned up rc.conf a bit - -commit abdeaf8051aaadb9f5270a14e45481a8d61e0b95 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 15 01:18:14 2005 +0000 - - added tpowa's changes, cleaned up output and removed redundant code - -commit 684a99329e37924e84344cb340e5022628d6777c -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Nov 14 17:46:46 2005 +0000 - - more thorough cleaning of /var/run at bootup - -commit e3315ad97c60b8cbad31aff8500d269d9176a9b5 -Author: Tobias Powalowski <tpowa@archlinux.org> -Date: Sat Nov 12 15:00:08 2005 +0000 - - 'upgpkg: added more text to show modules, to make it more readable :) " - -commit 9e02c37ccd310844c919f27af64c901979c4105d -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 11 18:49:54 2005 +0000 - - updated hwdetect - -commit 9683aeadd86569b69ad44d270e006284e565dfd5 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 11 18:46:12 2005 +0000 - - changed ifup() to skip interfaces that are already up - -commit 78ce45a497753e2be061e29a6464fcd969041895 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Nov 10 21:56:55 2005 +0000 - - added nocifs to pre-network mounts, fixed mdadm.conf missing errors - -commit 0daa0d11302e16ba26d7518c1edf0e4887aade9c -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Nov 10 19:21:59 2005 +0000 - - little bugfix - -commit d87c9749651741249b4c7cbf5f18b7ab1b3300fb -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Nov 10 19:06:51 2005 +0000 - - tpowa's hardware detection script - -commit d7e23b7ef7c92f7c9529c65a255b524b26648cc3 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Nov 10 02:34:20 2005 +0000 - - added more intelligence for RAID/LVM setups from the initrd - -commit 0e992c0464125a0cb0207171a053dbf64c593833 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Nov 9 21:22:44 2005 +0000 - - added logic to free up initrd memory once it's not needed anymore - -commit 71468248567e6bf1e794094d9b5f87ac61de033a -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Nov 9 21:21:17 2005 +0000 - - added logic to free up initrd memory once it's not needed anymore - -commit f947ecffc4a9109d0790e5b2853e2a835b4cf81b -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 4 18:29:25 2005 +0000 - - fixed a syntax bug in locale setting - -commit 826e8af03cdfc3edec0dfc382a4f4308748a08f7 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 4 09:50:36 2005 +0000 - - added support for encrypted root filesystems through the initrd - -commit e00744e1d385f80f44618baea869136dcf64c88c -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 4 01:44:56 2005 +0000 - - dm changes - -commit 3f2fb1767eb2c8167a4f78999e431da73b9c8e8d -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 4 00:54:22 2005 +0000 - - makedevs helper script -- not added to package yet - -commit c8a4f09b7943a7fe9a875d9fc7af7decd29db6a2 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Oct 22 21:23:47 2005 +0000 - - added patch for wpa_supplicant support - -commit f22d7a53b09ad0e28911117412c1cd0ab5c7bb68 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Oct 21 23:35:39 2005 +0000 - - upgpkg: initscripts 0.7.1 - -commit fa6d682d8bb1d95525e9f6540917446ad1247ea6 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Oct 12 16:53:43 2005 +0000 - - another quick fix for netcfg stuff (no rebuild yet) - -commit 14886e1bf20897e2efbc677d6bd1846db0201cbb -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Oct 6 17:00:31 2005 +0000 - - added WIFI_WAIT parameter (no rebuild yet) - -commit 79142a38d91eaf27a6c677e0a6511f855e57e30d -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Oct 3 17:58:51 2005 +0000 - - added ability to use the netcfg menu from the NET env var - -commit 39f5db6e89fd04da3979c11c3b2761ea031cd94d -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Sep 29 07:22:25 2005 +0000 - - added tpowa's fix for locale stuff - -commit e772aeae76f2ad704a834dc17df02dbc137a6573 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Sep 15 20:05:07 2005 +0000 - - modified netcfg/network scripts -- you can list multiple entries in NET_PROFILES that use the same INTERFACE. They will be started one at a time, and the first successful one will be kept. - -commit 0be8f5b2d33fc6160e2a62d33fc1f828218fa90a -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Jul 18 19:17:14 2005 +0000 - - fixed netcfg to remove stale dhcpcd .pid files (#2973) - -commit 00945333dc1dd08d893a6c42f395e7d3c81dad0d -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jul 6 05:15:37 2005 +0000 - - fixed a netcfg bug where disabled profiles were being started - -commit 0fa1f0eeb3422ba0e84a346a20437172f26859da -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 1 02:54:50 2005 +0000 - - fixed a --stopall bug in netcfg - -commit a440a006d7dc42ad072b13986f1f737e8f7e1719 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 1 00:13:38 2005 +0000 - - fixed some spacing in rc.multi -- cosmetic - -commit 863e8311cfc2ec7dc98fdb43abaa8499dd3414a4 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Jun 30 23:57:54 2005 +0000 - - added new netcfg stuff for roaming network profiles - -commit 47ca58301f0bf0680baf59465202c4209b1ac112 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Jun 5 20:30:12 2005 +0000 - - rc.sysinit now sets the NIS domain name, if configured. Also fixed a /var/locks typo - -commit 0ad54a5ba99d95c9b5dfe02f567e1f349de6a720 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jun 1 17:36:42 2005 +0000 - - added -q switch to sysctl - -commit b5d692b639b9e4a47cd6ba920b91a6d2ff50dc3d -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 31 18:31:01 2005 +0000 - - moved usb setup above the Loading Modules stage, so sane and other usb things will work correctly (#2770) - -commit cc6648d06dba085b903db820ad581dd94eb669ef -Author: Judd Vinet <judd@archlinux.org> -Date: Sun May 22 17:40:33 2005 +0000 - - added sysctl call from rc.sysinit - -commit 41e115b5973f6498ce4bfce6fe772b8d0b459700 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 18 06:59:02 2005 +0000 - - added a /proc/modules check before running modprobe, just in case the user is running a non-modular kernel - -commit c4a367e15b1bf0c9814a674c0a55084aa714245a -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Mar 24 18:53:37 2005 +0000 - - added CIFS to netfs script - -commit 8b862a2073ad6fe7303a4dbbe7d7316a60db1147 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Mar 16 17:31:30 2005 +0000 - - updated copyright year in rc.sysinit - -commit 8aff6add70fd50b3febe363a0002098f21e2679b -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Mar 11 20:02:08 2005 +0000 - - added support for backgrounding daemons at startup with a '@' prefix, commented out the ldconfig call at startup, added support for unicode console maps, added a hotplug_ifup() function rc.d/network for hotplug's net.agent to use - -commit 22805e822d4e9fee9c1f4331dee31bccd1db45d2 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Mar 6 20:08:29 2005 +0000 - - added logic to handle shutdown -F (forcefsck) - -commit 92d43c54f0bd5142a2a844b1910d15c808d86992 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Feb 11 01:21:43 2005 +0000 - - added ethernet bonding support (still untested) - -commit e8a2e4663543d16fcafa4c62c75f42fdab32ff28 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Jan 2 23:52:40 2005 +0000 - - fixed a typo in the rc.conf comments - -commit 45d3c546ee36b28c6808fb4330669b1c23437c26 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 30 07:33:19 2004 +0000 - - fixed the missing /dev/initctl problem with udev in runlevel 1 - -commit 4c1c59be80c29f73655913ff139717268ff1f50f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 23 22:58:25 2004 +0000 - - made rc.d/network pay attention to the new conf.d files (dhcpcd and wireless). also modified rc.sysinit to wait til after modules are loaded before attempting to mount /proc/bus/usb. If the user uses hotplug, then the usb host modules may not be loaded yet, but that's okay -- hotplug will mount /proc/bus/usb for them - -commit 2822ea48f2e7609232d4e4b47285d60097de2828 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Sep 28 06:24:03 2004 +0000 - - used depmod -A in rc.sysinit to update module deps - -commit 85c899a1ca88c088aaeb679dc009687670e30ac7 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Sep 24 17:22:34 2004 +0000 - - updated rc.single to pay attention to udev and syslog-ng - -commit 8784d3a487b1613759e871c8f8b4a4530509bdd3 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Sep 12 19:40:51 2004 +0000 - - added fix for xorg temp directories (bug #1408) - -commit 20dceb289f61b69a98c6377921ee2a009aeefd98 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 23 01:03:08 2004 +0000 - - re-mounted / after removing /etc/mtab, so it's written to mtab properly - -commit 9f5d7b15d7b58b7a3d80a8923a2ff1952c90966a -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jul 21 22:15:59 2004 +0000 - - re-mount /sys and /proc once / is rw so the entries can be written to /etc/mtab - -commit ef0a365fc88fd1b02883dd42e0afb0929fbfa3f4 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Jul 18 21:28:41 2004 +0000 - - fixed the sysfs problem with 2.4 - -commit 5ef7c1839eed06599d615380dae4447fe43dfb34 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 16 03:03:26 2004 +0000 - - modified ifdown to bring a dhcp'd eth0 down even if the .pid file is not found (#756) - -commit 2881e158d80e1203d2fae41ff2ce0f122b132e45 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 16 01:03:51 2004 +0000 - - made syslog-ng Arch's new default logger - -commit 3280eeff177ecf79c32213303c9eb320b579d040 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jul 16 00:27:57 2004 +0000 - - updated version header to 0.7, added support for udev and static /dev trees - -commit 2c20f4d5637da88e983b65db9c97373aa79d8a37 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Jul 3 19:40:02 2004 +0000 - - added iflist and rtlist functions and made ifup,ifdown,rtup,rtdown accessible from outside the script - -commit cd0e2c63acc50d080edba54b797f7f1c58da1312 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu May 27 00:30:15 2004 +0000 - - fixed the lvm2 segfault on shutdown - -commit f396331a675e17ef282b56ea228e66383d401400 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed May 19 16:56:48 2004 +0000 - - added sysfs mounting to fix LVM2 segfaults - -commit 446e095bdfb1d4d9c31f729d4169aa4a9f44797f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 18 23:40:53 2004 +0000 - - added better LVM handling - -commit e555d5efc43f7e8597dd90482e145f6d1936faf8 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 11 21:34:59 2004 +0000 - - added hotplug to the DAEMONS array (disabled by default) - -commit 262af2251dd4675e3664435068d4a96b21ab7d74 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Mar 26 20:01:07 2004 +0000 - - added -h arg to poweroff to park the hard drives - -commit abbe7921517e87dcf3fa61036d26d72bc714257a -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Feb 29 23:09:37 2004 +0000 - - added --ignorelockingfailure during startup vgchange (LVM2) - -commit 0d76f45bffddced00c83b0c06f1be796a780366b -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Feb 29 07:03:00 2004 +0000 - - updated for LVM2 - -commit d9f8f3c07bcf1ab349fa6484980a04ef57c7212c -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Feb 23 03:32:36 2004 +0000 - - added setup commands for LVM2 - -commit d4a5c5ef402ca7315e5429eaccb0748e38b964af -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Feb 19 18:50:09 2004 +0000 - - added cleanups by Leif Askeland - -commit 45ede7cf9dd872c580e9c2a57a00b0350f035371 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Feb 18 19:35:17 2004 +0000 - - updated copyright - -commit b6fab06a33cb0c829731c3123ef35444c6909d72 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Jan 30 18:30:06 2004 +0000 - - added a rc.d/netfs script to mount network-based filesystems from DAEMONS - -commit 4abccbdf439817f1328547f1f22db969fe6d8591 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Jan 10 00:46:13 2004 +0000 - - fixed a kernel 2.6 bug re: console fonts - -commit a7768b2ae842c55413b1dce8a3f19e7c730885fa -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 30 22:42:18 2003 +0000 - - network-based mounts are not mounted til rc.multi runs - -commit 9009002d949745ec8824662680c06cf34040dba8 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 30 22:37:50 2003 +0000 - - removed a debug comment - -commit 4fa550ea84f951b4afe5c2e4af4aad32b7a901f6 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Dec 30 22:23:36 2003 +0000 - - added a cosmetic fix to ifdown() in rc.d/network - -commit e9b62e0418df5ce6db98de36837bab2922154229 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Dec 21 08:58:37 2003 +0000 - - removed a leftover debugging statement - -commit a71e42c461da1672582143a829654049399616e7 -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Dec 21 00:48:23 2003 +0000 - - upgpkg: initscripts 0.6 - -commit 53ae13821436183990e40cffefa8c9cff4b4f2ae -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Oct 10 22:24:34 2003 +0000 - - fixed the licensing line - -commit 93dd5710cf2273c228135959c22f9e4f33d78477 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Oct 10 01:26:53 2003 +0000 - - added a missing space - -commit 065e944539ec9b527fa163317c0a633c872c809b -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Oct 10 01:16:08 2003 +0000 - - a little formatting improvement - -commit 7f4117b05f9e4730657779ec7d4b3b08ba12616c -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Oct 10 01:10:18 2003 +0000 - - added color to rc messages and fixed bug #168 - -commit be8b6f59470b8779c3d4e10b3045507920931896 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Oct 4 07:41:42 2003 +0000 - - added -x check to /sbin/fsck, so reiserfs users can uninstall e2fsprogs without script errors - -commit 3a161b0240eb8eedcc8affb5e0c5b92d058619d9 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Sep 19 05:16:21 2003 +0000 - - added consolefont setting to rc.conf - -commit 6ea51dec01002c6b392c374fa70a62020edffd84 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Sep 19 04:57:20 2003 +0000 - - added timeout to dhcp startup - -commit 2a48c5bd8db694cfe3a26cc3ef92e36050859b31 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Sep 19 04:29:34 2003 +0000 - - modified network script to not bail out on error - -commit 25223b3c0c1be7d320299af4e31062295694098a -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Aug 25 19:15:49 2003 +0000 - - improved lvm detection/activation - -commit da04ddf1b88b62ad77db29b8efa33649a0871b58 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Jul 12 19:21:26 2003 +0000 - - added a check for lvmtab before activating LVM groups - -commit e39affb13f412f21a93205431c2abc625b4238a4 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jul 9 02:13:45 2003 +0000 - - removed the conf.d stuff -- conf.d files will be parsed individually by the rc.d scripts to avoid name collisions - -commit d69b11e73a70c9c0ed6cd888ff4ac4eb3e877ec2 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jun 4 00:22:45 2003 +0000 - - fixed a rc.sysinit bug and moved conf.d parsing to the top of rc.conf - -commit 18c7679d90ca5c1c9508548c35c0a4ea14ca4d6f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 27 18:29:39 2003 +0000 - - fixed a small typo - -commit 2e25861ad03003273707fa604522e3390c24f895 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue May 27 17:14:50 2003 +0000 - - moved nfsmount to nfs-utils - -commit ba769985bf38b1eb4e54f0e19d8b3502216646d6 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon May 26 22:22:04 2003 +0000 - - added lvm handling - -commit df91d849d2c19bd070473da49dd8befc7aae978c -Author: Judd Vinet <judd@archlinux.org> -Date: Fri May 23 23:58:57 2003 +0000 - - upgpkg: initscripts 0.5 - -commit ead9f8db5fe817f019512681d5169dffad705357 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu May 8 18:12:46 2003 +0000 - - added -D, -H, and -h to the dhcp line - -commit a85df6abb081d7a7d51b00e7e301d1497fede30a -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Feb 7 17:05:02 2003 +0000 - - updated PKGBUILD release - -commit e4398c2e693441b8844645ee69fd3b7e483b3530 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Feb 7 16:58:42 2003 +0000 - - added the MODULES=() line to rc.conf, with loading in rc.sysinit - -commit f6081f262419c2a4880d372636e391a52e148782 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Jan 7 01:48:51 2003 +0000 - - updated rc.single to shutdown daemons correctly - -commit 6c4a6fc1938f12ee85b4f593de64a8776e5c1ba0 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Jan 6 23:23:41 2003 +0000 - - kill dhcpcd pid files before running the client daemon - -commit 19c04471ce76a3f803fdf47b964880266b529070 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Dec 14 00:13:55 2002 +0000 - - fixed the location of adjtime - -commit 96cb8c51e0ddb57f382c958ebb7808baaa258765 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Dec 12 22:27:36 2002 +0000 - - modified to stat_fail to return a $retval - -commit 81da8c411f590b436e0cffcae9dd4c30598d35b2 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Nov 29 09:06:45 2002 +0000 - - fixed a syntax bug in rc.sysinit - -commit c5f67416f3250e0d16eb2e588fc2b62435727d3c -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Nov 27 00:36:14 2002 +0000 - - fix - -commit 43cda626dbc05e92dffc0027ef19db9d3cc44d37 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 26 23:26:48 2002 +0000 - - added nfsmount (from jk) - -commit c8cd508809408a0be9f1fbeb65775ab7fb083f3b -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Nov 26 18:17:31 2002 +0000 - - Added utf hwclock support (from user patch) - -commit 914b0b3b572a3d5d311682a88424d165589798f1 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Nov 23 20:37:55 2002 +0000 - - added jk's changes: system clock is set earlier on, and modules.dep is only - updated if new modules are present. - -commit dd4248ed74b9adce32910ee95274719249220757 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Aug 28 21:43:10 2002 +0000 - - removed PROFILES array - -commit eb2f42cba2d8134e83321810dcad897cc88e4716 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Aug 24 20:54:22 2002 +0000 - - rc.sysinit removes /var/run/daemons/* on bootup - -commit fd8fde036ab46b593590b362bc94b051e432a295 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Jul 24 02:57:16 2002 +0000 - - Upgraded initscripts to 0.3 - -commit 2b503065569fa2ffedf5eafc76158c74062ac49b -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Jun 11 05:07:54 2002 +0000 - - nada - -commit efa9a6d681b87fa4b8e321173690144b17a08d35 -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Apr 27 21:04:15 2002 +0000 - - Added DHCP handling to initscripts - -commit 30277f5e1ce30a10ed08ae2529282718c86ac826 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Apr 19 17:16:37 2002 +0000 - - *** empty log message *** - -commit f7a1c1ba6c35069ed6086e41146471fe97856325 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Apr 19 17:15:35 2002 +0000 - - *** empty log message *** - -commit 3a3db1e368443447d7eaec461110bb122d026d83 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Apr 19 17:13:21 2002 +0000 - - Cleaned up networking in initscripts - -commit cd5a839558fa3e5b10423fa33e621be2f27acf12 -Author: Judd Vinet <judd@archlinux.org> -Date: Fri Apr 19 07:28:04 2002 +0000 - - Updated for /etc/profile.d - -commit f5e0fa814e1f31279509645a25057dcefa5eaadc -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Apr 16 03:59:06 2002 +0000 - - Updated network rc script with jproctor's disable-eth changes - -commit 8bc78f134bf719b16a3b3b2a7cea947fbf526e3b -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 15 16:45:38 2002 +0000 - - Added arch-release to filesystem - Fixed initscripts (again) - -commit b840b6f59bfa39bceb663ad1b40f4c0ff5984366 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 15 07:00:55 2002 +0000 - - *** empty log message *** - -commit 9a59bb9539dacac884b9c3b0088e22ba762f2b9b -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 15 06:53:10 2002 +0000 - - Updated initscripts - -commit 2f4936aec49df2c681ae0862103cee8376c5ab57 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 15 06:47:05 2002 +0000 - - Bugfix for initscripts - -commit 5b61b6c2bf49d75df992a4dc39757e66a536dbcd -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Apr 15 06:41:16 2002 +0000 - - Updated initscripts for multiple ethernet interfaces - -commit 91fd2beff99c9e623a201c8221964353c8669044 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Apr 11 05:06:15 2002 +0000 - - Updated installer script - Added package dhcpcd - Took ash job control out of busybox for bootdisk - -commit 2cb34b31712bf72ae6c30e5029572463152a082f -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Mar 24 08:50:48 2002 +0000 - - Fixed a runlevel bug in initscripts - -commit 65405267704892a9bcb42186c95adcf4566cbf8c -Author: Judd Vinet <judd@archlinux.org> -Date: Sun Mar 24 08:40:40 2002 +0000 - - Added rc.d network script to initscripts - -commit eea6fee11ad792708d6b8fbf0cb5b42b00ea1c91 -Author: Judd Vinet <judd@archlinux.org> -Date: Thu Mar 14 08:34:49 2002 +0000 - - Removed all filelist files from repository - -commit 57d51e9a853fc21be0e733253ac56f2d9756d3a7 -Author: Judd Vinet <judd@archlinux.org> -Date: Wed Mar 13 08:05:47 2002 +0000 - - Updated inittab for X11 - -commit d0ea35d522f7e68b198afe01bf369463af56259f -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Mar 12 05:37:01 2002 +0000 - - Rebuild package pcmcia-cs for 2.4.18 - Tweaked initscripts/filesystem - Added doc/install.txt and misc/cdboot/etc/issue and scripts/makerelease - -commit 14e3f9480a7364200b999477fa4ab9da16884831 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Mar 11 00:58:34 2002 +0000 - - Removed rc.proto, updated rc.single - -commit 325b46a6b02aee695658eafe6b714d0e02810e1a -Author: Judd Vinet <judd@archlinux.org> -Date: Sat Mar 9 10:07:16 2002 +0000 - - Added some rudimentary networking stuff - -commit 897380f9b8071b8df0dcdb85cc9e1424640762b9 -Author: Judd Vinet <judd@archlinux.org> -Date: Tue Mar 5 04:59:03 2002 +0000 - - Changed name to Arch Linux - -commit 98c76a453222169f12b0e95f8a7ed0175e182598 -Author: Judd Vinet <judd@archlinux.org> -Date: Mon Mar 4 07:28:25 2002 +0000 - - Initial revision diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 6034a24..f453426 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -1,39 +1,28 @@ -# $Id: PKGBUILD 127034 2011-06-09 22:34:09Z tomegun $ +# $Id: PKGBUILD 164226 2012-07-27 22:02:29Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=initscripts -pkgver=2011.06.4 -pkgrel=7 +pkgver=2012.07.5 +pkgrel=1 pkgdesc="System initialization/bootup scripts" -arch=('i686' 'x86_64') +arch=('any') url="http://www.archlinux.org" license=('GPL2') groups=('base') -backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' - 'ncurses' 'kbd' 'findutils' 'sysvinit') -optdepends=('bridge-utils: Network bridging support' - 'dhcpcd: DHCP network configuration' - 'net-tools: legacy network support' - 'wireless_tools: Wireless networking') +backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) +depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') +optdepends=('dhcpcd: DHCP network configuration' + 'bridge-utils: Legacy network bridging support' + 'net-tools: Legacy network support' + 'wireless_tools: Legacy wireless networking') +makedepends=(asciidoc) install=initscripts.install -source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" - 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch' 'inittab.patch') +source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz") package() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 < ${srcdir}/rc.sysinit.patch || exit 1 - patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 - patch -p0 < ${srcdir}/rc.multi.patch || exit 1 - patch -p0 < ${srcdir}/inittab.patch || exit 1 make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example } -md5sums=('34cbe55f3f42069c59237db935d0511b' - '027576534885b8d5dded9be546057b12' - '078bd0852e993ee1fa11cc579f0dfa83' - '73abaf06450104bddf16d409015f81ab' - 'a166ea014a1c75860b14fc98825686cc' - '521bbd001633d14b08e5471bea584ee4') +md5sums=('2e3589c8e0baac7a4ea9e353edbcf26c') diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog deleted file mode 100644 index 2609b7e..0000000 --- a/abs/core/initscripts/__changelog +++ /dev/null @@ -1,11 +0,0 @@ -Patch init scripts (remove tty1, linhes header) - patch -p1 < ${srcdir}/rc.sysinit.patch || exit 1 - patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 - patch -p0 < ${srcdir}/rc.multi.patch || exit 1 - patch -p0 < ${srcdir}/inittab.patch || exit 1 - - -rename wireless.conf -> wireless.conf.example - -change utf8 to utf-8 in rc.conf -sed -ie "s/[u|U][t|T][[f|F]8/utf-8/g" /etc/rc.conf diff --git a/abs/core/initscripts/initscripts-2012.07.5.tar.xz b/abs/core/initscripts/initscripts-2012.07.5.tar.xz Binary files differnew file mode 100644 index 0000000..36a2dae --- /dev/null +++ b/abs/core/initscripts/initscripts-2012.07.5.tar.xz diff --git a/abs/core/initscripts/initscripts.install b/abs/core/initscripts/initscripts.install index a64b543..963713b 100644 --- a/abs/core/initscripts/initscripts.install +++ b/abs/core/initscripts/initscripts.install @@ -8,7 +8,12 @@ post_upgrade() { echo "Blacklisting of modules is no longer supported in rc.conf," echo "please add blacklist entries to /etc/modprobe.d/ instead." fi - echo "adjusting utf8 to utf-8" - echo "Please reboot for the locale adjustment to take affect" - sed -ie "s/[u|U][t|T][[f|F]8/utf-8/g" /etc/rc.conf + if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then + echo "VERBOSE= in rc.conf no longer has any effect." + echo "Please append 'quiet' to your kernel command line." + fi + if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then + echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf," + echo "as LOCALE in /etc/rc.conf no longer works." + fi } diff --git a/abs/core/initscripts/inittab.patch b/abs/core/initscripts/inittab.patch deleted file mode 100644 index d92bfed..0000000 --- a/abs/core/initscripts/inittab.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- inittab.orig 2011-08-06 17:44:17.563781289 +0000 -+++ inittab 2011-08-06 17:44:36.440448743 +0000 -@@ -24,7 +24,6 @@ - su:S:wait:/sbin/sulogin -p - - # -8 options fixes umlauts problem on login --c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux - c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux - c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux - c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux diff --git a/abs/core/initscripts/rc.multi.patch b/abs/core/initscripts/rc.multi.patch deleted file mode 100644 index b426408..0000000 --- a/abs/core/initscripts/rc.multi.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** rc.multi.orig Sun Jul 31 02:34:55 2011 ---- rc.multi Sun Jul 31 02:35:28 2011 -*************** run_hook multi_end -*** 30,31 **** -! kill `/bin/cat /run/bootlogd.pid` -! /bin/rm /run/bootlogd.pid ---- 30,34 ---- -! if [ -e /run/bootlogd.pid ] -! then -! kill `/bin/cat /run/bootlogd.pid` -! /bin/rm /run/bootlogd.pid -! fi diff --git a/abs/core/initscripts/rc.shutdown.patch b/abs/core/initscripts/rc.shutdown.patch index 973ff41..407349e 100644 --- a/abs/core/initscripts/rc.shutdown.patch +++ b/abs/core/initscripts/rc.shutdown.patch @@ -1,9 +1,3 @@ ---- rc.shutdown.orig 2011-06-09 22:23:09.000000000 +0000 -+++ rc.shutdown 2011-07-31 02:47:22.686835949 +0000 -@@ -51,6 +51,17 @@ - fi - - stat_busy "Unmounting Filesystems" +#unmount network filesystems for runit +INIT=`ps -p1 -o comm=` +if [ x$INIT = xrunit ] @@ -13,8 +7,3 @@ + /etc/rc.d/netfs stop + fi +fi -+ -+ - if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then - /bin/umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev - else diff --git a/abs/core/initscripts/rc.sysinit.patch b/abs/core/initscripts/rc.sysinit.patch deleted file mode 100644 index 05f636a..0000000 --- a/abs/core/initscripts/rc.sysinit.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- initscripts-2011.06.4/rc.sysinit.orig 2012-04-22 17:02:58.399566849 +0000 -+++ initscripts-2011.06.4/rc.sysinit 2012-04-22 17:03:25.639565741 +0000 -@@ -7,8 +7,11 @@ - . /etc/rc.d/functions - - echo " " --printhl "Arch Linux\n" --printhl "${C_H2}http://www.archlinux.org" -+echo " " -+printhl "LinHES" -+printhl "The Linux Home Entertainment System" -+printhl "${C_H2}http://www.linhes.org" -+echo " " - printsep - - run_hook sysinit_start -@@ -16,6 +19,8 @@ - # export standard PATH (will be overridden later when /etc/profile is sourced, but is useful for UDev) - export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -+[[ -d /run ]] || /bin/mkdir -p /run -+ - # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems) - /bin/mountpoint -q /proc || /bin/mount -n -t proc proc /proc -o nosuid,noexec,nodev - /bin/mountpoint -q /sys || /bin/mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev -@@ -338,6 +343,7 @@ - /bin/chmod 755 /etc/profile.d/locale.sh - # Set user defined locale - echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh -+ echo "export LC_ALL=$LOCALE" >>/etc/profile.d/locale.sh - stat_done - - if [[ ${LOCALE,,} =~ utf ]]; then diff --git a/abs/core/initscripts/wireless.conf.d b/abs/core/initscripts/wireless.conf.d deleted file mode 100644 index 47540ef..0000000 --- a/abs/core/initscripts/wireless.conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# -# Settings for wireless cards -# -# For each wireless interface declared in INTERFACES (in rc.conf), declare -# a wlan_${IF} variable that contains the arguments to be passed to -# iwconfig(8). Then list the original interface name in the -# WLAN_INTERFACES array. -# - -#wlan_eth0="eth0 mode managed essid default" -#WLAN_INTERFACES=(eth0) - diff --git a/abs/core/inputproto/PKGBUILD b/abs/core/inputproto/PKGBUILD index d91a4f8..eadd915 100644 --- a/abs/core/inputproto/PKGBUILD +++ b/abs/core/inputproto/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 99316 2010-11-14 15:51:28Z jgc $ +# $Id: PKGBUILD 153286 2012-03-12 20:52:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=inputproto -pkgver=2.0.1 +pkgver=2.2 pkgrel=1 pkgdesc="X11 Input extension wire protocol" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" -makedepends=('xorg-util-macros') +makedepends=('xorg-util-macros' 'asciidoc') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9c11b99b7cccceafa6b4235a3084523fb7cb4621') +sha1sums=('500e0a6dac3523887c0b82753fe5e9d4bb982137') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -24,4 +25,3 @@ package() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/intltool/ChangeLog b/abs/core/intltool/ChangeLog deleted file mode 100644 index 4419f0f..0000000 --- a/abs/core/intltool/ChangeLog +++ /dev/null @@ -1,38 +0,0 @@ -2009-03-15 Eric Belanger <eric@archlinux.org> - - * intltool 0.40.6-1 - * Upstream update - -2009-02-07 Eric Belanger <eric@archlinux.org> - - * Added I18N-HOWTO doc (close FS#12889) - -2008-11-28 Jan de Groot <jgc@archlinux.org> - - * intltool 0.40.5-1 - * Upstream update - -2008-09-25 Jan de Groot <jgc@archlinux.org> - - * intltool 0.40.4-1 - * Upstream update - -2008-07-28 Eric Belanger <eric@archlinux.org> - - * intltool 0.40.3-1 - * Upstream update - -2008-07-23 Eric Belanger <eric@archlinux.org> - - * intltool 0.40.1-1 - * Upstream update - -2008-06-08 Eric Belanger <eric@archlinux.org> - - * intltool 0.40.0-1 - * Upstream update - -2008-03-01 Eric Belanger <eric@archlinux.org> - - * intltool 0.37.1-1 - * Upstream update diff --git a/abs/core/intltool/PKGBUILD b/abs/core/intltool/PKGBUILD index d367e29..44ff833 100644 --- a/abs/core/intltool/PKGBUILD +++ b/abs/core/intltool/PKGBUILD @@ -1,23 +1,31 @@ -# $Id: PKGBUILD 30076 2009-03-16 03:02:39Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 155385 2012-04-03 01:23:12Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=intltool -pkgver=0.40.6 +pkgver=0.50.2 pkgrel=1 pkgdesc="The internationalization tool collection" -arch=('i686' 'x86_64') -url="http://freedesktop.org/wiki/Software/intltool" +arch=('any') +url="https://edge.launchpad.net/intltool" license=('GPL') -depends=('perlxml') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('69bc0353323112f42ad4f9cf351bc3e5') -sha1sums=('4f6469e09e2c06a8072dffff36f84ff401d7ea75') +depends=('perl-xml-parser') +source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad' + '85c71e9651df41fc330c5f171fdfe1bf11e44f65') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 doc/I18N-HOWTO ${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1 + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/I18N-HOWTO "${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO" } diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD index a35b822..471b91e 100644 --- a/abs/core/iproute2/PKGBUILD +++ b/abs/core/iproute2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ +# $Id: PKGBUILD 162200 2012-06-23 12:13:11Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=2.6.39 -pkgrel=1 +pkgver=3.4.0 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('perl') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'db') makedepends=('linux-atm') optdepends=('linux-atm: ATM support') provides=('iproute') @@ -18,14 +18,16 @@ replaces=('iproute') options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz - 'iproute2-fhs.patch') +source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz + iproute2-fhs.patch) +sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527' + '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { - cd $srcdir/iproute2-${pkgver} - + cd $srcdir/$pkgname-$pkgver + # set correct fhs structure - patch -Np1 -i ${srcdir}/iproute2-fhs.patch + patch -Np1 -i "$srcdir/iproute2-fhs.patch" ./configure @@ -33,18 +35,16 @@ build() { } package() { - cd $srcdir/iproute2-${pkgver} + cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # allow loopback to be started before /usr is mounted, this may not be supported in the future - mkdir -p ${pkgdir}/sbin - mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip - ln -s /sbin/ip ${pkgdir}/usr/sbin/ip + mkdir -p "$pkgdir/sbin" + mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip" + ln -s /sbin/ip "$pkgdir/usr/sbin/ip" # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h - install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a + install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h" + install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a" } -md5sums=('8a3b6bc77c2ecf752284aa4a6fc630a6' - '39cf3de7ca9a8560ecb08433510b079c') diff --git a/abs/core/iproute2/iproute2-fhs.patch b/abs/core/iproute2/iproute2-fhs.patch index 2608414..add3635 100644 --- a/abs/core/iproute2/iproute2-fhs.patch +++ b/abs/core/iproute2/iproute2-fhs.patch @@ -1,48 +1,19 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ + PREFIX=/usr + LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd +SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile ---- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 -+++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200 @@ -20,9 +20,9 @@ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm @@ -55,18 +26,20 @@ diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile done clean: -diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile ---- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 -+++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 -@@ -99,18 +99,11 @@ +diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ $(AR) rcs $@ $(TCLIB) install: all - mkdir -p $(MODDESTDIR) -- install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ - do install -m 755 $$i $(MODDESTDIR); \ -- done ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + done - if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ - if [ -f $(MODDESTDIR)/m_xt.so ]; \ - then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ @@ -74,11 +47,29 @@ diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile - then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ - fi; \ - fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done clean: rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +@@ -24,8 +24,8 @@ + #include "utils.h" + #include "tc_util.h" + +-#ifndef LIBDIR +-#define LIBDIR "/usr/lib" ++#ifndef SHAREDIR ++#define SHAREDIR "/usr/share" + #endif + + const char *get_tc_lib(void) +@@ -34,7 +34,7 @@ + + lib_dir = getenv("TC_LIB_DIR"); + if (!lib_dir) +- lib_dir = LIBDIR "/tc/"; ++ lib_dir = SHAREDIR "/tc/"; + + return lib_dir; + } diff --git a/abs/core/iptables/0503-extension_cppflags.patch b/abs/core/iptables/0503-extension_cppflags.patch new file mode 100644 index 0000000..0eb6457 --- /dev/null +++ b/abs/core/iptables/0503-extension_cppflags.patch @@ -0,0 +1,13 @@ +Index: b/extensions/GNUmakefile.in +=================================================================== +--- a/extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 ++++ b/extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 +@@ -21,7 +21,7 @@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ++AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + diff --git a/abs/core/iptables/PKGBUILD b/abs/core/iptables/PKGBUILD index 107e033..d2c859d 100644 --- a/abs/core/iptables/PKGBUILD +++ b/abs/core/iptables/PKGBUILD @@ -1,49 +1,84 @@ -# $Id: PKGBUILD 86873 2010-08-06 09:59:22Z ronald $ +# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.9 -pkgrel=1 -pkgdesc="A Linux kernel packet control tool" +pkgver=1.4.14 +pkgrel=2 +pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') -url="http://www.netfilter.org/" +url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') +makedepends=('linux-api-headers') options=('!libtool') -source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2 \ - iptables ip6tables empty.rules simple_firewall.rules iptables.conf.d) +source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" + iptables + ip6tables + empty.rules + simple_firewall.rules + iptables.conf.d + empty-filter.rules + empty-mangle.rules + empty-nat.rules + empty-raw.rules + empty-security.rules + 0503-extension_cppflags.patch + iptables.service + ip6tables.service + iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('c961b58c57cb99b10f5bb753bf3b436c0df05c7c' - 'd7540316581bb66c5594885882a14ba394e95098' - '70d70113e3a23f0fe99404c5536507a887a4ca5c' +sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' + '5bb6fa526665cdd728c26f0f282f5a51f220cf88' + '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' '9907f9e815592837abc7fa3264a401567b7606ab' - '1c52444ffbecc09f56bb325db49e924dd32f9213') + 'cdb830137192bbe002c6d01058656bd053ed0ddd' + 'd9f9f06b46b4187648e860afa0552335aafe3ce4' + 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' + '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' + '7db53bb882f62f6c677cc8559cff83d8bae2ef73' + 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' + '44626980a52e49f345a0b1e1ca03060f3a35763c' + '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' + 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' + 'e7abda09c61142121b6695928d3b71ccd8fdf73a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - # http://bugs.archlinux.org/task/17046 - sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in - sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + # use system one + rm include/linux/types.h - ./configure --prefix=/usr --with-kernel=usr/src/linux-$(uname -r) \ - --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ - --with-xtlibdir=/usr/lib/iptables \ - --enable-devel --enable-libipq + patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - make || return 1 + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ + --with-xtlibdir=/usr/lib/iptables \ + --enable-devel --enable-libipq \ + --enable-shared + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}" + install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables + install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables + install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules + install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules + install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables - install -D -m755 ../iptables ${pkgdir}/etc/rc.d/iptables - install -D -m755 ../ip6tables ${pkgdir}/etc/rc.d/ip6tables - install -D -m644 ../empty.rules ${pkgdir}/etc/iptables/empty.rules - install -D -m644 ../simple_firewall.rules ${pkgdir}/etc/iptables/simple_firewall.rules - install -D -m644 ../iptables.conf.d ${pkgdir}/etc/conf.d/iptables + mkdir -p "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables + + # install systemd files + install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service + install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service + install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush } + diff --git a/abs/core/iptables/empty-filter.rules b/abs/core/iptables/empty-filter.rules new file mode 100644 index 0000000..5a4de48 --- /dev/null +++ b/abs/core/iptables/empty-filter.rules @@ -0,0 +1,6 @@ +# Empty iptables filter table rule file +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/abs/core/iptables/empty-mangle.rules b/abs/core/iptables/empty-mangle.rules new file mode 100644 index 0000000..49d493c --- /dev/null +++ b/abs/core/iptables/empty-mangle.rules @@ -0,0 +1,8 @@ +# Empty iptables mangle table rules file +*mangle +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/abs/core/iptables/empty-nat.rules b/abs/core/iptables/empty-nat.rules new file mode 100644 index 0000000..437e964 --- /dev/null +++ b/abs/core/iptables/empty-nat.rules @@ -0,0 +1,7 @@ +# Empty iptables nat table rules file +*nat +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/abs/core/iptables/empty-raw.rules b/abs/core/iptables/empty-raw.rules new file mode 100644 index 0000000..8dc50d2 --- /dev/null +++ b/abs/core/iptables/empty-raw.rules @@ -0,0 +1,5 @@ +# Empty iptables raw table rules file +*raw +:PREROUTING ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/abs/core/iptables/empty-security.rules b/abs/core/iptables/empty-security.rules new file mode 100644 index 0000000..4531fa1 --- /dev/null +++ b/abs/core/iptables/empty-security.rules @@ -0,0 +1,6 @@ +# Empty iptables security table rules file +*security +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/abs/core/iptables/ip6tables b/abs/core/iptables/ip6tables index 1733db2..2d119e3 100755 --- a/abs/core/iptables/ip6tables +++ b/abs/core/iptables/ip6tables @@ -4,7 +4,6 @@ [ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables # Set defaults if settings are missing -[ -z "$IP6TABLES" ] && IP6TABLES=/usr/sbin/ip6tables [ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules . /etc/rc.conf @@ -12,14 +11,14 @@ case "$1" in start) - if [ ! -f $IP6TABLES_CONF ]; then - echo "Cannot load iptables rules: $IP6TABLES_CONF is missing!" >&2 + if [ ! -f "$IP6TABLES_CONF" ]; then + echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2 exit 1 fi stat_busy "Starting IP6 Tables" if [ "$IPTABLES_FORWARD" = "1" ]; then - echo 1 >/proc/sys/net/ipv6/conf/default/forwarding - echo 1 >/proc/sys/net/ipv6/conf/all/forwarding + echo 1 >/proc/sys/net/ipv6/conf/default/forwarding + echo 1 >/proc/sys/net/ipv6/conf/all/forwarding fi if ck_daemon ip6tables; then /usr/sbin/ip6tables-restore < $IP6TABLES_CONF @@ -35,42 +34,16 @@ case "$1" in ;; stop) stat_busy "Stopping IP6 Tables" - echo 0 >/proc/sys/net/ipv6/conf/all/forwarding - echo 0 >/proc/sys/net/ipv6/conf/default/forwarding if ! ck_daemon ip6tables; then fail=0 for table in $(cat /proc/net/ip6_tables_names); do - $IP6TABLES -t $table -F &>/dev/null && \ - $IP6TABLES -t $table -X &>/dev/null && \ - $IP6TABLES -t $table -Z &>/dev/null + ip6tables-restore < /var/lib/iptables/empty-$table.rules [ $? -gt 0 ] && fail=1 done if [ $fail -gt 0 ]; then stat_fail else rm_daemon ip6tables - # reset policies - for table in filter mangle raw; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P OUTPUT ACCEPT - fi - done - for table in filter mangle; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P INPUT ACCEPT - $IP6TABLES -t $table -P FORWARD ACCEPT - fi - done - for table in mangle raw; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P PREROUTING ACCEPT - fi - done - for table in mangle; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P POSTROUTING ACCEPT - fi - done stat_done fi else @@ -79,7 +52,6 @@ case "$1" in ;; restart) $0 stop - sleep 2 $0 start ;; save) diff --git a/abs/core/iptables/ip6tables.service b/abs/core/iptables/ip6tables.service new file mode 100644 index 0000000..9a695f3 --- /dev/null +++ b/abs/core/iptables/ip6tables.service @@ -0,0 +1,11 @@ +[Unit] +Description=IPv6 Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush 6 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/iptables/iptables b/abs/core/iptables/iptables index 50c13d5..fbb02fa 100755 --- a/abs/core/iptables/iptables +++ b/abs/core/iptables/iptables @@ -4,7 +4,6 @@ [ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables # Set defaults if settings are missing -[ -z "$IPTABLES" ] && IPTABLES=/usr/sbin/iptables [ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules . /etc/rc.conf @@ -12,7 +11,7 @@ case "$1" in start) - if [ ! -f $IPTABLES_CONF ]; then + if [ ! -f "$IPTABLES_CONF" ]; then echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2 exit 1 fi @@ -34,41 +33,16 @@ case "$1" in ;; stop) stat_busy "Stopping IP Tables" - echo 0 >/proc/sys/net/ipv4/ip_forward if ! ck_daemon iptables; then fail=0 for table in $(cat /proc/net/ip_tables_names); do - $IPTABLES -t $table -F &>/dev/null && \ - $IPTABLES -t $table -X &>/dev/null && \ - $IPTABLES -t $table -Z &>/dev/null + iptables-restore < /var/lib/iptables/empty-$table.rules [ $? -gt 0 ] && fail=1 done if [ $fail -gt 0 ]; then stat_fail else rm_daemon iptables - # reset policies - for table in filter nat mangle raw; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P OUTPUT ACCEPT - fi - done - for table in filter mangle; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P INPUT ACCEPT - $IPTABLES -t $table -P FORWARD ACCEPT - fi - done - for table in nat mangle raw; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P PREROUTING ACCEPT - fi - done - for table in nat mangle; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P POSTROUTING ACCEPT - fi - done stat_done fi else @@ -77,7 +51,6 @@ case "$1" in ;; restart) $0 stop - sleep 2 $0 start ;; save) diff --git a/abs/core/iptables/iptables-flush b/abs/core/iptables/iptables-flush new file mode 100755 index 0000000..e6fafe9 --- /dev/null +++ b/abs/core/iptables/iptables-flush @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Usage: iptables-flush [6] +# + +iptables=ip$1tables +if ! type -p "$iptables"; then + echo "error: invalid argument" + exit 1 +fi + +while read -r table; do + tables+=("/var/lib/$iptables/empty-$table.rules") +done <"/proc/net/ip$1_tables_names" + +if (( ${#tables[*]} )); then + cat "${tables[@]}" | "$iptables-restore" +fi diff --git a/abs/core/iptables/iptables.conf.d b/abs/core/iptables/iptables.conf.d index 07bc11a..1c6cc7b 100644 --- a/abs/core/iptables/iptables.conf.d +++ b/abs/core/iptables/iptables.conf.d @@ -1,8 +1,12 @@ # Configuration for iptables rules - -IPTABLES=/usr/sbin/iptables -IP6TABLES=/usr/sbin/ip6tables - IPTABLES_CONF=/etc/iptables/iptables.rules IP6TABLES_CONF=/etc/iptables/ip6tables.rules -IPTABLES_FORWARD=0 # enable IP forwarding? + +# Enable IP forwarding (both IPv4 and IPv6) +# NOTE: this is not the recommended way to do this, and is supported only for +# backward compatibility. Instead, use /etc/sysctl.conf and set the following +# options: +# * net.ipv4.ip_forward=1 +# * net.ipv6.conf.default.forwarding=1 +# * net.ipv6.conf.all.forwarding=1 +#IPTABLES_FORWARD=0 diff --git a/abs/core/iptables/iptables.service b/abs/core/iptables/iptables.service new file mode 100644 index 0000000..3084f53 --- /dev/null +++ b/abs/core/iptables/iptables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD index 1b62cda..e72795d 100644 --- a/abs/core/iputils/PKGBUILD +++ b/abs/core/iputils/PKGBUILD @@ -1,61 +1,71 @@ -# $Id: PKGBUILD 82625 2010-06-15 04:22:56Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils -pkgver=20100214 -_traceroutever=1.4a12 -pkgrel=2 +pkgver=20101006 +pkgrel=4 pkgdesc="IP Configuration Utilities (and Ping)" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://www.linuxfoundation.org/en/Net:Iputils" groups=('base') -depends=('glibc') -makedepends=('opensp' 'libxslt' 'docbook-xsl') -conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute') -replaces=('netkit-base' 'traceroute') -source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2 - ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz - permission-fix.patch) -options=(!makeflags) -md5sums=('37596c8b3eed537294e77464b9804726' - '964d599ef696efccdeebe7721cd4828d' - '66109966cad06e425bb12a78bab85b70') - -build() -{ - #build iptuils - cd $srcdir/$pkgname-s$pkgver - make KERNEL_INCLUDE=/usr/include || return 1 # for i686 - for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do - install -D -m755 $i $pkgdir/usr/sbin/$i - done - for i in ping ping6 traceroute6; do - install -D -m4755 $i $pkgdir/bin/$i - done +depends=('openssl' 'sysfsutils' 'libcap') +optdepends=('xinetd: for tftpd') +makedepends=('docbook2x' 'opensp') +conflicts=('netkit-base' 'arping' 'netkit-tftpd') +replaces=('netkit-base') +backup=(etc/xinetd.d/tftp) +install=${pkgname}.install +source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd + iputils-20101006-ping-integer-overflow.patch) +sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' + 'ec78574d798b53e4f8bdd37e42514fc17ed71667') + +build() { + cd "${srcdir}/${pkgname}-s${pkgver}" + + # Use our CFLAGS + sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile + + # FS#28897 + patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch + + make - msg ":: building docs" - # good god, these docs are a pain - # special thanks to Michael(tm) Smith <mike@w3.org> - http://people.w3.org/mike/ - # from #docbook on freenode.org for figuring this out cd doc for file in *.sgml; do - xf=${file/.sgml/.xml} - osx -xlower -xno-nl-in-tag $file > $xf || true - sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf - xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.76.0/manpages/docbook.xsl $xf + xf=${file/.sgml/.xml} + osx -xlower -xno-nl-in-tag $file > $xf || true + sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf + docbook2man $xf done +} - mkdir -p $pkgdir/usr/share/man/man8 - install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \ - tftpd.8 tracepath.8 tracepath6.8 traceroute6.8 \ - $pkgdir/usr/share/man/man8/ - - # build traceroute - # this is combined in this package because it's awkward as a separate package - cd ${srcdir}/traceroute-$_traceroutever - patch -Np1 -i ../permission-fix.patch || return 1 - ./configure --prefix=/usr --sbindir=/bin --mandir=/usr/share/man - make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1 - make DESTDIR=${pkgdir} install install-man +package() { + cd "${srcdir}/${pkgname}-s${pkgver}" + + install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin + + install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \ + "${pkgdir}"/usr/sbin/ + + install -m755 ping{,6} "${pkgdir}"/usr/bin/ + ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/ + + install -dm755 "${pkgdir}"/usr/share/man/man8 + install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ + "${pkgdir}"/usr/share/man/man8/ + + cd "${pkgdir}"/usr/share/man/man8 + ln -sf ping.8.gz ping6.8.gz + ln -sf tracepath.8.gz tracepath6.8.gz + + # FS#24768 + install -dm755 "${pkgdir}"/etc/xinetd.d/ + install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp } + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch b/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch new file mode 100644 index 0000000..720e5e8 --- /dev/null +++ b/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch @@ -0,0 +1,11 @@ +--- iputils-s20101006/ping_common.c 2010-10-06 13:59:20.000000000 +0200 ++++ iputils-s20101006-patched/ping_common.c 2012-03-09 16:42:46.878151032 +0100 +@@ -590,7 +590,7 @@ + + /* If we are here, recvmsg() is unable to wait for + * required timeout. */ +- if (1000*next <= 1000000/(int)HZ) { ++ if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) { + /* Very short timeout... So, if we wait for + * something, we sleep for MININTERVAL. + * Otherwise, spin! */ diff --git a/abs/core/iputils/iputils-big-patches.patch b/abs/core/iputils/iputils-big-patches.patch deleted file mode 100644 index 29bc310..0000000 --- a/abs/core/iputils/iputils-big-patches.patch +++ /dev/null @@ -1,595 +0,0 @@ -diff -Naur iputils.orig/Makefile iputils/Makefile ---- iputils.orig/Makefile 2002-11-09 03:01:11.000000000 +0000 -+++ iputils/Makefile 2005-06-09 16:15:32.000000000 +0000 -@@ -17,11 +17,6 @@ - GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h - endif - --ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h)) -- SUBDIRS=libipsec setkey -- LDLIBS+=-Llibipsec -lipsec -- IPSECDEF=-DDO_IPSEC -Ilibipsec --endif - - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv -@@ -31,7 +26,7 @@ - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(IPSECDEF) $(DEFINES) -+CFLAGS=$(CCOPT) -I../include $(IPSECDEF) $(DEFINES) - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 -@@ -42,7 +37,11 @@ - - tftpd: tftpd.o tftpsubs.o - ping: ping.o ping_common.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro - ping6: ping6.o ping_common.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro -+traceroute6: traceroute6.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro - ping.o ping6.o ping_common.o: ping_common.h - tftpd.o tftpsubs.o: tftp.h - -diff -Naur iputils.orig/arping.c iputils/arping.c ---- iputils.orig/arping.c 2001-10-05 22:42:47.000000000 +0000 -+++ iputils/arping.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdlib.h> - #include <sys/param.h> - #include <sys/socket.h> -@@ -19,6 +20,8 @@ - #include <sys/ioctl.h> - #include <linux/if.h> - #include <linux/if_arp.h> -+#include <linux/if_ether.h> -+#include <linux/if_packet.h> - #include <sys/uio.h> - - #include <netdb.h> -diff -Naur iputils.orig/clockdiff.c iputils/clockdiff.c ---- iputils.orig/clockdiff.c 2002-02-23 00:10:59.000000000 +0000 -+++ iputils/clockdiff.c 2005-06-09 16:15:24.000000000 +0000 -@@ -1,7 +1,9 @@ -+#include <asm/byteorder.h> - #include <time.h> - #include <sys/types.h> - #include <sys/param.h> - #include <stdio.h> -+#include <linux/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <math.h> -diff -Naur iputils.orig/include-glibc/netinet/in.h iputils/include-glibc/netinet/in.h ---- iputils.orig/include-glibc/netinet/in.h 2002-11-09 00:22:25.000000000 +0000 -+++ iputils/include-glibc/netinet/in.h 2005-06-09 16:15:00.000000000 +0000 -@@ -65,4 +65,45 @@ - && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3])) - - --#endif /* netinet/in.h */ -+/* Functions to convert between host and network byte order. -+ -+ Please note that these functions normally take `unsigned long int' or -+ `unsigned short int' values as arguments and also return them. But -+ this was a short-sighted decision since on different systems the types -+ may have different representations but the values are always the same. */ -+ -+extern u_int32_t ntohl (u_int32_t __netlong) __THROW __attribute__ ((__const__)); -+extern u_int16_t ntohs (u_int16_t __netshort) -+ __THROW __attribute__ ((__const__)); -+extern u_int32_t htonl (u_int32_t __hostlong) -+ __THROW __attribute__ ((__const__)); -+extern u_int16_t htons (u_int16_t __hostshort) -+ __THROW __attribute__ ((__const__)); -+ -+#include <endian.h> -+ -+/* Get machine dependent optimized versions of byte swapping functions. */ -+#include <bits/byteswap.h> -+ -+#ifdef __OPTIMIZE__ -+/* We can optimize calls to the conversion functions. Either nothing has -+ to be done or we are using directly the byte-swapping functions which -+ often can be inlined. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+/* The host byte order is the same as network byte order, -+ so these functions are all just identity. */ -+# define ntohl(x) (x) -+# define ntohs(x) (x) -+# define htonl(x) (x) -+# define htons(x) (x) -+# else -+# if __BYTE_ORDER == __LITTLE_ENDIAN -+# define ntohl(x) __bswap_32 (x) -+# define ntohs(x) __bswap_16 (x) -+# define htonl(x) __bswap_32 (x) -+# define htons(x) __bswap_16 (x) -+# endif -+# endif -+#endif -+ -+#endif /* netinet/in.h */ -diff -Naur iputils.orig/ipg iputils/ipg ---- iputils.orig/ipg 2001-08-02 22:37:32.000000000 +0000 -+++ iputils/ipg 2005-06-09 16:14:49.000000000 +0000 -@@ -1,21 +1,31 @@ --#! /bin/bash -+#!/bin/bash - --modprobe pg3 -+modprobe pg3 >& /dev/null -+modprobe pktgen >& /dev/null -+ -+PGDEV=/proc/net/pg -+if [[ ! -e ${PGDEV} ]] ; then -+ PGDEV=/proc/net/pktgen/pg0 -+ if [[ ! -e ${PGDEV} ]] ; then -+ echo "Couldn't not locate pg in /proc/net :(" -+ exit 1 -+ fi -+fi - - function pgset() { - local result - -- echo $1 > /proc/net/pg -+ echo $1 > ${PGDEV} - -- result=`cat /proc/net/pg | fgrep "Result: OK:"` -+ result=`cat ${PGDEV} | fgrep "Result: OK:"` - if [ "$result" = "" ]; then -- cat /proc/net/pg | fgrep Result: -+ cat ${PGDEV} | fgrep Result: - fi - } - - function pg() { -- echo inject > /proc/net/pg -- cat /proc/net/pg -+ echo inject > ${PGDEV} -+ cat ${PGDEV} - } - - pgset "odev eth0" -diff -Naur iputils.orig/ping.c iputils/ping.c ---- iputils.orig/ping.c 2002-11-07 22:53:21.000000000 +0000 -+++ iputils/ping.c 2005-06-09 16:15:00.000000000 +0000 -@@ -60,8 +60,8 @@ - - #include "ping_common.h" - -+#include <linux/icmp.h> - #include <netinet/ip.h> --#include <netinet/ip_icmp.h> - #ifdef DO_IPSEC - #include <libipsec.h> - #endif -@@ -1213,7 +1213,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -Naur iputils.orig/ping6.c iputils/ping6.c ---- iputils.orig/ping6.c 2002-09-20 15:08:11.000000000 +0000 -+++ iputils/ping6.c 2005-06-09 16:15:00.000000000 +0000 -@@ -68,8 +68,44 @@ - */ - #include "ping_common.h" - --#include <linux/in6.h> --#include <linux/ipv6.h> -+struct ipv6_rt_hdr { -+ __u8 nexthdr; -+ __u8 hdrlen; -+ __u8 type; -+ __u8 segments_left; -+ -+ /* -+ * type specific data -+ * variable length field -+ */ -+}; -+ -+struct rt0_hdr { -+ struct ipv6_rt_hdr rt_hdr; -+ __u32 bitmap; /* strict/loose bit map */ -+ struct in6_addr addr[0]; -+ -+#define rt0_type rt_hdr.type; -+}; -+#define IPV6_SRCRT_TYPE_0 0 /* IPv6 type 0 Routing Header */ -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; -+ -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; -+ - #include <linux/icmpv6.h> - - #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0) -@@ -879,7 +915,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -Naur iputils.orig/ping_common.h iputils/ping_common.h ---- iputils.orig/ping_common.h 2002-09-20 15:08:11.000000000 +0000 -+++ iputils/ping_common.h 2005-06-09 16:15:24.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include <asm/byteorder.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -19,6 +20,7 @@ - - #include <netinet/in.h> - #include <arpa/inet.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - - #include "SNAPSHOT.h" -diff -Naur iputils.orig/rarpd.c iputils/rarpd.c ---- iputils.orig/rarpd.c 2001-12-02 18:45:06.000000000 +0000 -+++ iputils/rarpd.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdio.h> - #include <syslog.h> - #include <dirent.h> -@@ -26,6 +27,7 @@ - #include <sys/signal.h> - #include <linux/if.h> - #include <linux/if_arp.h> -+#include <linux/if_ether.h> - #include <netinet/in.h> - #include <linux/if_packet.h> - #include <linux/filter.h> -@@ -42,7 +44,9 @@ - char *ifname; - char *tftp_dir = "/etc/tftpboot"; - -+#ifndef __UCLIBC__ - extern int ether_ntohost(char *name, unsigned char *ea); -+#endif - void usage(void) __attribute__((noreturn)); - - struct iflink -@@ -52,12 +56,12 @@ - int hatype; - unsigned char lladdr[16]; - unsigned char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct l_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct l_ifaddr - { -- struct ifaddr *next; -+ struct l_ifaddr *next; - __u32 prefix; - __u32 mask; - __u32 local; -@@ -89,7 +93,7 @@ - int fd; - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; - -@@ -180,7 +184,7 @@ - if (ifa == NULL) { - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct l_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; - ifa->prefix = prefix; -@@ -236,10 +240,10 @@ - return dent != NULL; - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct l_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - int retry = 0; - int i; - -@@ -295,7 +299,7 @@ - - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct hostent *hp; - char ename[256]; - static struct rarp_map emap = { -@@ -305,7 +309,11 @@ - 6, - }; - -+#ifndef __UCLIBC__ - if (ether_ntohost(ename, lladdr) != 0 || -+#else -+ if ( -+#endif - (hp = gethostbyname(ename)) == NULL) { - if (verbose) - syslog(LOG_INFO, "not found in /etc/ethers"); -@@ -364,7 +372,7 @@ - { - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) - if (ifl->index == ifindex) -diff -Naur iputils.orig/rdisc.c iputils/rdisc.c ---- iputils.orig/rdisc.c 2001-08-24 17:39:00.000000000 +0000 -+++ iputils/rdisc.c 2005-06-09 16:15:24.000000000 +0000 -@@ -25,6 +25,7 @@ - * 2550 Garcia Avenue - * Mountain View, California 94043 - */ -+#include <asm/byteorder.h> - #include <stdio.h> - #include <errno.h> - #include <signal.h> -@@ -1504,5 +1505,5 @@ - if (logging) - syslog(LOG_ERR, "%s: %m", str); - else -- (void) fprintf(stderr, "%s: %s\n", str, sys_errlist[errno]); -+ (void) fprintf(stderr, "%s: %s\n", str, strerror(errno)); - } -diff -Naur iputils.orig/tftpd.c iputils/tftpd.c ---- iputils.orig/tftpd.c 2002-01-24 00:31:41.000000000 +0000 -+++ iputils/tftpd.c 2005-06-09 16:15:24.000000000 +0000 -@@ -48,6 +48,7 @@ - * This version includes many modifications by Jim Guyton <guyton@rand-unix> - */ - -+#include <asm/byteorder.h> - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -@@ -57,7 +58,6 @@ - - #include <sys/socket.h> - #include <netinet/in.h> --#include <linux/in6.h> - #include <netdb.h> - - #include <setjmp.h> -diff -Naur iputils.orig/tracepath.c iputils/tracepath.c ---- iputils.orig/tracepath.c 2002-11-09 04:54:46.000000000 +0000 -+++ iputils/tracepath.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,10 +9,12 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> - #include <sys/socket.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - #include <errno.h> - #include <string.h> -@@ -76,7 +78,7 @@ - int progress = -1; - int broken_router; - --restart: -+ while (1) { - memset(&rcvbuf, -1, sizeof(rcvbuf)); - iov.iov_base = &rcvbuf; - iov.iov_len = sizeof(rcvbuf); -@@ -93,7 +95,7 @@ - if (res < 0) { - if (errno == EAGAIN) - return progress; -- goto restart; -+ continue; - } - - progress = mtu; -@@ -216,7 +218,7 @@ - perror("NET ERROR"); - return 0; - } -- goto restart; -+ } - } - - int probe_ttl(int fd, int ttl) -@@ -227,7 +229,6 @@ - - memset(sndbuf,0,mtu); - --restart: - for (i=0; i<10; i++) { - int res; - -@@ -243,7 +244,8 @@ - if (res==0) - return 0; - if (res > 0) -- goto restart; -+ i = 0; -+ continue; - } - hisptr = (hisptr + 1)&63; - -diff -Naur iputils.orig/tracepath6.c iputils/tracepath6.c ---- iputils.orig/tracepath6.c 2001-09-02 02:03:46.000000000 +0000 -+++ iputils/tracepath6.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,13 +9,13 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> - #include <sys/socket.h> - #include <netinet/in.h> -- --#include <linux/in6.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - #include <errno.h> - #include <string.h> -@@ -66,7 +66,7 @@ - int progress = -1; - int broken_router; - --restart: -+ while (1) { - memset(&rcvbuf, -1, sizeof(rcvbuf)); - iov.iov_base = &rcvbuf; - iov.iov_len = sizeof(rcvbuf); -@@ -83,7 +83,7 @@ - if (res < 0) { - if (errno == EAGAIN) - return progress; -- goto restart; -+ continue; - } - - progress = 2; -@@ -222,34 +222,29 @@ - perror("NET ERROR"); - return 0; - } -- goto restart; -+ } - } - - int probe_ttl(int fd, int ttl) - { -- int i; -+ int i=0, res; - char sndbuf[mtu]; - struct probehdr *hdr = (struct probehdr*)sndbuf; - --restart: -- -- for (i=0; i<10; i++) { -- int res; -- -- hdr->ttl = ttl; -- gettimeofday(&hdr->tv, NULL); -- if (send(fd, sndbuf, mtu-overhead, 0) > 0) -- break; -- res = recverr(fd, ttl); -- if (res==0) -- return 0; -- if (res > 0) -- goto restart; -- } -- -- if (i<10) { -- int res; -- -+ while (i<10) { -+ for (i=0; i<10; i++) { -+ hdr->ttl = ttl; -+ gettimeofday(&hdr->tv, NULL); -+ if (send(fd, sndbuf, mtu-overhead, 0) > 0) -+ break; -+ res = recverr(fd, ttl); -+ if (res==0) -+ return 0; -+ if (res > 0) { -+ i = 0; -+ continue; -+ } -+ } - data_wait(fd); - if (recv(fd, sndbuf, sizeof(sndbuf), MSG_DONTWAIT) > 0) { - printf("%2d?: reply received 8)\n", ttl); -@@ -257,7 +252,7 @@ - } - res = recverr(fd, ttl); - if (res == 1) -- goto restart; -+ continue; - return res; - } - -diff -Naur iputils.orig/traceroute6.c iputils/traceroute6.c ---- iputils.orig/traceroute6.c 2002-10-03 03:29:23.000000000 +0000 -+++ iputils/traceroute6.c 2005-06-09 16:14:49.000000000 +0000 -@@ -244,11 +244,30 @@ - #include <netinet/in.h> - #include <netinet/ip.h> - #include <netinet/ip_icmp.h> -+#if __linux__ -+#include <linux/udp.h> -+#else - #include <netinet/udp.h> -+#endif -+ -+#include <linux/types.h> -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; - --#include <linux/ipv6.h> --#include <linux/in6.h> -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; - -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; - #include <linux/icmpv6.h> - - #include <arpa/inet.h> diff --git a/abs/core/iputils/iputils-ss021109-try.patch b/abs/core/iputils/iputils-ss021109-try.patch deleted file mode 100644 index 4d9a705..0000000 --- a/abs/core/iputils/iputils-ss021109-try.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -urN iputils.orig/Makefile iputils/Makefile ---- iputils.orig/Makefile 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/Makefile 2004-05-02 20:30:48.000000000 +0000 -@@ -1,5 +1,4 @@ - # Path to parent kernel include files directory --KERNEL_INCLUDE=/usr/src/linux/include - LIBC_INCLUDE=/usr/include - - DEFINES= -@@ -8,21 +7,6 @@ - LDLIBS=-lresolv - ADDLIB= - --ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) -- ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) -- GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h -- endif --endif --ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h)) -- GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h --endif -- --ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h)) -- SUBDIRS=libipsec setkey -- LDLIBS+=-Llibipsec -lipsec -- IPSECDEF=-DDO_IPSEC -Ilibipsec --endif -- - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv - # NOT AVAILABLE. Please, use libresolv. -@@ -31,13 +15,13 @@ - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(IPSECDEF) $(DEFINES) -+CFLAGS=$(CCOPT) -I../include $(IPSECDEF) $(DEFINES) - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --all: check-kernel subdirs $(TARGETS) -+all: subdirs $(TARGETS) - - - tftpd: tftpd.o tftpsubs.o -@@ -51,15 +35,6 @@ - rdisc_srv.o: rdisc.c - $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c - --check-kernel: --ifeq ($(KERNEL_INCLUDE),) -- @echo "Please, set correct KERNEL_INCLUDE"; false --else -- @set -e; \ -- if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \ -- echo "Please, set correct KERNEL_INCLUDE"; false; fi --endif -- - subdirs: - ifneq ($(SUBDIRS),) - @set -e; \ -diff -urN iputils.orig/arping.c iputils/arping.c ---- iputils.orig/arping.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/arping.c 2004-05-02 20:32:38.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdlib.h> - #include <sys/param.h> - #include <sys/socket.h> -@@ -19,6 +20,8 @@ - #include <sys/ioctl.h> - #include <linux/if.h> - #include <linux/if_arp.h> -+#include <linux/if_ether.h> -+#include <linux/if_packet.h> - #include <sys/uio.h> - - #include <netdb.h> -diff -urN iputils.orig/clockdiff.c iputils/clockdiff.c ---- iputils.orig/clockdiff.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/clockdiff.c 2004-05-02 20:30:48.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include <asm/byteorder.h> - #include <time.h> - #include <sys/types.h> - #include <sys/param.h> -diff -urN iputils.orig/ping.c iputils/ping.c ---- iputils.orig/ping.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/ping.c 2004-05-02 20:31:03.000000000 +0000 -@@ -61,7 +61,7 @@ - #include "ping_common.h" - - #include <netinet/ip.h> --#include <netinet/ip_icmp.h> -+#include <linux/icmp.h> - #ifdef DO_IPSEC - #include <libipsec.h> - #endif -diff -urN iputils.orig/ping_common.h iputils/ping_common.h ---- iputils.orig/ping_common.h 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/ping_common.h 2004-05-02 20:30:48.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include <asm/byteorder.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -diff -urN iputils.orig/rarpd.c iputils/rarpd.c ---- iputils.orig/rarpd.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/rarpd.c 2004-05-02 20:33:07.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdio.h> - #include <syslog.h> - #include <dirent.h> -@@ -26,6 +27,7 @@ - #include <sys/signal.h> - #include <linux/if.h> - #include <linux/if_arp.h> -+#include <linux/if_ether.h> - #include <netinet/in.h> - #include <linux/if_packet.h> - #include <linux/filter.h> -@@ -52,12 +54,12 @@ - int hatype; - unsigned char lladdr[16]; - unsigned char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct l_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct l_ifaddr - { -- struct ifaddr *next; -+ struct l_ifaddr *next; - __u32 prefix; - __u32 mask; - __u32 local; -@@ -89,7 +91,7 @@ - int fd; - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; - -@@ -180,7 +182,7 @@ - if (ifa == NULL) { - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct l_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; - ifa->prefix = prefix; -@@ -236,10 +238,10 @@ - return dent != NULL; - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct l_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - int retry = 0; - int i; - -@@ -295,7 +297,7 @@ - - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct hostent *hp; - char ename[256]; - static struct rarp_map emap = { -@@ -364,7 +366,7 @@ - { - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) - if (ifl->index == ifindex) -diff -urN iputils.orig/rdisc.c iputils/rdisc.c ---- iputils.orig/rdisc.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/rdisc.c 2004-05-02 20:30:48.000000000 +0000 -@@ -25,6 +25,7 @@ - * 2550 Garcia Avenue - * Mountain View, California 94043 - */ -+#include <asm/byteorder.h> - #include <stdio.h> - #include <errno.h> - #include <signal.h> -diff -urN iputils.orig/tftpd.c iputils/tftpd.c ---- iputils.orig/tftpd.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/tftpd.c 2004-05-02 20:30:48.000000000 +0000 -@@ -48,6 +48,7 @@ - * This version includes many modifications by Jim Guyton <guyton@rand-unix> - */ - -+#include <asm/byteorder.h> - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -diff -urN iputils.orig/tracepath.c iputils/tracepath.c ---- iputils.orig/tracepath.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/tracepath.c 2004-05-02 20:30:48.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> - */ - -+#include <asm/byteorder.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -diff -urN iputils.orig/traceroute6.c iputils/traceroute6.c ---- iputils.orig/traceroute6.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/traceroute6.c 2004-05-02 20:30:48.000000000 +0000 -@@ -230,6 +230,7 @@ - * Tue Dec 20 03:50:13 PST 1988 - */ - -+#include <asm/byteorder.h> - #include <sys/param.h> - #include <sys/time.h> - #include <sys/socket.h> diff --git a/abs/core/iputils/iputils.install b/abs/core/iputils/iputils.install new file mode 100644 index 0000000..2481fb3 --- /dev/null +++ b/abs/core/iputils/iputils.install @@ -0,0 +1,11 @@ +post_install() { + setcap cap_net_raw=ep usr/bin/ping + setcap cap_net_raw=ep usr/bin/ping6 + echo " >> Traceroute is now provided by core/traceroute" +} + +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/iputils/iputils.patch b/abs/core/iputils/iputils.patch deleted file mode 100644 index 4e99b75..0000000 --- a/abs/core/iputils/iputils.patch +++ /dev/null @@ -1,1170 +0,0 @@ ---- iputils/ping_common.c.old Thu Mar 14 16:58:47 2002 -+++ iputils/ping_common.c Thu Mar 14 17:10:54 2002 -@@ -775,10 +775,10 @@ - tmdev = llsqrt(tsum2 - tsum * tsum); - - printf("rtt min/avg/max/mdev = %ld.%03ld/%lu.%03ld/%ld.%03ld/%ld.%03ld ms", -- tmin/1000, tmin%1000, -+ (long)tmin/1000, (long)tmin%1000, - (unsigned long)(tsum/1000), (long)(tsum%1000), -- tmax/1000, tmax%1000, -- tmdev/1000, tmdev%1000 -+ (long)tmax/1000, (long)tmax%1000, -+ (long)tmdev/1000, (long)tmdev%1000 - ); - } - if (pipesize > 1) -@@ -809,10 +809,10 @@ - tavg = tsum / (nreceived + nrepeats); - - fprintf(stderr, ", min/avg/ewma/max = %ld.%03ld/%lu.%03ld/%d.%03d/%ld.%03ld ms", -- tmin/1000, tmin%1000, -+ (long)tmin/1000, (long)tmin%1000, - tavg/1000, tavg%1000, - rtt/8000, (rtt/8)%1000, -- tmax/1000, tmax%1000 -+ (long)tmax/1000, (long)tmax%1000 - ); - } - fprintf(stderr, "\n"); ---- iputils/rdisc.c-org Wed May 1 00:27:34 2002 -+++ iputils/rdisc.c Wed May 1 00:32:40 2002 -@@ -63,6 +63,8 @@ - - #include "SNAPSHOT.h" - -+#define RDISC_SERVER -+ - struct interface - { - struct in_addr address; /* Used to identify the interface */ -@@ -163,11 +165,8 @@ - int debugfile; - - char usage[] = --"Usage: rdisc [-b] [-d] [-s] [-v] [-f] [-a] [-V] [send_address] [receive_address]\n" --#ifdef RDISC_SERVER --" rdisc -r [-b] [-d] [-s] [-v] [-f] [-a] [-V] [-p <preference>] [-T <secs>] \n" --" [send_address] [receive_address]\n" --#endif -+"Usage: rdisc -r [-b] [-d] [-s] [-v] [-f] [-a] [-V] [-p <preference>] [-T <secs>] \n" -+" [send_address] [receive_address]\n" - ; - - -@@ -875,7 +874,9 @@ - ((max_adv_int - min_adv_int) - * (random() % 1000)/1000); - } else { -- if (!is_directly_connected(ip->saddr)) { -+ struct in_addr tmp; -+ tmp.s_addr = ip->saddr; -+ if (!is_directly_connected(tmp)) { - if (verbose) - logtrace("ICMP %s from %s: source not directly connected\n", - pr_type((int)icp->type), -@@ -945,7 +946,6 @@ - { - #ifdef RDISC_SERVER - if (responder) { -- int i; - - /* Send out a packet with a preference so that all - * hosts will know that we are dead. ---- iputils/ping_common.c.countermeasures Tue May 21 10:06:05 2002 -+++ iputils/ping_common.c Tue May 21 10:12:42 2002 -@@ -628,7 +628,8 @@ - tvsub(tv, &tmp_tv); - triptime = tv->tv_sec * 1000000 + tv->tv_usec; - if (triptime < 0) { -- fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); -+ if (options & F_VERBOSE) -+ fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); - triptime = 0; - if (!(options & F_LATENCY)) { - gettimeofday(tv, NULL); ---- iputils/ping.c.addrcache 2002-09-20 17:08:11.000000000 +0200 -+++ iputils/ping.c 2003-05-15 16:41:19.000000000 +0200 -@@ -1124,6 +1124,12 @@ - { - struct hostent *hp; - static char buf[4096]; -+ static __u32 addr_cache = 0; -+ -+ if ( addr == addr_cache ) -+ return buf; -+ -+ addr_cache = addr; - - if ((options & F_NUMERIC) || - !(hp = gethostbyaddr((char *)&addr, 4, AF_INET))) ---- iputils/ping6.c.addrcache 2002-09-20 17:08:11.000000000 +0200 -+++ iputils/ping6.c 2003-05-15 16:41:19.000000000 +0200 -@@ -893,7 +893,14 @@ - */ - char * pr_addr(struct in6_addr *addr) - { -- struct hostent *hp = NULL; -+ static struct hostent *hp = NULL; -+ static struct in6_addr addr_cache = {{{0,0,0,0}}}; -+ -+ if ( addr->s6_addr32[0] == addr_cache.s6_addr32[0] && -+ addr->s6_addr32[1] == addr_cache.s6_addr32[1] && -+ addr->s6_addr32[2] == addr_cache.s6_addr32[2] && -+ addr->s6_addr32[3] == addr_cache.s6_addr32[3] ) -+ return hp ? hp->h_name : pr_addr_n(addr); - - if (!(options&F_NUMERIC)) - hp = gethostbyaddr((__u8*)addr, sizeof(struct in6_addr), AF_INET6); ---- iputils-ss021109-vanilla/ping.c Thu Nov 7 23:53:21 2002 -+++ iputils/ping.c Sun Jan 12 03:39:24 2003 -@@ -285,6 +285,9 @@ - perror("ping: IP_MULTICAST_IF"); - exit(2); - } -+ } else if (icmp_sock >= 0) { -+ /* We possible tried to SO_BINDTODEVICE() a subinterface like 'eth0:1' */ -+ perror("Warning: cannot bind to specified iface, falling back"); - } - } - } ---- iputils/ping.c.icmp_seq 2003-09-03 16:45:07.000000000 +0200 -+++ iputils/ping.c 2003-09-03 16:45:41.000000000 +0200 -@@ -610,7 +610,7 @@ - icp->type = ICMP_ECHO; - icp->code = 0; - icp->checksum = 0; -- icp->un.echo.sequence = htons(ntransmitted+1); -+ icp->un.echo.sequence = htons(ntransmitted); - icp->un.echo.id = ident; /* ID */ - - CLR((ntransmitted+1) % mx_dup_ck); ---- iputils/ping6.c.icmp_seq 2003-09-03 16:45:20.000000000 +0200 -+++ iputils/ping6.c 2003-09-03 16:45:34.000000000 +0200 -@@ -647,7 +647,7 @@ - icmph->icmp6_type = ICMPV6_ECHO_REQUEST; - icmph->icmp6_code = 0; - icmph->icmp6_cksum = 0; -- icmph->icmp6_sequence = htons(ntransmitted+1); -+ icmph->icmp6_sequence = htons(ntransmitted); - icmph->icmp6_identifier = ident; - - CLR((ntransmitted+1) % mx_dup_ck); -diff -ru iputils/include-glibc/netinet/in.h iputils-clean/include-glibc/netinet/in.h ---- iputils/include-glibc/netinet/in.h 2000-06-18 14:57:25.000000000 -0400 -+++ iputils-clean/include-glibc/netinet/in.h 2003-09-03 11:21:55.000000000 -0400 -@@ -8,4 +8,45 @@ - - #define SOL_IP 0 - --#endif /* netinet/in.h */ -+/* Functions to convert between host and network byte order. -+ -+ Please note that these functions normally take `unsigned long int' or -+ `unsigned short int' values as arguments and also return them. But -+ this was a short-sighted decision since on different systems the types -+ may have different representations but the values are always the same. */ -+ -+extern u_int32_t ntohl (u_int32_t __netlong) __THROW __attribute__ ((__const__)); -+extern u_int16_t ntohs (u_int16_t __netshort) -+ __THROW __attribute__ ((__const__)); -+extern u_int32_t htonl (u_int32_t __hostlong) -+ __THROW __attribute__ ((__const__)); -+extern u_int16_t htons (u_int16_t __hostshort) -+ __THROW __attribute__ ((__const__)); -+ -+#include <endian.h> -+ -+/* Get machine dependent optimized versions of byte swapping functions. */ -+#include <bits/byteswap.h> -+ -+#ifdef __OPTIMIZE__ -+/* We can optimize calls to the conversion functions. Either nothing has -+ to be done or we are using directly the byte-swapping functions which -+ often can be inlined. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+/* The host byte order is the same as network byte order, -+ so these functions are all just identity. */ -+# define ntohl(x) (x) -+# define ntohs(x) (x) -+# define htonl(x) (x) -+# define htons(x) (x) -+# else -+# if __BYTE_ORDER == __LITTLE_ENDIAN -+# define ntohl(x) __bswap_32 (x) -+# define ntohs(x) __bswap_16 (x) -+# define htonl(x) __bswap_32 (x) -+# define htons(x) __bswap_16 (x) -+# endif -+# endif -+#endif -+ -+#endif /* netinet/in.h */ -diff -ru iputils/ping6.c iputils-clean/ping6.c ---- iputils/ping6.c 2003-09-03 11:22:46.000000000 -0400 -+++ iputils-clean/ping6.c 2003-09-03 11:15:42.000000000 -0400 -@@ -879,7 +879,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -ru iputils/ping.c iputils-clean/ping.c ---- iputils/ping.c 2003-09-03 11:22:46.000000000 -0400 -+++ iputils-clean/ping.c 2003-09-03 11:15:26.000000000 -0400 -@@ -1196,7 +1196,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -urN iputils/clockdiff.c iputils.new/clockdiff.c ---- iputils/clockdiff.c 2002-02-22 19:10:59.000000000 -0500 -+++ iputils.new/clockdiff.c 2003-09-10 09:20:28.000000000 -0400 -@@ -2,6 +2,7 @@ - #include <sys/types.h> - #include <sys/param.h> - #include <stdio.h> -+#include <linux/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <math.h> -diff -urN iputils/ping6.c iputils.new/ping6.c ---- iputils/ping6.c 2003-09-10 17:27:48.000000000 -0400 -+++ iputils.new/ping6.c 2003-09-10 17:22:43.000000000 -0400 -@@ -68,8 +68,44 @@ - */ - #include "ping_common.h" - --#include <linux/in6.h> --#include <linux/ipv6.h> -+struct ipv6_rt_hdr { -+ __u8 nexthdr; -+ __u8 hdrlen; -+ __u8 type; -+ __u8 segments_left; -+ -+ /* -+ * type specific data -+ * variable length field -+ */ -+}; -+ -+struct rt0_hdr { -+ struct ipv6_rt_hdr rt_hdr; -+ __u32 bitmap; /* strict/loose bit map */ -+ struct in6_addr addr[0]; -+ -+#define rt0_type rt_hdr.type; -+}; -+#define IPV6_SRCRT_TYPE_0 0 /* IPv6 type 0 Routing Header */ -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; -+ -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; -+ - #include <linux/icmpv6.h> - - #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0) -diff -urN iputils/ping_common.h iputils.new/ping_common.h ---- iputils/ping_common.h 2002-09-20 11:08:11.000000000 -0400 -+++ iputils.new/ping_common.h 2003-09-10 17:16:16.000000000 -0400 -@@ -19,6 +19,7 @@ - - #include <netinet/in.h> - #include <arpa/inet.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - - #include "SNAPSHOT.h" -diff -urN iputils/tftpd.c iputils.new/tftpd.c ---- iputils/tftpd.c 2002-01-23 19:31:41.000000000 -0500 -+++ iputils.new/tftpd.c 2003-09-10 09:39:45.000000000 -0400 -@@ -57,7 +57,6 @@ - - #include <sys/socket.h> - #include <netinet/in.h> --#include <linux/in6.h> - #include <netdb.h> - - #include <setjmp.h> -diff -urN iputils/tracepath6.c iputils.new/tracepath6.c ---- iputils/tracepath6.c 2001-09-01 22:03:46.000000000 -0400 -+++ iputils.new/tracepath6.c 2003-09-10 09:40:18.000000000 -0400 -@@ -14,8 +14,7 @@ - #include <unistd.h> - #include <sys/socket.h> - #include <netinet/in.h> -- --#include <linux/in6.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - #include <errno.h> - #include <string.h> -diff -urN iputils/tracepath.c iputils.new/tracepath.c ---- iputils/tracepath.c 2002-02-22 19:10:59.000000000 -0500 -+++ iputils.new/tracepath.c 2003-09-10 06:14:35.000000000 -0400 -@@ -13,6 +13,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <sys/socket.h> -+#include <linux/types.h> - #include <linux/errqueue.h> - #include <errno.h> - #include <string.h> -diff -urN iputils/traceroute6.c iputils.new/traceroute6.c ---- iputils/traceroute6.c 2002-09-20 11:44:22.000000000 -0400 -+++ iputils.new/traceroute6.c 2003-09-10 10:12:47.000000000 -0400 -@@ -246,9 +246,24 @@ - #include <netinet/ip_icmp.h> - #include <netinet/udp.h> - --#include <linux/ipv6.h> --#include <linux/in6.h> -+#include <linux/types.h> -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; - -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; - #include <linux/icmpv6.h> - - #include <arpa/inet.h> ---- iputils/arping.c.unaligned 2001-10-06 00:42:47.000000000 +0200 -+++ iputils/arping.c 2003-10-02 15:14:42.000000000 +0200 -@@ -332,7 +332,7 @@ - timeout = atoi(optarg); - break; - case 'I': -- device = optarg; -+ device = strdup(optarg); - break; - case 'f': - quit_on_reply=1; ---- iputils/traceroute6.c.inet_pton 2004-04-22 15:06:28.268797480 +0200 -+++ iputils/traceroute6.c 2004-04-22 15:06:35.727877941 +0200 -@@ -538,7 +538,7 @@ - } else { - (void) bzero((char *)&saddr, sizeof(saddr)); - saddr.sin6_family = AF_INET6; -- if (inet_pton(AF_INET6, source, &saddr.sin6_addr) < 0) -+ if (inet_pton(AF_INET6, source, &saddr.sin6_addr) <= 0) - { - Printf("traceroute: unknown addr %s\n", source); - exit(1); ---- iputils/traceroute6.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/traceroute6.c 2004-12-07 11:14:09.397575536 +0100 -@@ -352,8 +352,11 @@ - icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); - socket_errno = errno; - -- setuid(getuid()); -- -+ if(setuid(getuid()) != 0) -+ { -+ perror("traceroute: setuid()"); -+ exit(-1); -+ } - on = 1; - seq = tos = 0; - to = (struct sockaddr_in6 *)&whereto; ---- iputils/ping6.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/ping6.c 2004-12-07 11:13:40.707937024 +0100 -@@ -223,7 +223,11 @@ - socket_errno = errno; - - uid = getuid(); -- setuid(uid); -+ if(setuid(uid) != 0) -+ { -+ perror("ping: setuid()"); -+ exit(-1); -+ } - - source.sin6_family = AF_INET6; - memset(&firsthop, 0, sizeof(firsthop)); ---- iputils/ping.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/ping.c 2004-12-07 11:13:27.523941296 +0100 -@@ -119,7 +119,11 @@ - socket_errno = errno; - - uid = getuid(); -- setuid(uid); -+ if(setuid(uid) != 0) -+ { -+ perror("ping: setuid()"); -+ exit(-1); -+ } - - source.sin_family = AF_INET; - ---- iputils/doc/ping.8.old 2002-09-27 19:12:47.000000000 +0200 -+++ iputils/doc/ping.8 2004-12-07 11:09:42.434160144 +0100 -@@ -112,7 +112,7 @@ - when finished. - .TP - \fB-R\fR --Record route. -+Record route. (IPv4 only) - Includes the RECORD_ROUTE option in the ECHO_REQUEST - packet and displays the route buffer on returned packets. - Note that the IP header is only large enough for nine such routes. ---- iputils/doc/ping.sgml.old 2002-09-20 14:55:50.000000000 +0200 -+++ iputils/doc/ping.sgml 2004-12-07 11:09:42.435159992 +0100 -@@ -190,7 +190,7 @@ - <varlistentry> - <term><option/-R/</term> - <listitem><para> --Record route. -+Record route. (IPv4 only) - Includes the RECORD_ROUTE option in the ECHO_REQUEST - packet and displays the route buffer on returned packets. - Note that the IP header is only large enough for nine such routes. ---- iputils/ping.c 2005-05-18 01:37:05.621810488 -0400 -+++ iputils/ping.c.new 2005-05-18 01:41:27.113018222 -0400 -@@ -101,7 +101,7 @@ static struct { - int cmsg_len; - - struct sockaddr_in source; --char *device; -+char *device=NULL; - int pmtudisc = -1; - - -@@ -177,7 +177,7 @@ main(int argc, char **argv) - ptr[3] = i4; - options |= F_STRICTSOURCE; - } else { -- device = optarg; -+ device = strdup(optarg); - } - break; - } ---- iputils/ping6.c 2005-05-18 01:37:05.620833925 -0400 -+++ iputils/ping6.c.new 2005-05-18 01:41:23.599346390 -0400 -@@ -155,7 +155,7 @@ static int pr_icmph(__u8 type, __u8 code - static void usage(void) __attribute((noreturn)); - - struct sockaddr_in6 source; --char *device; -+char *device=NULL; - int pmtudisc=-1; - - static int icmp_sock; -@@ -248,7 +248,7 @@ int main(int argc, char *argv[]) - } - options |= F_STRICTSOURCE; - } else { -- device = optarg; -+ device = strdup(optarg); - } - break; - case 'M': -diff -ur iputils/arping.c iputils.tom/arping.c ---- iputils/arping.c 2005-07-15 13:51:15.533632784 -0700 -+++ iputils.tom/arping.c 2005-07-15 13:50:47.967823000 -0700 -@@ -59,6 +59,8 @@ - #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \ - ((tv1).tv_usec-(tv2).tv_usec)/1000 ) - -+#define min(x,y) ((x)<(y) ? (x) : (y)) -+ - void usage(void) - { - fprintf(stderr, -@@ -476,7 +478,7 @@ - } - - he = me; -- memset(he.sll_addr, -1, he.sll_halen); -+ memset(he.sll_addr, -1, min(he.sll_halen, sizeof he.sll_addr)); - - if (!quiet) { - printf("ARPING %s ", inet_ntoa(dst)); ---- iputils/arping.c.orig 2001-10-05 18:42:47.000000000 -0400 -+++ iputils/arping.c 2005-07-13 13:07:45.406217716 -0400 -@@ -166,10 +166,12 @@ void catcher(void) - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) -+ if ((timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) || -+ ((count == 0) && (!timeout))) - finish(); - - if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { -+ count--; - send_pack(s, src, dst, &me, &he); - if (count == 0 && unsolicited) - finish(); -@@ -510,6 +512,8 @@ main(int argc, char **argv) - sigaddset(&sset, SIGINT); - sigprocmask(SIG_BLOCK, &sset, &osset); - recv_pack(packet, cc, &from); -+ if(received == count) -+ exit(0); - sigprocmask(SIG_SETMASK, &osset, NULL); - } - } ---- iputils/tracepath6.c.getaddrinfo 2005-09-08 10:31:47.000000000 +0200 -+++ iputils/tracepath6.c 2005-09-08 10:31:47.000000000 +0200 -@@ -280,7 +280,7 @@ - struct sockaddr_in6 sin; - int ttl; - char *p; -- struct hostent *he; -+ struct addrinfo hints, *res; - int ch; - - while ((ch = getopt(argc, argv, "nbh?")) != EOF) { -@@ -308,20 +308,26 @@ - perror("socket"); - exit(1); - } -- sin.sin6_family = AF_INET6; - - p = strchr(argv[0], '/'); - if (p) { - *p = 0; -+ } -+ -+ memset(&hints, '\0', sizeof(hints)); -+ hints.ai_family = AF_INET6; -+ if (getaddrinfo(argv[0], NULL, &hints, &res)) { -+ herror("getaddrinfo"); -+ exit(1); -+ } -+ -+ memcpy(&sin, res->ai_addr, sizeof(struct sockaddr_in6)); -+ freeaddrinfo(res); -+ -+ if (p) { - sin.sin6_port = htons(atoi(p+1)); - } else - sin.sin6_port = htons(0x8000 | getpid()); -- he = gethostbyname2(argv[0], AF_INET6); -- if (he == NULL) { -- herror("gethostbyname2"); -- exit(1); -- } -- memcpy(&sin.sin6_addr, he->h_addr, 16); - - if (connect(fd, (struct sockaddr*)&sin, sizeof(sin)) < 0) { - perror("connect"); ---- iputils/tracepath.c.getaddrinfo 2005-09-08 10:31:47.000000000 +0200 -+++ iputils/tracepath.c 2005-09-08 11:03:39.000000000 +0200 -@@ -272,12 +272,12 @@ - int - main(int argc, char **argv) - { -- struct hostent *he; - int fd; - int on; - int ttl; - char *p; - int ch; -+ struct addrinfo hints, *res; - - while ((ch = getopt(argc, argv, "nh?")) != EOF) { - switch(ch) { -@@ -300,20 +300,26 @@ - perror("socket"); - exit(1); - } -- target.sin_family = AF_INET; - - p = strchr(argv[0], '/'); - if (p) { - *p = 0; -+ } -+ -+ memset(&hints, '\0', sizeof(hints)); -+ hints.ai_family = AF_INET; -+ if (getaddrinfo(argv[0], NULL, &hints, &res)) { -+ herror("getaddrinfo"); -+ exit(1); -+ } -+ -+ memcpy(&target, res->ai_addr, sizeof(struct sockaddr_in)); -+ freeaddrinfo(res); -+ -+ if (p) - base_port = atoi(p+1); -- } else -+ else - base_port = 44444; -- he = gethostbyname(argv[0]); -- if (he == NULL) { -- herror("gethostbyname"); -- exit(1); -- } -- memcpy(&target.sin_addr, he->h_addr, 4); - - on = IP_PMTUDISC_DO; - if (setsockopt(fd, SOL_IP, IP_MTU_DISCOVER, &on, sizeof(on))) { ---- iputils/ping.c.flood 2005-09-26 09:26:49.000000000 +0200 -+++ iputils/ping.c 2005-09-26 13:07:39.000000000 +0200 -@@ -614,7 +608,7 @@ - icp->type = ICMP_ECHO; - icp->code = 0; - icp->checksum = 0; -- icp->un.echo.sequence = htons(ntransmitted); -+ icp->un.echo.sequence = htons(ntransmitted+1); - icp->un.echo.id = ident; /* ID */ - - CLR((ntransmitted+1) % mx_dup_ck); -diff -ru iputils/ping_common.c iputils-foo/ping_common.c ---- iputils/ping_common.c 2005-09-22 15:22:57.000000000 -0400 -+++ iputils-foo/ping_common.c 2005-09-22 15:24:42.000000000 -0400 -@@ -584,6 +584,7 @@ - * destined to other running pings. */ - - iov.iov_len = packlen; -+ memset(&msg,'\0',sizeof(msg)); - msg.msg_name = addrbuf; - msg.msg_namelen = sizeof(addrbuf); - msg.msg_iov = &iov; ---- iputils/tracepath6.c.hoplimit 2005-12-13 13:32:56.000000000 +0100 -+++ iputils/tracepath6.c 2005-12-13 13:35:01.000000000 +0100 -@@ -359,8 +359,8 @@ - perror("IP_RECVERR"); - exit(1); - } -- if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &on, sizeof(on))) { -- perror("IPV6_HOPLIMIT"); -+ if (setsockopt(fd, SOL_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on))) { -+ perror("IPV6_RECVHOPLIMIT"); - exit(1); - } - if (mapped && setsockopt(fd, SOL_IP, IP_RECVTTL, &on, sizeof(on))) { ---- iputils/ping6.c.hoplimit 2005-12-13 13:32:56.000000000 +0100 -+++ iputils/ping6.c 2005-12-13 13:34:04.000000000 +0100 -@@ -521,13 +521,10 @@ - } - } - -- if (1) { -- int on = 1; -- if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_HOPLIMIT, -- &on, sizeof(on)) == -1) { -- perror ("can't receive hop limit"); -- exit(2); -- } -+ int on = 1; -+ if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on))) { -+ perror("setsockopt(IPV6_RECVHOPLIMIT)"); -+ exit(2); - } - - if (options&F_FLOWINFO) { ---- iputils/ping6.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/ping6.c 2006-01-25 16:21:47.000000000 +0100 -@@ -383,7 +383,7 @@ - exit(2); - } - alen = sizeof(source); -- if (getsockname(probe_fd, (struct sockaddr*)&source, &alen) == -1) { -+ if (getsockname(probe_fd, (struct sockaddr*)&source, (socklen_t*)&alen) == -1) { - perror("getsockname"); - exit(2); - } -@@ -599,6 +599,7 @@ - int net_errors = 0; - int local_errors = 0; - int saved_errno = errno; -+ ssize_t wr_ret; - - iov.iov_base = &icmph; - iov.iov_len = sizeof(icmph); -@@ -629,7 +630,7 @@ - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) -- write(STDOUT_FILENO, "E", 1); -+ wr_ret = write(STDOUT_FILENO, "E", 1); - else if (e->ee_errno != EMSGSIZE) - fprintf(stderr, "ping: local error: %s\n", strerror(e->ee_errno)); - else -@@ -652,7 +653,7 @@ - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) { -- write(STDOUT_FILENO, "\bE", 2); -+ wr_ret = write(STDOUT_FILENO, "\bE", 2); - } else { - printf("From %s icmp_seq=%u ", pr_addr(&sin6->sin6_addr), ntohs(icmph.icmp6_sequence)); - pr_icmph(e->ee_type, e->ee_code, e->ee_info); -@@ -795,7 +796,8 @@ - return 0; - nerrors++; - if (options & F_FLOOD) { -- write(STDOUT_FILENO, "\bE", 2); -+ ssize_t wr_ret; -+ wr_ret = write(STDOUT_FILENO, "\bE", 2); - return 0; - } - printf("From %s: icmp_seq=%u ", pr_addr(&from->sin6_addr), ntohs(icmph1->icmp6_sequence)); ---- iputils/arping.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/arping.c 2006-01-25 16:21:47.000000000 +0100 -@@ -449,7 +449,7 @@ - perror("connect"); - exit(2); - } -- if (getsockname(probe_fd, (struct sockaddr*)&saddr, &alen) == -1) { -+ if (getsockname(probe_fd, (struct sockaddr*)&saddr, (socklen_t*)&alen) == -1) { - perror("getsockname"); - exit(2); - } -@@ -468,7 +468,7 @@ - - if (1) { - int alen = sizeof(me); -- if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) { -+ if (getsockname(s, (struct sockaddr*)&me, (socklen_t*)&alen) == -1) { - perror("getsockname"); - exit(2); - } -@@ -499,13 +499,13 @@ - - while(1) { - sigset_t sset, osset; -- char packet[4096]; -+ unsigned char packet[4096]; - struct sockaddr_ll from; - int alen = sizeof(from); - int cc; - - if ((cc = recvfrom(s, packet, sizeof(packet), 0, -- (struct sockaddr *)&from, &alen)) < 0) { -+ (struct sockaddr *)&from, (socklen_t*)&alen)) < 0) { - perror("arping: recvfrom"); - continue; - } ---- iputils/traceroute6.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/traceroute6.c 2006-01-25 16:21:47.000000000 +0100 -@@ -529,7 +529,7 @@ - exit(1); - } - alen = sizeof(saddr); -- if (getsockname(probe_fd, (struct sockaddr*)&saddr, &alen) == -1) { -+ if (getsockname(probe_fd, (struct sockaddr*)&saddr, (socklen_t*)&alen) == -1) { - perror("getsockname"); - exit(1); - } -@@ -656,7 +656,7 @@ - - if (select(sock+1, &fds, (fd_set *)0, (fd_set *)0, &wait) > 0) { - cc=recvfrom(icmp_sock, (char *)packet, sizeof(packet), 0, -- (struct sockaddr *)from, &fromlen); -+ (struct sockaddr *)from, (socklen_t*)&fromlen); - } - - return(cc); ---- iputils/tftpd.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/tftpd.c 2006-01-25 16:21:47.000000000 +0100 -@@ -126,7 +126,7 @@ - } - fromlen = sizeof (from); - n = recvfrom(0, buf, sizeof (buf), 0, -- (struct sockaddr *)&from, &fromlen); -+ (struct sockaddr *)&from, (socklen_t*)&fromlen); - if (n < 0) { - if (errno != EAGAIN) - syslog(LOG_ERR, "recvfrom: %m\n"); -@@ -164,9 +164,9 @@ - * than one tftpd being started up to service - * a single request from a single client. - */ -- j = sizeof from; -+ j = sizeof (from); - i = recvfrom(0, buf, sizeof (buf), 0, -- (struct sockaddr *)&from, &j); -+ (struct sockaddr *)&from, (socklen_t*)&j); - if (i > 0) { - n = i; - fromlen = j; ---- iputils/clockdiff.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/clockdiff.c 2006-01-25 16:21:47.000000000 +0100 -@@ -148,7 +148,7 @@ - if (select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout)) { - length = sizeof(struct sockaddr_in); - cc = recvfrom(sock_raw, (char *)packet, PACKET_IN, 0, -- (struct sockaddr *)NULL, &length); -+ (struct sockaddr *)NULL, (socklen_t*)&length); - if (cc < 0) - return -1; - goto empty; -@@ -214,7 +214,7 @@ - - (void)gettimeofday(&tv1, (struct timezone *)0); - cc = recvfrom(sock_raw, (char *)packet, PACKET_IN, 0, -- (struct sockaddr *)NULL, &length); -+ (struct sockaddr *)NULL, (socklen_t*)&length); - - if (cc < 0) - return(-1); -@@ -326,7 +326,7 @@ - if (select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout)) { - length = sizeof(struct sockaddr_in); - cc = recvfrom(sock_raw, (char *)packet, PACKET_IN, 0, -- (struct sockaddr *)NULL, &length); -+ (struct sockaddr *)NULL, (socklen_t*)&length); - if (cc < 0) - return -1; - goto empty; -@@ -396,7 +396,7 @@ - - (void)gettimeofday(&tv1, (struct timezone *)0); - cc = recvfrom(sock_raw, (char *)packet, PACKET_IN, 0, -- (struct sockaddr *)NULL, &length); -+ (struct sockaddr *)NULL, (socklen_t*)&length); - - if (cc < 0) - return(-1); -@@ -539,6 +539,7 @@ - struct hostent * hp; - char hostname[MAXHOSTNAMELEN]; - int s_errno = 0; -+ int nice_ret; - - if (argc < 2) { - setuid(getuid()); -@@ -606,7 +607,7 @@ - rspace[1] = ip_opt_len; - rspace[2] = 5; - rspace[3] = IPOPT_TS_PRESPEC; -- if (getsockname(sock_raw, (struct sockaddr*)&myaddr, &addrlen) == -1) { -+ if (getsockname(sock_raw, (struct sockaddr*)&myaddr, (socklen_t*)&addrlen) == -1) { - perror("getsockname"); - exit(1); - } -@@ -623,8 +624,13 @@ - ip_opt_len = 0; - } - } -- -- nice(-16); -+ nice_ret = nice(-16); -+ if (nice_ret < 0) { -+ if (errno) -+ perror("nice"); -+ else -+ fprintf(stderr, "nice: unknown failure\n"); -+ } - - if ((measure_status = (ip_opt_len ? measure_opt : measure)(&server)) < 0) { - if (errno) ---- iputils/rdisc.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/rdisc.c 2006-01-25 16:21:47.000000000 +0100 -@@ -454,7 +454,7 @@ - int cc; - - cc=recvfrom(s, (char *)packet, len, 0, -- (struct sockaddr *)&from, &fromlen); -+ (struct sockaddr *)&from, (socklen_t*)&fromlen); - if (cc<0) { - if (errno == EINTR) - continue; ---- iputils/rarpd.c.gcc41 2001-12-02 19:45:06.000000000 +0100 -+++ iputils/rarpd.c 2006-01-25 16:21:47.000000000 +0100 -@@ -154,8 +154,8 @@ - ifl->index = index; - ifl->hatype = ifrp->ifr_hwaddr.sa_family; - memcpy(ifl->lladdr, ifrp->ifr_hwaddr.sa_data, 14); -- strncpy(ifl->name, ifrp->ifr_name, IFNAMSIZ); -- p = strchr(ifl->name, ':'); -+ strncpy((char*)ifl->name, ifrp->ifr_name, IFNAMSIZ); -+ p = strchr((char*)ifl->name, ':'); - if (p) - *p = 0; - if (verbose) -@@ -423,7 +423,7 @@ - unsigned char *ptr; - int n; - -- n = recvfrom(fd, buf, sizeof(buf), MSG_DONTWAIT, (struct sockaddr*)&sll, &sll_len); -+ n = recvfrom(fd, buf, sizeof(buf), MSG_DONTWAIT, (struct sockaddr*)&sll, (socklen_t*)&sll_len); - if (n<0) { - if (errno != EINTR && errno != EAGAIN) - syslog(LOG_ERR, "recvfrom: %m"); -@@ -531,7 +531,7 @@ - /* Update our ARP cache. Probably, this guy - will not able to make ARP (if it is broken) - */ -- arp_advise(sll.sll_ifindex, rmap->lladdr, rmap->lladdr_len, rmap->ipaddr); -+ arp_advise(sll.sll_ifindex,(unsigned char *)rmap->lladdr, rmap->lladdr_len, rmap->ipaddr); - - /* Sendto is blocking, but with 5sec timeout */ - alarm(5); -@@ -673,8 +673,15 @@ - perror("rarpd: fork"); - exit(1); - } -+ int chdir_ret = chdir("/"); -+ if (chdir_ret != 0) { -+ if (errno) -+ perror("chdir"); -+ else -+ fprintf(stderr, "chdir: Uknown error\n"); -+ } - -- chdir("/"); -+ - fd = open("/dev/null", O_RDWR); - if (fd >= 0) { - dup2(fd, 0); ---- iputils/ping_common.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/ping_common.c 2006-01-25 16:21:47.000000000 +0100 -@@ -284,6 +284,7 @@ - static int oom_count; - static int tokens; - int i; -+ ssize_t wr_ret; - - /* Have we already sent enough? If we have, return an arbitrary positive value. */ - if (exiting || (npackets && ntransmitted >= npackets && !deadline)) -@@ -327,7 +328,7 @@ - * high preload or pipe size is very confusing. */ - if ((preload < screen_width && pipesize < screen_width) || - in_flight() < screen_width) -- write(STDOUT_FILENO, ".", 1); -+ wr_ret = write(STDOUT_FILENO, ".", 1); - } - return interval - tokens; - } -@@ -380,7 +381,7 @@ - - if (i == 0 && !(options & F_QUIET)) { - if (options & F_FLOOD) -- write(STDOUT_FILENO, "E", 1); -+ wr_ret = write(STDOUT_FILENO, "E", 1); - else - perror("ping: sendmsg"); - } -@@ -402,8 +403,8 @@ - rcvbuf = hold = alloc * preload; - if (hold < 65536) - hold = 65536; -- setsockopt(icmp_sock, SOL_SOCKET, SO_RCVBUF, (char *)&hold, sizeof(hold)); -- if (getsockopt(icmp_sock, SOL_SOCKET, SO_RCVBUF, (char *)&hold, &tmplen) == 0) { -+ setsockopt(icmp_sock, SOL_SOCKET, SO_RCVBUF, (char *)&hold, (socklen_t)sizeof(hold)); -+ if (getsockopt(icmp_sock, SOL_SOCKET, SO_RCVBUF, (char *)&hold, (socklen_t*)&tmplen) == 0) { - if (hold < rcvbuf) - fprintf(stderr, "WARNING: probably, rcvbuf is not enough to hold preload.\n"); - } -@@ -650,7 +651,8 @@ - { - int dupflag = 0; - long triptime = 0; -- -+ ssize_t wr_ret; -+ - ++nreceived; - if (!csfailed) - acknowledge(seq); -@@ -706,9 +708,9 @@ - - if (options & F_FLOOD) { - if (!csfailed) -- write(STDOUT_FILENO, "\b \b", 3); -+ wr_ret = write(STDOUT_FILENO, "\b \b", 3); - else -- write(STDOUT_FILENO, "\bC", 1); -+ wr_ret = write(STDOUT_FILENO, "\bC", 1); - } else { - int i; - __u8 *cp, *dp; ---- iputils/ping.c.gcc41 2006-01-25 16:21:47.000000000 +0100 -+++ iputils/ping.c 2006-01-25 16:21:47.000000000 +0100 -@@ -314,7 +314,7 @@ - } - } - alen = sizeof(source); -- if (getsockname(probe_fd, (struct sockaddr*)&source, &alen) == -1) { -+ if (getsockname(probe_fd, (struct sockaddr*)&source, (socklen_t*)&alen) == -1) { - perror("getsockname"); - exit(2); - } -@@ -517,6 +517,7 @@ - int net_errors = 0; - int local_errors = 0; - int saved_errno = errno; -+ ssize_t wr_ret; - - iov.iov_base = &icmph; - iov.iov_len = sizeof(icmph); -@@ -547,7 +548,7 @@ - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) -- write(STDOUT_FILENO, "E", 1); -+ wr_ret = write(STDOUT_FILENO, "E", 1); - else if (e->ee_errno != EMSGSIZE) - fprintf(stderr, "ping: local error: %s\n", strerror(e->ee_errno)); - else -@@ -583,7 +584,7 @@ - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) { -- write(STDOUT_FILENO, "\bE", 2); -+ wr_ret = write(STDOUT_FILENO, "\bE", 2); - } else { - printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); - pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL); -@@ -677,6 +678,7 @@ - struct iphdr *ip; - int hlen; - int csfailed; -+ ssize_t wr_ret; - - /* Check the IP header */ - ip = (struct iphdr *)buf; -@@ -748,7 +750,7 @@ - return !error_pkt; - if (options & F_FLOOD) { - if (error_pkt) -- write(STDOUT_FILENO, "\bE", 2); -+ wr_ret = write(STDOUT_FILENO, "\bE", 2); - return !error_pkt; - } - printf("From %s: icmp_seq=%u ", -@@ -765,9 +767,9 @@ - } - if ((options & F_FLOOD) && !(options & (F_VERBOSE|F_QUIET))) { - if (!csfailed) -- write(STDOUT_FILENO, "!E", 2); -+ wr_ret = write(STDOUT_FILENO, "!E", 2); - else -- write(STDOUT_FILENO, "!EC", 3); -+ wr_ret = write(STDOUT_FILENO, "!EC", 3); - return 0; - } - if (!(options & F_VERBOSE) || uid) ---- iputils/ping6.c.OLD 2006-02-06 10:34:35.000000000 +0100 -+++ iputils/ping6.c 2006-02-06 10:35:38.000000000 +0100 -@@ -353,7 +353,7 @@ - hostname = target; - - if (ipv6_addr_any(&source.sin6_addr)) { -- int alen; -+ socklen_t alen; - int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0); - - if (probe_fd < 0) { ---- iputils/ping.c.OLD 2006-02-06 10:34:35.000000000 +0100 -+++ iputils/ping.c 2006-02-06 10:34:35.000000000 +0100 -@@ -253,7 +253,7 @@ - } - - if (source.sin_addr.s_addr == 0) { -- int alen; -+ socklen_t alen; - struct sockaddr_in dst = whereto; - int probe_fd = socket(AF_INET, SOCK_DGRAM, 0); - -@@ -855,9 +855,36 @@ - case ICMP_SR_FAILED: - printf("Source Route Failed\n"); - break; -+ case ICMP_NET_UNKNOWN: -+ printf("Destination Net Unknown\n"); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf("Destination Host Unknown\n"); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf("Source Host Isolated\n"); -+ break; -+ case ICMP_NET_ANO: -+ printf("Destination Net Prohibited\n"); -+ break; -+ case ICMP_HOST_ANO: -+ printf("Destination Host Prohibited\n"); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf("Destination Net Unreachable for Type of Service\n"); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf("Destination Host Unreachable for Type of Service\n"); -+ break; - case ICMP_PKT_FILTERED: - printf("Packet filtered\n"); - break; -+ case ICMP_PREC_VIOLATION: -+ printf("Precedence Violation\n"); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf("Precedence Cutoff\n"); -+ break; - default: - printf("Dest Unreachable, Bad Code: %d\n", code); - break; ---- iputils/ping_common.c.OLD 2006-02-06 10:34:35.000000000 +0100 -+++ iputils/ping_common.c 2006-02-06 10:34:35.000000000 +0100 -@@ -67,7 +67,7 @@ - int ii, jj, kk; - int pat[16]; - char *cp; -- char *bp = outpack+8; -+ unsigned char *bp = outpack+8; - - for (cp = patp; *cp; cp++) { - if (!isxdigit(*cp)) { -@@ -393,7 +393,7 @@ - void sock_setbufs(int icmp_sock, int alloc) - { - int rcvbuf, hold; -- int tmplen = sizeof(hold); -+ socklen_t tmplen = sizeof(hold); - - if (!sndbuf) - sndbuf = alloc; -@@ -464,7 +464,7 @@ - - if (!(options & F_PINGFILLED)) { - int i; -- char *p = outpack+8; -+ unsigned char *p = outpack+8; - - /* Do not forget about case of small datalen, - * fill timestamp area too! -@@ -819,7 +819,7 @@ - } - if (pipesize > 1) - printf(", pipe %d", pipesize); -- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { -+ if (ntransmitted > 1 && nreceived && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { - int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); - printf(", ipg/ewma %d.%03d/%d.%03d ms", - ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
\ No newline at end of file diff --git a/abs/core/iputils/permission-fix.patch b/abs/core/iputils/permission-fix.patch deleted file mode 100644 index c47636f..0000000 --- a/abs/core/iputils/permission-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- traceroute-1.4a12/Makefile.in.old 2000-11-23 21:05:29.000000000 +0100 -+++ traceroute-1.4a12/Makefile.in 2008-09-27 20:04:30.000000000 +0200 -@@ -90,10 +90,10 @@ - sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@ - - install: force -- $(INSTALL) -m 4555 -o root -g bin traceroute $(DESTDIR)$(BINDEST) -+ $(INSTALL) -m 4555 -o root -g root traceroute $(DESTDIR)$(BINDEST) - - install-man: force -- $(INSTALL) -m 444 -o bin -g bin traceroute.8 $(DESTDIR)$(MANDEST)/man8 -+ $(INSTALL) -m 644 -o root -g root traceroute.8 $(DESTDIR)$(MANDEST)/man8 - - lint: $(GENSRC) force - lint -hbxn $(SRC) | \ diff --git a/abs/core/iputils/protocols b/abs/core/iputils/protocols deleted file mode 100644 index e6463f1..0000000 --- a/abs/core/iputils/protocols +++ /dev/null @@ -1,18 +0,0 @@ -# -# protocols This file describes the various protocols that are -# available from the TCP/IP subsystem. It should be -# consulted instead of using the numbers in the ARPA -# include files, or, worse, just guessing them. -# - -ip 0 IP # internet protocol, pseudo protocol number -icmp 1 ICMP # internet control message protocol -igmp 2 IGMP # internet group multicast protocol -ggp 3 GGP # gateway-gateway protocol -tcp 6 TCP # transmission control protocol -pup 12 PUP # PARC universal packet protocol -udp 17 UDP # user datagram protocol -idp 22 IDP # WhatsThis? -raw 255 RAW # RAW IP interface - -# End. diff --git a/abs/core/iputils/services b/abs/core/iputils/services deleted file mode 100644 index 9a31e69..0000000 --- a/abs/core/iputils/services +++ /dev/null @@ -1,195 +0,0 @@ -# -# Network services, Internet style -# -# Note that it is presently the policy of IANA to assign a single well-known -# port number for both TCP and UDP; hence, most entries here have two entries -# even if the protocol doesn't support UDP operations. -# Updated from RFC 1340, ``Assigned Numbers'' (July 1992). Not all ports -# are included, only the more common ones. -# -# from: @(#)services 5.8 (Berkeley) 5/9/91 -# $Id: services,v 1.8 2005/07/08 19:20:10 judd Exp $ -# -tcpmux 1/tcp # TCP port service multiplexer -echo 7/tcp -echo 7/udp -discard 9/tcp sink null -discard 9/udp sink null -systat 11/tcp users -daytime 13/tcp -daytime 13/udp -netstat 15/tcp -qotd 17/tcp quote -msp 18/tcp # message send protocol -msp 18/udp # message send protocol -chargen 19/tcp ttytst source -chargen 19/udp ttytst source -ftp-data 20/tcp -ftp 21/tcp -ssh 22/tcp -telnet 23/tcp -# 24 - private -smtp 25/tcp mail -# 26 - unassigned -time 37/tcp timserver -time 37/udp timserver -rlp 39/udp resource # resource location -nameserver 42/tcp name # IEN 116 -whois 43/tcp nicname -domain 53/tcp nameserver # name-domain server -domain 53/udp nameserver -mtp 57/tcp # deprecated -bootps 67/tcp # BOOTP server -bootps 67/udp -bootpc 68/tcp # BOOTP client -bootpc 68/udp -tftp 69/udp -gopher 70/tcp # Internet Gopher -gopher 70/udp -rje 77/tcp netrjs -finger 79/tcp -www 80/tcp http # WorldWideWeb HTTP -www 80/udp # HyperText Transfer Protocol -link 87/tcp ttylink -kerberos 88/tcp krb5 # Kerberos v5 -kerberos 88/udp -supdup 95/tcp -# 100 - reserved -hostnames 101/tcp hostname # usually from sri-nic -iso-tsap 102/tcp tsap # part of ISODE. -csnet-ns 105/tcp cso-ns # also used by CSO name server -csnet-ns 105/udp cso-ns -rtelnet 107/tcp # Remote Telnet -rtelnet 107/udp -pop2 109/tcp postoffice # POP version 2 -pop2 109/udp -pop3 110/tcp # POP version 3 -pop3 110/udp -sunrpc 111/tcp -sunrpc 111/udp -auth 113/tcp tap ident authentication -sftp 115/tcp -uucp-path 117/tcp -nntp 119/tcp readnews untp # USENET News Transfer Protocol -ntp 123/tcp -ntp 123/udp # Network Time Protocol -netbios-ns 137/tcp # NETBIOS Name Service -netbios-ns 137/udp -netbios-dgm 138/tcp # NETBIOS Datagram Service -netbios-dgm 138/udp -netbios-ssn 139/tcp # NETBIOS session service -netbios-ssn 139/udp -imap 143/tcp # An alias for imap2 -imap 143/udp -imap2 143/tcp # Interim Mail Access Proto v2 -imap2 143/udp -snmp 161/udp # Simple Net Mgmt Proto -snmp-trap 162/udp snmptrap # Traps for SNMP -cmip-man 163/tcp # ISO mgmt over IP (CMOT) -cmip-man 163/udp -cmip-agent 164/tcp -cmip-agent 164/udp -xdmcp 177/tcp # X Display Mgr. Control Proto -xdmcp 177/udp -nextstep 178/tcp NeXTStep NextStep # NeXTStep window -nextstep 178/udp NeXTStep NextStep # server -bgp 179/tcp # Border Gateway Proto. -bgp 179/udp -prospero 191/tcp # Cliff Neuman's Prospero -prospero 191/udp -irc 194/tcp # Internet Relay Chat -irc 194/udp -smux 199/tcp # SNMP Unix Multiplexer -smux 199/udp -at-rtmp 201/tcp # AppleTalk routing -at-rtmp 201/udp -at-nbp 202/tcp # AppleTalk name binding -at-nbp 202/udp -at-echo 204/tcp # AppleTalk echo -at-echo 204/udp -at-zis 206/tcp # AppleTalk zone information -at-zis 206/udp -z3950 210/tcp wais # NISO Z39.50 database -z3950 210/udp wais -ipx 213/tcp # IPX -ipx 213/udp -imap3 220/tcp # Interactive Mail Access -imap3 220/udp # Protocol v3 -ulistserv 372/tcp # UNIX Listserv -ulistserv 372/udp -https 443/tcp -# -# UNIX specific services -# -exec 512/tcp -biff 512/udp comsat -login 513/tcp -who 513/udp whod -shell 514/tcp cmd # no passwords used -syslog 514/udp -printer 515/tcp spooler # line printer spooler -talk 517/udp -ntalk 518/udp -route 520/udp router routed # RIP -timed 525/udp timeserver -tempo 526/tcp newdate -courier 530/tcp rpc -conference 531/tcp chat -netnews 532/tcp readnews -netwall 533/udp # -for emergency broadcasts -uucp 540/tcp uucpd # uucp daemon -remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem -klogin 543/tcp # Kerberized `rlogin' (v5) -kshell 544/tcp # Kerberized `rsh' (v5) -kerberos-adm 749/tcp # Kerberos `kadmin' (v5) -# -webster 765/tcp # Network dictionary -webster 765/udp -rsync 873/tcp # RSYNC Server -rsync 873/udp -swat 901/tcp # SWAT -imaps 993/tcp # SSL IMAP -imaps 993/udp -pop3s 995/tcp -pop3s 995/udp -# -# From ``Assigned Numbers'': -# -#> The Registered Ports are not controlled by the IANA and on most systems -#> can be used by ordinary user processes or programs executed by ordinary -#> users. -# -#> Ports are used in the TCP [45,106] to name the ends of logical -#> connections which carry long term conversations. For the purpose of -#> providing services to unknown callers, a service contact port is -#> defined. This list specifies the port used by the server process as its -#> contact port. While the IANA can not control uses of these ports it -#> does register or list uses of these ports as a convienence to the -#> community. -# -ingreslock 1524/tcp -ingreslock 1524/udp -prospero-np 1525/tcp # Prospero non-privileged -prospero-np 1525/udp -rfe 5002/tcp # Radio Free Ethernet -rfe 5002/udp # Actually uses UDP only -# -# -# Kerberos (Project Athena/MIT) services -# Note that these are for Kerberos v4, and are unofficial. Sites running -# v4 should uncomment these and comment out the v5 entries above. -# -#kerberos 750/udp kdc # Kerberos (server) udp -#kerberos 750/tcp kdc # Kerberos (server) tcp -krbupdate 760/tcp kreg # Kerberos registration -kpasswd 761/tcp kpwd # Kerberos "passwd" -#klogin 543/tcp # Kerberos rlogin -eklogin 2105/tcp # Kerberos encrypted rlogin -#kshell 544/tcp krcmd # Kerberos remote shell -svn 3690/tcp # Subversion Server -svn 3690/udp # Subversion Server -# -# Unofficial but necessary (for NetBSD) services -# -supfilesrv 871/tcp # SUP server -supfiledbg 1127/tcp # SUP debugging diff --git a/abs/core/iputils/tftp.xinetd b/abs/core/iputils/tftp.xinetd new file mode 100644 index 0000000..26041a3 --- /dev/null +++ b/abs/core/iputils/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + socket_type = dgram + protocol = udp + wait = yes + user = nobody + server = /usr/sbin/tftpd + server_args = /var/tftpboot + disable = yes +} diff --git a/abs/core/ipw2100-fw/PKGBUILD b/abs/core/ipw2100-fw/PKGBUILD index ccb797a..2fc4a20 100644 --- a/abs/core/ipw2100-fw/PKGBUILD +++ b/abs/core/ipw2100-fw/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 59422 2009-11-23 20:05:10Z giovanni $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 156556 2012-04-20 21:36:42Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=ipw2100-fw pkgver=1.3 -pkgrel=4 +pkgrel=7 pkgdesc="Intel Centrino Drivers firmware for IPW2100" arch=('any') url="http://ipw2100.sourceforge.net/" license=('custom') -depends=() replaces=('ipw2100') -source=(http://bughost.org/firmware/${pkgname}-${pkgver}.tgz) +source=("http://bughost.org/firmware/${pkgname}-${pkgver}.tgz") md5sums=('46aa75bcda1a00efa841f9707bbbd113') -build() { +package() { cd "${srcdir}" - + # Install firmware for i in *.fw do - install -D -m 644 $i "${pkgdir}/lib/firmware/$i" || return 1 + install -D -m 644 $i "${pkgdir}/usr/lib/firmware/$i" done # Install license - install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/ipw2100-fw/ipw2100-fw.install b/abs/core/ipw2100-fw/ipw2100-fw.install deleted file mode 100644 index 1a0ff6b..0000000 --- a/abs/core/ipw2100-fw/ipw2100-fw.install +++ /dev/null @@ -1,18 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -IMPORTANT -==> In order to use the firmware you have to agree to Intel's license located in -==> /lib/firmware/LICENSE.ipw2100-fw else please remove this package -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { -post_install $1 -} - -op=$1 -shift -$op $* diff --git a/abs/core/ipw2200-fw/PKGBUILD b/abs/core/ipw2200-fw/PKGBUILD index 8016831..86d9a35 100644 --- a/abs/core/ipw2200-fw/PKGBUILD +++ b/abs/core/ipw2200-fw/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 100060 2010-11-20 03:37:56Z pierre $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 156555 2012-04-20 21:36:41Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=ipw2200-fw pkgver=3.1 -pkgrel=3 +pkgrel=5 pkgdesc="Firmware for the Intel PRO/Wireless 2200BG" arch=('any') url='http://ipw2200.sourceforge.net/' @@ -17,9 +18,8 @@ package() { cd "${srcdir}/ipw2200-fw-${pkgver}" # Install firmware for i in ipw*.fw; do - install -D -m 644 $i "${pkgdir}/lib/firmware/$i" + install -D -m 644 $i "${pkgdir}/usr/lib/firmware/$i" done # Install license install -D -m 644 LICENSE.ipw2200-fw "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } - diff --git a/abs/core/isl/PKGBUILD b/abs/core/isl/PKGBUILD new file mode 100644 index 0000000..2aa5e21 --- /dev/null +++ b/abs/core/isl/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 162067 2012-06-19 12:27:31Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=isl +pkgver=0.10 +pkgrel=1 +pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" +arch=('i686' 'x86_64') +url="http://www.kotnet.org/~skimo/isl/" +license=('LGPL2.1') +options=('!libtool') +source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir/" install + + install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py +} diff --git a/abs/core/jack/40-hpet-permissions.rules b/abs/core/jack/40-hpet-permissions.rules new file mode 100644 index 0000000..7af3780 --- /dev/null +++ b/abs/core/jack/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/abs/core/jack/99-audio.conf b/abs/core/jack/99-audio.conf new file mode 100644 index 0000000..eb76ef9 --- /dev/null +++ b/abs/core/jack/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/abs/core/jack/PKGBUILD b/abs/core/jack/PKGBUILD index e9f7898..7515001 100644 --- a/abs/core/jack/PKGBUILD +++ b/abs/core/jack/PKGBUILD @@ -1,26 +1,32 @@ -# $Id$ +# $Id: PKGBUILD 157734 2012-04-29 05:10:29Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.121.2 -pkgrel=2 +pkgver=0.121.3 +pkgrel=6 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') depends=('libsamplerate' 'readline') -makedepends=('doxygen' 'libffado' 'celt-0.7') +makedepends=('doxygen' 'libffado' 'celt') optdepends=('libffado: FireWire support' - 'celt-0.7: NetJACK driver') + 'celt: NetJACK driver') url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) options=('!libtool') provides=("$_longname=$pkgver") +conflicts=("$_longname") replaces=("$_longname") -changelog=$pkgname.changelog -source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") -md5sums=('06c080349455afd4d217d6a8f9393e01') +install=$pkgname.install +source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz" + '99-audio.conf' + '40-hpet-permissions.rules') +md5sums=('35f470f7422c37b33eb965033f7a42e8' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef') build() { cd "$srcdir/$_longname-$pkgver" @@ -34,6 +40,19 @@ package() { cd "$srcdir/$_longname-$pkgver" make DESTDIR="$pkgdir" install + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" + + # install a missing header forgotten by upstream + # see https://bugs.archlinux.org/task/26865 + install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \ + "$pkgdir/usr/include/jack/jslist.h" } # vim:set ts=2 sw=2 et: diff --git a/abs/core/jack/jack.changelog b/abs/core/jack/jack.changelog deleted file mode 100644 index 54b9df6..0000000 --- a/abs/core/jack/jack.changelog +++ /dev/null @@ -1,21 +0,0 @@ -29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 0.121.2-2: - Added celt support with celt-0.7 from community - Will not bring celt to extra as it's very unstable - -8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 0.118.0-4 : - Built against libffado - - for FireWire support (see FS#19626) - Removed init scripts (no longer in tarball; unsupported). - - * PKGBUILD : - URL updated. - Licenses now GPL, LGPL according to 2-or-later convention - - removed custom installation (both are common) - - * jack.changelog : - Added this changelog. - Only important changes will be logged. diff --git a/abs/core/jack/jack.install b/abs/core/jack/jack.install new file mode 100644 index 0000000..8be532f --- /dev/null +++ b/abs/core/jack/jack.install @@ -0,0 +1,5 @@ +post_upgrade() { + rm -f etc/security/limits.d/99-realtime.conf +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/jade/PKGBUILD b/abs/core/jade/PKGBUILD new file mode 100644 index 0000000..1fa51e1 --- /dev/null +++ b/abs/core/jade/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 161891 2012-06-16 05:10:30Z eric $ +# Maintainer: +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=jade +pkgver=1.2.1 +pkgrel=8 +_debpatch=47.1 +pkgdesc="James Clark's DSSSL Engine" +url='http://www.jclark.com/jade/' +arch=('i686' 'x86_64') +license=('custom') +depends=('gcc-libs') +replaces=('openjade') +options=('!libtool' '!makeflags') +source=("ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz") +md5sums=('4239670ca6b578bff68b8c2e7cd1225f' + '6c9c0109e3b6d283cb7a18ec8a672575') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + export CXXFLAGS="$CXXFLAGS -fpermissive" + + patch -p1 -i "${srcdir}"/jade_${pkgver}-${_debpatch}.diff + + chmod 755 configure + ./configure --prefix=/usr --enable-default-catalog=/usr/share/sgml/catalog + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + install -d -m755 "${pkgdir}"/usr/lib + make prefix="${pkgdir}"/usr install + mv "${pkgdir}"/usr/bin/sx "${pkgdir}"/usr/bin/sgml2xml + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/core/jade/jade-1.2.1-8.src.tar.gz b/abs/core/jade/jade-1.2.1-8.src.tar.gz new file mode 120000 index 0000000..cc254e3 --- /dev/null +++ b/abs/core/jade/jade-1.2.1-8.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/src_packages/jade-1.2.1-8.src.tar.gz
\ No newline at end of file diff --git a/abs/core/jasper/PKGBUILD b/abs/core/jasper/PKGBUILD index 542f1a9..fac3b03 100644 --- a/abs/core/jasper/PKGBUILD +++ b/abs/core/jasper/PKGBUILD @@ -1,44 +1,36 @@ -# $Id: PKGBUILD 87502 2010-08-15 02:53:20Z eric $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 149364 2012-02-07 08:11:39Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=jasper pkgver=1.900.1 -pkgrel=6 +pkgrel=7 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" arch=('i686' 'x86_64') url="http://www.ece.uvic.ca/~mdadams/jasper/" license=('custom:JasPer2.0') -depends=('libjpeg' 'freeglut' 'libxi' 'libxmu' 'mesa') -makedepends=('unzip') +depends=('libjpeg' 'freeglut' 'libxmu') options=('!libtool') source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch jasper-1.900.1-CVE-2008-3522.patch) -md5sums=('a342b2b4495b3e1394e161eb5d85d754' '36de7128eea6f701c1e2e13ce5bd8d37'\ - '24785d8eb3eea19eec7e77d59f3e6a25' '911bb13529483c093d12c15eed4e9243'\ - 'ed441f30c4231f319d9ff77d86db2ef9') -sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' 'c1a0176a15210c0af14d85e55ce566921957d780'\ - 'f298566fef08c8a589d072582112cd51c72c3983' '2483dba925670bf29f531d85d73c4e5ada513b01'\ - '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') +sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' + 'c1a0176a15210c0af14d85e55ce566921957d780' + 'f298566fef08c8a589d072582112cd51c72c3983' + '2483dba925670bf29f531d85d73c4e5ada513b01' + '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 < "${srcdir}/jpc_dec.c.patch" - patch -Np1 < "${srcdir}/patch-libjasper-stepsizes-overflow.diff" - patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" - patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" - - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/jpc_dec.c.patch" + patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/java-sun/PKGBUILD b/abs/core/java-sun/PKGBUILD deleted file mode 100644 index 24f1aa1..0000000 --- a/abs/core/java-sun/PKGBUILD +++ /dev/null @@ -1,140 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Guillaume ALAUX <Guillaume at alaux dot net> - -pkgname=('jre' 'jdk') -pkgbase=java-sun -pkgver=6u23 -pkgrel=4 -pkgdesc="Sun/Oracle's implementation of tha Java 6 specification" -arch=('i686' 'x86_64') - [ "${CARCH}" = 'i686' ] && _arch=i586 - [ "${CARCH}" = 'x86_64' ] && _arch=amd64 -url='http://java.sun.com' -license=('custom') -makedepends=('java-runtime') -source=("http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin" - 'https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh' - 'jdk.profile' - 'java-control-panel.desktop' - 'java-monitoring-and-management-console.desktop' - 'java-policy-settings.desktop' - 'java-visualvm.desktop' - 'java-web-start.desktop' - 'jre.profile' - 'jre.profile.csh' - 'jdk.profile.csh' - 'derby-network-server' - 'derby-network-server.conf') - -build() { - mkdir unbundle-jdk - cd unbundle-jdk - sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license - cd .. - sh construct.sh unbundle-jdk linux-jdk linux-jre -} - -package_jre() { - pkgdesc="Sun/Oracle's Java Runtime Environment" - depends=('glibc' 'libxtst') - provides=('j2re' 'java-runtime=6') - conflicts=('j2re' 'java-runtime') - replaces=('j2re') - install='jre.install' - - # main files - mkdir -p ${pkgdir}/opt/java - cp -R linux-jdk/jre ${pkgdir}/opt/java - - # profiles - install -D ${srcdir}/jre.profile \ - ${pkgdir}/etc/profile.d/jre.sh - install -D ${srcdir}/jre.profile.csh \ - ${pkgdir}/etc/profile.d/jre.csh - - mkdir -p ${pkgdir}/usr/lib/mozilla/plugins - - if [ "$CARCH" = "i686" ]; then - ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins - else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins - fi - - # licenses - install -d ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/LICENSE \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \ - ${pkgdir}/usr/share/licenses/jre - - # Fix system prefs folder (FS#18872) - install -d ${pkgdir}/etc/.java/.systemPrefs -} - -package_jdk() { - pkgdesc="Sun/Oracle's Java Development Kit" - depends=('glibc' 'jre') - provides=('java-environment=6' 'j2sdk') - conflicts=('java-environment' 'j2sdk') - replaces=('j2sdk') - install='jdk.install' - - #copy icon - install -D -m644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ - ${pkgdir}/usr/share/pixmaps/java.png - - # main files - rm -rf linux-jdk/jre - install -d ${pkgdir}/opt - mv linux-jdk ${pkgdir}/opt/java - - # profiles - install -D ${srcdir}/jdk.profile \ - ${pkgdir}/etc/profile.d/jdk.sh - install -D ${srcdir}/jdk.profile.csh \ - ${pkgdir}/etc/profile.d/jdk.csh - - # licenses - install -d ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/LICENSE \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \ - ${pkgdir}/usr/share/licenses/jdk - - # desktop entries - install -Dm644 ${srcdir}/java-control-panel.desktop \ - ${pkgdir}/usr/share/applications/java-control-panel.desktop - install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ - ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop - install -Dm644 ${srcdir}/java-policy-settings.desktop \ - ${pkgdir}/usr/share/applications/java-policy-settings.desktop - install -Dm644 ${srcdir}/java-visualvm.desktop \ - ${pkgdir}/usr/share/applications/java-visualvm.desktop - install -Dm644 ${srcdir}/java-web-start.desktop \ - ${pkgdir}/usr/share/applications/java-web-start.desktop - - # javadb (apache derby) daemon files - install -D ${srcdir}/derby-network-server \ - ${pkgdir}/etc/rc.d/derby-network-server - install -D -m644 ${srcdir}/derby-network-server.conf \ - ${pkgdir}/etc/conf.d/derby-network-server -} -md5sums=('cd02f6e8f46fb4171811150cb820c6ed' - '94065b612df0046d9ae758943f9f6a75' - 'b83ab5742651b4234b7d2e20785c6693' - 'e4d814c0f310d77ed6990c731bccd0fb' - '4bc2b0be93f76ed07b471e3c89eb5a8a' - '8e3cec7ab641ec449cabd068be583f5c' - '9ba148ebabce8ed3351b813a9a66b6e5' - '568451cf45fc8c7adb83a222a61ca2c6' - '50b4f5ac4129097461d246645d73a622' - '3d3fe0a598a53df1d6bec6b416e3b9d0' - '6f4cbf332816d2c4e9578ecd1d0dce7f' - 'a279e195e249000646895d93e199860d' - '4bdff6982c66d24a879c424aaac3d04d') diff --git a/abs/core/java-sun/derby-network-server b/abs/core/java-sun/derby-network-server deleted file mode 100644 index f2b36ea..0000000 --- a/abs/core/java-sun/derby-network-server +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile.d/jdk.sh -. $DERBY_HOME/bin/derby_common.sh - -DAEMON_NAME="derby-network-server" -DAEMON_CONF="/etc/conf.d/$DAEMON_NAME" -DAEMON_PID="/var/run/$DAEMON_NAME.pid" - -[ -f $DAEMON_CONF ] && . $DAEMON_CONF - -DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start" -DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown" - -case "$1" in - start) - stat_busy "Starting Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - $DERBY_START_CMD > /dev/null & - - PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'` - - if [ -z "$PID" ]; then - stat_fail - else - echo $PID > $DAEMON_PID - add_daemon $DAEMON_NAME - sleep 2 - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - stat_fail - else - $DERBY_STOP_CMD > /dev/null & - - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $DAEMON_PID - rm_daemon $DAEMON_NAME - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 5 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/abs/core/java-sun/derby-network-server.conf b/abs/core/java-sun/derby-network-server.conf deleted file mode 100644 index ef74782..0000000 --- a/abs/core/java-sun/derby-network-server.conf +++ /dev/null @@ -1,2 +0,0 @@ -DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log" - diff --git a/abs/core/java-sun/java-control-panel.desktop b/abs/core/java-sun/java-control-panel.desktop deleted file mode 100644 index 476e04a..0000000 --- a/abs/core/java-sun/java-control-panel.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jcontrol -GenericName[cs]=Nastavení prostředí Java -GenericName=Java Environment Settings -Icon=java -Name[cs]=Nastavení Javy -Name=Java Control Panel -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/abs/core/java-sun/java-monitoring-and-management-console.desktop b/abs/core/java-sun/java-monitoring-and-management-console.desktop deleted file mode 100644 index c0e1e59..0000000 --- a/abs/core/java-sun/java-monitoring-and-management-console.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jconsole -Icon=java -Name[cs]=Konzole monitorování a správy prostředí Java -Name=Java Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/abs/core/java-sun/java-policy-settings.desktop b/abs/core/java-sun/java-policy-settings.desktop deleted file mode 100644 index 1009301..0000000 --- a/abs/core/java-sun/java-policy-settings.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/policytool -Icon=java -Name[cs]=Nastavení politiky Java aplikací -Name=Java Policy Settings -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/abs/core/java-sun/java-visualvm.desktop b/abs/core/java-sun/java-visualvm.desktop deleted file mode 100644 index 8aa9527..0000000 --- a/abs/core/java-sun/java-visualvm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jvisualvm -GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací -GenericName=Java Monitoring and Performance Monitoring Tool -Icon=java -Name=Java VisualVM -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/abs/core/java-sun/java-web-start.desktop b/abs/core/java-sun/java-web-start.desktop deleted file mode 100644 index 573ddc0..0000000 --- a/abs/core/java-sun/java-web-start.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/javaws -viewer -GenericName[cs]=Spravovat a spouštět aplikace Java Web Start -GenericName=Manage and run Java Web Start Applications -Icon=java -MimeType=application/x-java-jnlp-file; -Name[cs]=Java Web Start -Name=Java Web Start -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Network;Java; diff --git a/abs/core/java-sun/jdk.install b/abs/core/java-sun/jdk.install deleted file mode 100644 index 1f1e483..0000000 --- a/abs/core/java-sun/jdk.install +++ /dev/null @@ -1,12 +0,0 @@ -post_upgrade() { - post_install $1 -} - -post_install() { - echo "The jdk package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/LICENSE before using it." - - echo 'Please relogin to include jdk in your PATH' -} - diff --git a/abs/core/java-sun/jdk.profile b/abs/core/java-sun/jdk.profile deleted file mode 100644 index f9d5deb..0000000 --- a/abs/core/java-sun/jdk.profile +++ /dev/null @@ -1,4 +0,0 @@ -export J2SDKDIR=/opt/java -export PATH=$PATH:/opt/java/bin:/opt/java/db/bin -export JAVA_HOME=/opt/java -export DERBY_HOME=/opt/java/db diff --git a/abs/core/java-sun/jdk.profile.csh b/abs/core/java-sun/jdk.profile.csh deleted file mode 100644 index 3626e72..0000000 --- a/abs/core/java-sun/jdk.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv J2SDKDIR /opt/java -setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin -setenv JAVA_HOME /opt/java -setenv DERBY_HOME /opt/java/db diff --git a/abs/core/java-sun/jre.install b/abs/core/java-sun/jre.install deleted file mode 100644 index 7dfc547..0000000 --- a/abs/core/java-sun/jre.install +++ /dev/null @@ -1,24 +0,0 @@ -post_upgrade() { - post_install $1 -} - -post_install() { - echo "The jre package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/jre/LICENSE before using it." - if [ -f /etc/mailcap ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - fi - echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap - - echo 'Please relogin to include jre in your PATH.' -} - -post_remove() { - mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) - if [ "$mailcap" != "" ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - else - rm /etc/mailcap - fi -} diff --git a/abs/core/java-sun/jre.profile b/abs/core/java-sun/jre.profile deleted file mode 100644 index af3e373..0000000 --- a/abs/core/java-sun/jre.profile +++ /dev/null @@ -1,4 +0,0 @@ -export PATH=$PATH:/opt/java/jre/bin -if [ ! -f /etc/profile.d/jdk.sh ]; then - export JAVA_HOME=/opt/java/jre -fi diff --git a/abs/core/java-sun/jre.profile.csh b/abs/core/java-sun/jre.profile.csh deleted file mode 100644 index 8f58896..0000000 --- a/abs/core/java-sun/jre.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv PATH ${PATH}:/opt/java/jre/bin -if (! -e /etc/profile.d/jdk.sh ) then - setenv JAVA_HOME /opt/java/jre -endif diff --git a/abs/core/jfsutils/PKGBUILD b/abs/core/jfsutils/PKGBUILD index 2cb1052..fee4867 100644 --- a/abs/core/jfsutils/PKGBUILD +++ b/abs/core/jfsutils/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 82635 2010-06-15 04:31:03Z allan $ +# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=jfsutils -pkgver=1.1.14 -pkgrel=1 -pkgdesc="JFS filesystem utilities" -arch=(i686 x86_64) -url="http://jfs.sourceforge.net" +pkgver=1.1.15 +pkgrel=3 +pkgdesc='JFS filesystem utilities' +arch=('i686' 'x86_64') +url='http://jfs.sourceforge.net' license=('GPL') groups=('base') -depends=('e2fsprogs') -source=(http://jfs.sourceforge.net/project/pub/jfsutils-$pkgver.tar.gz) -md5sums=('05150840987176d5e8438066b80add1a') +depends=('util-linux-ng') +source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") +sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --sbindir=/sbin + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - mv $pkgdir/usr/sbin $pkgdir + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/kbd/PKGBUILD b/abs/core/kbd/PKGBUILD index 03da2dd..cfb6b3d 100644 --- a/abs/core/kbd/PKGBUILD +++ b/abs/core/kbd/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 82650 2010-06-15 05:16:19Z allan $ +# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd -pkgver=1.15.2 +pkgver=1.15.3 pkgrel=3 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" license=('GPL') depends=('glibc') -source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz) -md5sums=('77d0b51454522bc6c170bbdc6e31202a') +source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz + fix-es.po.patch) +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') build() { cd ${srcdir}/${pkgname}-${pkgver} - + patch -Np1 -i ../fix-es.po.patch # rename keymap files with the same names # this is needed because when only name of keymap is specified # loadkeys loads the first keymap it can find, which is bad (see FS#13837) @@ -24,17 +26,13 @@ build() { mv data/keymaps/i386/olpc/pt{,-olpc}.map mv data/keymaps/i386/dvorak/no{,-dvorak}.map mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map + mv data/keymaps/i386/colemak/{en-latin9,colemak}.map ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man - make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1 + make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes } + package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install - - # this is needed because initscripts call /bin/loadkeys - # remove this when next versions of kbd - # and initscripts with /usr/bin/loadkeys usage will be released - mkdir ${pkgdir}/bin - ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } diff --git a/abs/core/kbd/fix-es.po.patch b/abs/core/kbd/fix-es.po.patch new file mode 100644 index 0000000..578f0a7 --- /dev/null +++ b/abs/core/kbd/fix-es.po.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD index 2a21d9f..d0dbe7e 100644 --- a/abs/core/keylaunch/PKGBUILD +++ b/abs/core/keylaunch/PKGBUILD @@ -1,7 +1,7 @@ pkgname=keylaunch pkgver=1.3.9 pkgrel=4 -arch=('i686') +arch=('i686' 'x86_64') pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. " url="http://www.oroborus.org/" depends=(glibc) diff --git a/abs/core/keyutils/PKGBUILD b/abs/core/keyutils/PKGBUILD new file mode 100644 index 0000000..463df40 --- /dev/null +++ b/abs/core/keyutils/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 162664 2012-06-27 18:33:40Z tpowa $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=keyutils +pkgver=1.5.5 +pkgrel=3 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d759680b2f23c99af95938f5026f25fb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install + # add nfsidmap to config file #30396 + echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf + echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \ + >> $pkgdir/etc/request-key.conf +} diff --git a/abs/core/kmod/PKGBUILD b/abs/core/kmod/PKGBUILD new file mode 100644 index 0000000..18c3ee0 --- /dev/null +++ b/abs/core/kmod/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=kmod +pkgver=9 +pkgrel=2 +pkgdesc="Linux kernel module handling" +arch=('i686' 'x86_64') +url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' +license=('GPL2') +depends=('glibc' 'zlib') +options=('!libtool') +provides=('module-init-tools=3.16') +conflicts=('module-init-tools') +replaces=('module-init-tools') +install=kmod.install +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" + "depmod-search.conf") +md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' + 'dd62cbf62bd8f212f51ef8c43bec9a77') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --sysconfdir=/etc \ + --with-zlib \ + --with-rootprefix=/usr + + make +} + +check() { + # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p + make -C "$pkgname-$pkgver" check || : +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + # extra directories + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" + + # add symlinks to kmod + ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" + ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + + for tool in {ins,ls,rm}mod modinfo; do + ln -s kmod "$pkgdir/usr/bin/$tool" + done + + # install depmod.d file for search/ dir + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" +} + +# vim: ft=sh syn=sh et diff --git a/abs/core/kmod/depmod-search.conf b/abs/core/kmod/depmod-search.conf new file mode 100644 index 0000000..36f2cf7 --- /dev/null +++ b/abs/core/kmod/depmod-search.conf @@ -0,0 +1,5 @@ +# +# /usr/lib/depmod.d/search.conf +# + +search updates extramodules built-in diff --git a/abs/core/kmod/kmod.install b/abs/core/kmod/kmod.install new file mode 100644 index 0000000..0a2e88d --- /dev/null +++ b/abs/core/kmod/kmod.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then + echo "==> Kernel modules are now only read from /usr/lib/modules, all custom" + echo " built kernels and modules must be moved there before rebooting." + fi +} + diff --git a/abs/core/krb5/PKGBUILD b/abs/core/krb5/PKGBUILD new file mode 100644 index 0000000..7452e06 --- /dev/null +++ b/abs/core/krb5/PKGBUILD @@ -0,0 +1,92 @@ +# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.10.2 +pkgrel=2 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar + krb5-1.10.1-gcc47.patch + krb5-kadmind + krb5-kadmind.service + krb5-kdc + krb5-kdc.service + krb5-kpropd + krb5-kpropd.service + krb5-kpropd@.service + krb5-kpropd.socket) +sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' + '78b759d566b1fdefd9bbcd06df14f07f12effe96' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '614401dd4ac18e310153240bb26eb32ff1e8cf5b' + '023a8164f8ee7066ac814486a68bc605e79f6101' + 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized + # in this function [-Werror=maybe-uninitialized] + # As this is generated code, just ignore the complaint. + patch -Np2 -i ../../krb5-1.10.1-gcc47.patch + rm lib/krb5/krb/deltat.c + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap \ + --without-system-verto + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install + + # Fix FS#29889 + install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # systemd stuff + install -dm 755 "${pkgdir}"/usr/lib/systemd/system + install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ + "${pkgdir}"/usr/lib/systemd/system +} diff --git a/abs/core/krb5/krb5-1.10.1-gcc47.patch b/abs/core/krb5/krb5-1.10.1-gcc47.patch new file mode 100644 index 0000000..ffd01c2 --- /dev/null +++ b/abs/core/krb5/krb5-1.10.1-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y +--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 ++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 +@@ -44,6 +44,7 @@ + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wuninitialized" ++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif + + #include <ctype.h> diff --git a/abs/core/krb5/krb5-kadmind b/abs/core/krb5/krb5-kadmind new file mode 100644 index 0000000..04df0dc --- /dev/null +++ b/abs/core/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/abs/core/krb5/krb5-kadmind.service b/abs/core/krb5/krb5-kadmind.service new file mode 100644 index 0000000..f3836c8 --- /dev/null +++ b/abs/core/krb5/krb5-kadmind.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 administration server + +[Service] +ExecStart=/usr/sbin/kadmind -nofork + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/krb5/krb5-kdc b/abs/core/krb5/krb5-kdc new file mode 100644 index 0000000..05a0341 --- /dev/null +++ b/abs/core/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/abs/core/krb5/krb5-kdc.service b/abs/core/krb5/krb5-kdc.service new file mode 100644 index 0000000..6ec93bb --- /dev/null +++ b/abs/core/krb5/krb5-kdc.service @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 KDC + +[Service] +ExecStart=/usr/sbin/krb5kdc -n +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/krb5/krb5-kpropd b/abs/core/krb5/krb5-kpropd new file mode 100644 index 0000000..a0077d6 --- /dev/null +++ b/abs/core/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/abs/core/krb5/krb5-kpropd.service b/abs/core/krb5/krb5-kpropd.service new file mode 100644 index 0000000..a7c5b57 --- /dev/null +++ b/abs/core/krb5/krb5-kpropd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Service] +ExecStart=/usr/sbin/kpropd -S + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/krb5/krb5-kpropd.socket b/abs/core/krb5/krb5-kpropd.socket new file mode 100644 index 0000000..4389290 --- /dev/null +++ b/abs/core/krb5/krb5-kpropd.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Socket] +ListenStream=754 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/abs/core/krb5/krb5-kpropd@.service b/abs/core/krb5/krb5-kpropd@.service new file mode 100644 index 0000000..46f7e36 --- /dev/null +++ b/abs/core/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/abs/core/lapack/Makefile.blas b/abs/core/lapack/Makefile.blas index d4b1efb..46b3eeb 100644 --- a/abs/core/lapack/Makefile.blas +++ b/abs/core/lapack/Makefile.blas @@ -1,161 +1,148 @@ +include ../../make.inc + +####################################################################### +# This is the makefile to create a library for the BLAS. +# The files are grouped as follows: +# +# SBLAS1 -- Single precision real BLAS routines +# CBLAS1 -- Single precision complex BLAS routines +# DBLAS1 -- Double precision real BLAS routines +# ZBLAS1 -- Double precision complex BLAS routines +# +# CB1AUX -- Real BLAS routines called by complex routines +# ZB1AUX -- D.P. real BLAS routines called by d.p. complex +# routines +# +# ALLBLAS -- Auxiliary routines for Level 2 and 3 BLAS +# +# SBLAS2 -- Single precision real BLAS2 routines +# CBLAS2 -- Single precision complex BLAS2 routines +# DBLAS2 -- Double precision real BLAS2 routines +# ZBLAS2 -- Double precision complex BLAS2 routines +# +# SBLAS3 -- Single precision real BLAS3 routines +# CBLAS3 -- Single precision complex BLAS3 routines +# DBLAS3 -- Double precision real BLAS3 routines +# ZBLAS3 -- Double precision complex BLAS3 routines +# +# The library can be set up to include routines for any combination +# of the four precisions. To create or add to the library, enter make +# followed by one or more of the precisions desired. Some examples: +# make single +# make single complex +# make single double complex complex16 +# Note that these commands are not safe for parallel builds. +# +# Alternatively, the commands +# make all +# or +# make +# without any arguments creates a library of all four precisions. +# The name of the library is held in BLASLIB, which is set in the +# top-level make.inc +# +# To remove the object files after the library is created, enter +# make clean +# To force the source files to be recompiled, enter, for example, +# make single FRC=FRC +# +#--------------------------------------------------------------------- +# +# Edward Anderson, University of Tennessee +# March 26, 1990 +# Susan Ostrouchov, Last updated September 30, 1994 +# ejr, May 2006. +# +####################################################################### + +all: $(BLASLIB) + +#--------------------------------------------------------- +# Comment out the next 6 definitions if you already have +# the Level 1 BLAS. +#--------------------------------------------------------- +SBLAS1 = isamax.o sasum.o saxpy.o scopy.o sdot.o snrm2.o \ + srot.o srotg.o sscal.o sswap.o sdsdot.o srotmg.o srotm.o +$(SBLAS1): $(FRC) + +CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o ccopy.o \ + cdotc.o cdotu.o csscal.o crotg.o cscal.o cswap.o csrot.o +$(CBLAS1): $(FRC) + +DBLAS1 = idamax.o dasum.o daxpy.o dcopy.o ddot.o dnrm2.o \ + drot.o drotg.o dscal.o dsdot.o dswap.o drotmg.o drotm.o +$(DBLAS1): $(FRC) + +ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zcopy.o \ + zdotc.o zdotu.o zdscal.o zrotg.o zscal.o zswap.o zdrot.o +$(ZBLAS1): $(FRC) + +CB1AUX = isamax.o sasum.o saxpy.o scopy.o snrm2.o sscal.o +$(CB1AUX): $(FRC) + +ZB1AUX = idamax.o dasum.o daxpy.o dcopy.o dnrm2.o dscal.o +$(ZB1AUX): $(FRC) + +#--------------------------------------------------------------------- +# The following line defines auxiliary routines needed by both the +# Level 2 and Level 3 BLAS. Comment it out only if you already have +# both the Level 2 and 3 BLAS. +#--------------------------------------------------------------------- +ALLBLAS = lsame.o xerbla.o xerbla_array.o +$(ALLBLAS) : $(FRC) + +#--------------------------------------------------------- +# Comment out the next 4 definitions if you already have +# the Level 2 BLAS. +#--------------------------------------------------------- +SBLAS2 = sgemv.o sgbmv.o ssymv.o ssbmv.o sspmv.o \ + strmv.o stbmv.o stpmv.o strsv.o stbsv.o stpsv.o \ + sger.o ssyr.o sspr.o ssyr2.o sspr2.o +$(SBLAS2): $(FRC) + +CBLAS2 = cgemv.o cgbmv.o chemv.o chbmv.o chpmv.o \ + ctrmv.o ctbmv.o ctpmv.o ctrsv.o ctbsv.o ctpsv.o \ + cgerc.o cgeru.o cher.o chpr.o cher2.o chpr2.o +$(CBLAS2): $(FRC) + +DBLAS2 = dgemv.o dgbmv.o dsymv.o dsbmv.o dspmv.o \ + dtrmv.o dtbmv.o dtpmv.o dtrsv.o dtbsv.o dtpsv.o \ + dger.o dsyr.o dspr.o dsyr2.o dspr2.o +$(DBLAS2): $(FRC) + +ZBLAS2 = zgemv.o zgbmv.o zhemv.o zhbmv.o zhpmv.o \ + ztrmv.o ztbmv.o ztpmv.o ztrsv.o ztbsv.o ztpsv.o \ + zgerc.o zgeru.o zher.o zhpr.o zher2.o zhpr2.o +$(ZBLAS2): $(FRC) + +#--------------------------------------------------------- +# Comment out the next 4 definitions if you already have +# the Level 3 BLAS. +#--------------------------------------------------------- +SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o +$(SBLAS3): $(FRC) + +CBLAS3 = cgemm.o csymm.o csyrk.o csyr2k.o ctrmm.o ctrsm.o \ + chemm.o cherk.o cher2k.o +$(CBLAS3): $(FRC) + +DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o +$(DBLAS3): $(FRC) + +ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \ + zhemm.o zherk.o zher2k.o +$(ZBLAS3): $(FRC) + +ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \ + $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ + $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) + clean: rm -f *.o libblas.a libblas.so* -OBJS= caxpy.o \ -ccopy.o \ -cdotc.o \ -cdotu.o \ -cgbmv.o \ -cgemm.o \ -cgemv.o \ -cgerc.o \ -cgeru.o \ -chbmv.o \ -chemm.o \ -chemv.o \ -cher2k.o \ -cher2.o \ -cherk.o \ -cher.o \ -chpmv.o \ -chpr2.o \ -chpr.o \ -crotg.o \ -cscal.o \ -csrot.o \ -csscal.o \ -cswap.o \ -csymm.o \ -csyr2k.o \ -csyrk.o \ -ctbmv.o \ -ctbsv.o \ -ctpmv.o \ -ctpsv.o \ -ctrmm.o \ -ctrmv.o \ -ctrsm.o \ -ctrsv.o \ -dasum.o \ -daxpy.o \ -dcabs1.o \ -dcopy.o \ -ddot.o \ -dgbmv.o \ -dgemm.o \ -dgemv.o \ -dger.o \ -dnrm2.o \ -drotg.o \ -drotmg.o \ -drotm.o \ -drot.o \ -dsbmv.o \ -dscal.o \ -dsdot.o \ -dspmv.o \ -dspr2.o \ -dspr.o \ -dswap.o \ -dsymm.o \ -dsymv.o \ -dsyr2k.o \ -dsyr2.o \ -dsyrk.o \ -dsyr.o \ -dtbmv.o \ -dtbsv.o \ -dtpmv.o \ -dtpsv.o \ -dtrmm.o \ -dtrmv.o \ -dtrsm.o \ -dtrsv.o \ -dzasum.o \ -dznrm2.o \ -icamax.o \ -idamax.o \ -isamax.o \ -izamax.o \ -lsame.o \ -sasum.o \ -saxpy.o \ -scabs1.o \ -scasum.o \ -scnrm2.o \ -scopy.o \ -sdot.o \ -sdsdot.o \ -sgbmv.o \ -sgemm.o \ -sgemv.o \ -sger.o \ -snrm2.o \ -srotg.o \ -srotmg.o \ -srotm.o \ -srot.o \ -ssbmv.o \ -sscal.o \ -sspmv.o \ -sspr2.o \ -sspr.o \ -sswap.o \ -ssymm.o \ -ssymv.o \ -ssyr2k.o \ -ssyr2.o \ -ssyrk.o \ -ssyr.o \ -stbmv.o \ -stbsv.o \ -stpmv.o \ -stpsv.o \ -strmm.o \ -strmv.o \ -strsm.o \ -strsv.o \ -xerbla_array.o \ -xerbla.o \ -zaxpy.o \ -zcopy.o \ -zdotc.o \ -zdotu.o \ -zdrot.o \ -zdscal.o \ -zgbmv.o \ -zgemm.o \ -zgemv.o \ -zgerc.o \ -zgeru.o \ -zhbmv.o \ -zhemm.o \ -zhemv.o \ -zher2k.o \ -zher2.o \ -zherk.o \ -zher.o \ -zhpmv.o \ -zhpr2.o \ -zhpr.o \ -zrotg.o \ -zscal.o \ -zswap.o \ -zsymm.o \ -zsyr2k.o \ -zsyrk.o \ -ztbmv.o \ -ztbsv.o \ -ztpmv.o \ -ztpsv.o \ -ztrmm.o \ -ztrmv.o \ -ztrsm.o \ -ztrsv.o - -static: $(OBJS) - ar ruv libblas.a $(OBJS) +static: $(ALLOBJ) + ar ruv libblas.a $(ALLOBJ) ranlib libblas.a -shared: $(OBJS) - cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.2.2 $(OBJS) -lm -lgfortran -lc +shared: $(ALLOBJ) + cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.3.0 $(ALLOBJ) -lm -lgfortran -lc diff --git a/abs/core/lapack/Makefile.lapack b/abs/core/lapack/Makefile.lapack index 7011b7a..3443d70 100644 --- a/abs/core/lapack/Makefile.lapack +++ b/abs/core/lapack/Makefile.lapack @@ -1,1500 +1,387 @@ include ../make.inc -clean: - rm -f *.o liblapack* +####################################################################### +# This is the makefile to create a library for LAPACK. +# The files are organized as follows: +# ALLAUX -- Auxiliary routines called from all precisions +# +# SCLAUX -- Auxiliary routines called from both REAL and COMPLEX. +# DZLAUX -- Auxiliary routines called from both DOUBLE and COMPLEX*16. +# +# DSLASRC -- Double-single mixed precision real routines called from +# single, single-extra and double precision real LAPACK +# routines (i.e. from SLASRC, SXLASRC, DLASRC). +# ZCLASRC -- Double-single mixed precision complex routines called from +# single, single-extra and double precision complex LAPACK +# routines (i.e. from CLASRC, CXLASRC, ZLASRC). +# +# SLASRC -- Single precision real LAPACK routines +# SXLASRC -- Single precision real LAPACK routines using extra +# precision. +# CLASRC -- Single precision complex LAPACK routines +# CXLASRC -- Single precision complex LAPACK routines using extra +# precision. +# DLASRC -- Double precision real LAPACK routines +# DXLASRC -- Double precision real LAPACK routines using extra +# precision. +# ZLASRC -- Double precision complex LAPACK routines +# ZXLASRC -- Double precision complex LAPACK routines using extra +# precision. +# +# The library can be set up to include routines for any combination +# of the four precisions. To create or add to the library, enter make +# followed by one or more of the precisions desired. Some examples: +# make single +# make single complex +# make single double complex complex16 +# Alternatively, the command +# make +# without any arguments creates a library of all four precisions. +# The library is called +# lapack.a +# and is created at the next higher directory level. +# +# To remove the object files after the library is created, enter +# make clean +# On some systems, you can force the source files to be recompiled by +# entering (for example) +# make single FRC=FRC +# +# ***Note*** +# The functions lsame, second, dsecnd, slamch, and dlamch may have +# to be installed before compiling the library. Refer to the +# installation guide, LAPACK Working Note 41, for instructions. +# +####################################################################### + +ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o \ + ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \ + ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o + +SCLAUX = \ + sbdsdc.o \ + sbdsqr.o sdisna.o slabad.o slacpy.o sladiv.o slae2.o slaebz.o \ + slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o slaed5.o slaed6.o \ + slaed7.o slaed8.o slaed9.o slaeda.o slaev2.o slagtf.o \ + slagts.o slamrg.o slanst.o \ + slapy2.o slapy3.o slarnv.o \ + slarra.o slarrb.o slarrc.o slarrd.o slarre.o slarrf.o slarrj.o \ + slarrk.o slarrr.o slaneg.o \ + slartg.o slaruv.o slas2.o slascl.o \ + slasd0.o slasd1.o slasd2.o slasd3.o slasd4.o slasd5.o slasd6.o \ + slasd7.o slasd8.o slasda.o slasdq.o slasdt.o \ + slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \ + slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \ + ssteqr.o ssterf.o slaisnan.o sisnan.o \ + slartgp.o slartgs.o \ + ../INSTALL/second_$(TIMER).o + +DZLAUX = \ + dbdsdc.o \ + dbdsqr.o ddisna.o dlabad.o dlacpy.o dladiv.o dlae2.o dlaebz.o \ + dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o dlaed6.o \ + dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaev2.o dlagtf.o \ + dlagts.o dlamrg.o dlanst.o \ + dlapy2.o dlapy3.o dlarnv.o \ + dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o dlarrj.o \ + dlarrk.o dlarrr.o dlaneg.o \ + dlartg.o dlaruv.o dlas2.o dlascl.o \ + dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o dlasd6.o \ + dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \ + dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o dlasq6.o \ + dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \ + dsteqr.o dsterf.o dlaisnan.o disnan.o \ + dlartgp.o dlartgs.o \ + ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o + +SLASRC = \ + sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o \ + sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \ + sgebrd.o sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \ + sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \ + sgels.o sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \ + sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \ + sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o sgesvd.o sgesvx.o \ + sgetc2.o sgetf2.o sgetri.o \ + sggbak.o sggbal.o sgges.o sggesx.o sggev.o sggevx.o \ + sggglm.o sgghrd.o sgglse.o sggqrf.o \ + sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o \ + sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o \ + shsein.o shseqr.o slabrd.o slacon.o slacn2.o \ + slaein.o slaexc.o slag2.o slags2.o slagtm.o slagv2.o slahqr.o \ + slahrd.o slahr2.o slaic1.o slaln2.o slals0.o slalsa.o slalsd.o \ + slangb.o slange.o slangt.o slanhs.o slansb.o slansp.o \ + slansy.o slantb.o slantp.o slantr.o slanv2.o \ + slapll.o slapmt.o \ + slaqgb.o slaqge.o slaqp2.o slaqps.o slaqsb.o slaqsp.o slaqsy.o \ + slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \ + slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \ + slarf.o slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slargv.o \ + slarrv.o slartv.o \ + slarz.o slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o \ + slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o slatzm.o \ + slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \ + sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \ + sorgrq.o sorgtr.o sorm2l.o sorm2r.o \ + sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \ + sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \ + spbstf.o spbsv.o spbsvx.o \ + spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \ + sposvx.o spotf2.o spotri.o spstrf.o spstf2.o \ + sppcon.o sppequ.o \ + spprfs.o sppsv.o sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \ + spteqr.o sptrfs.o sptsv.o sptsvx.o spttrs.o sptts2.o srscl.o \ + ssbev.o ssbevd.o ssbevx.o ssbgst.o ssbgv.o ssbgvd.o ssbgvx.o \ + ssbtrd.o sspcon.o sspev.o sspevd.o sspevx.o sspgst.o \ + sspgv.o sspgvd.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \ + ssptrf.o ssptri.o ssptrs.o sstegr.o sstein.o sstev.o sstevd.o sstevr.o \ + sstevx.o ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \ + ssygst.o ssygv.o ssygvd.o ssygvx.o ssyrfs.o ssysv.o ssysvx.o \ + ssytd2.o ssytf2.o ssytrd.o ssytrf.o ssytri.o ssytri2.o ssytri2x.o \ + ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o stbcon.o \ + stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o \ + stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \ + stptrs.o \ + strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o strsyl.o \ + strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o sstemr.o \ + slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \ + stfttr.o stpttf.o stpttr.o strttf.o strttp.o \ + sgejsv.o sgesvj.o sgsvj0.o sgsvj1.o \ + sgeequb.o ssyequb.o spoequb.o sgbequb.o \ + sbbcsd.o slapmr.o sorbdb.o sorcsd.o \ + sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \ + stpqrt.o stpqrt2.o stpmqrt.o stprfb.o -OBJS= cbdsqr.o \ -cgbbrd.o \ -cgbcon.o \ -cgbequb.o \ -cgbequ.o \ -cgbrfs.o \ -cgbsv.o \ -cgbsvx.o \ -cgbtf2.o \ -cgbtrf.o \ -cgbtrs.o \ -cgebak.o \ -cgebal.o \ -cgebd2.o \ -cgebrd.o \ -cgecon.o \ -cgeequb.o \ -cgeequ.o \ -cgees.o \ -cgeesx.o \ -cgeev.o \ -cgeevx.o \ -cgegs.o \ -cgegv.o \ -cgehd2.o \ -cgehrd.o \ -cgelq2.o \ -cgelqf.o \ -cgelsd.o \ -cgels.o \ -cgelss.o \ -cgelsx.o \ -cgelsy.o \ -cgeql2.o \ -cgeqlf.o \ -cgeqp3.o \ -cgeqpf.o \ -cgeqr2.o \ -cgeqr2p.o \ -cgeqrf.o \ -cgeqrfp.o \ -cgerfs.o \ -cgerq2.o \ -cgerqf.o \ -cgesc2.o \ -cgesdd.o \ -cgesvd.o \ -cgesv.o \ -cgesvx.o \ -cgetc2.o \ -cgetf2.o \ -cgetrf.o \ -cgetri.o \ -cgetrs.o \ -cggbak.o \ -cggbal.o \ -cgges.o \ -cggesx.o \ -cggev.o \ -cggevx.o \ -cggglm.o \ -cgghrd.o \ -cgglse.o \ -cggqrf.o \ -cggrqf.o \ -cggsvd.o \ -cggsvp.o \ -cgtcon.o \ -cgtrfs.o \ -cgtsv.o \ -cgtsvx.o \ -cgttrf.o \ -cgttrs.o \ -cgtts2.o \ -chbevd.o \ -chbev.o \ -chbevx.o \ -chbgst.o \ -chbgvd.o \ -chbgv.o \ -chbgvx.o \ -chbtrd.o \ -checon.o \ -cheequb.o \ -cheevd.o \ -cheev.o \ -cheevr.o \ -cheevx.o \ -chegs2.o \ -chegst.o \ -chegvd.o \ -chegv.o \ -chegvx.o \ -cherfs.o \ -chesv.o \ -chesvx.o \ -chetd2.o \ -chetf2.o \ -chetrd.o \ -chetrf.o \ -chetri.o \ -chetrs.o \ -chfrk.o \ -chgeqz.o \ -chpcon.o \ -chpevd.o \ -chpev.o \ -chpevx.o \ -chpgst.o \ -chpgvd.o \ -chpgv.o \ -chpgvx.o \ -chprfs.o \ -chpsv.o \ -chpsvx.o \ -chptrd.o \ -chptrf.o \ -chptri.o \ -chptrs.o \ -chsein.o \ -chseqr.o \ -clabrd.o \ -clacgv.o \ -clacn2.o \ -clacon.o \ -clacp2.o \ -clacpy.o \ -clacrm.o \ -clacrt.o \ -cladiv.o \ -claed0.o \ -claed7.o \ -claed8.o \ -claein.o \ -claesy.o \ -claev2.o \ -clag2z.o \ -clags2.o \ -clagtm.o \ -clahef.o \ -clahqr.o \ -clahr2.o \ -clahrd.o \ -claic1.o \ -clals0.o \ -clalsa.o \ -clalsd.o \ -clangb.o \ -clange.o \ -clangt.o \ -clanhb.o \ -clanhe.o \ -clanhf.o \ -clanhp.o \ -clanhs.o \ -clanht.o \ -clansb.o \ -clansp.o \ -clansy.o \ -clantb.o \ -clantp.o \ -clantr.o \ -clapll.o \ -clapmt.o \ -claqgb.o \ -claqge.o \ -claqhb.o \ -claqhe.o \ -claqhp.o \ -claqp2.o \ -claqps.o \ -claqr0.o \ -claqr1.o \ -claqr2.o \ -claqr3.o \ -claqr4.o \ -claqr5.o \ -claqsb.o \ -claqsp.o \ -claqsy.o \ -clar1v.o \ -clar2v.o \ -clarcm.o \ -clarfb.o \ -clarf.o \ -clarfg.o \ -clarfgp.o \ -clarft.o \ -clarfx.o \ -clargv.o \ -clarnv.o \ -clarrv.o \ -clartg.o \ -clartv.o \ -clarzb.o \ -clarz.o \ -clarzt.o \ -clascl.o \ -claset.o \ -clasr.o \ -classq.o \ -claswp.o \ -clasyf.o \ -clatbs.o \ -clatdf.o \ -clatps.o \ -clatrd.o \ -clatrs.o \ -clatrz.o \ -clatzm.o \ -clauu2.o \ -clauum.o \ -cpbcon.o \ -cpbequ.o \ -cpbrfs.o \ -cpbstf.o \ -cpbsv.o \ -cpbsvx.o \ -cpbtf2.o \ -cpbtrf.o \ -cpbtrs.o \ -cpftrf.o \ -cpftri.o \ -cpftrs.o \ -cpocon.o \ -cpoequb.o \ -cpoequ.o \ -cporfs.o \ -cposv.o \ -cposvx.o \ -cpotf2.o \ -cpotrf.o \ -cpotri.o \ -cpotrs.o \ -cppcon.o \ -cppequ.o \ -cpprfs.o \ -cppsv.o \ -cppsvx.o \ -cpptrf.o \ -cpptri.o \ -cpptrs.o \ -cpstf2.o \ -cpstrf.o \ -cptcon.o \ -cpteqr.o \ -cptrfs.o \ -cptsv.o \ -cptsvx.o \ -cpttrf.o \ -cpttrs.o \ -cptts2.o \ -crot.o \ -cspcon.o \ -cspmv.o \ -cspr.o \ -csprfs.o \ -cspsv.o \ -cspsvx.o \ -csptrf.o \ -csptri.o \ -csptrs.o \ -csrscl.o \ -cstedc.o \ -cstegr.o \ -cstein.o \ -cstemr.o \ -csteqr.o \ -csycon.o \ -csyequb.o \ -csymv.o \ -csyr.o \ -csyrfs.o \ -csysv.o \ -csysvx.o \ -csytf2.o \ -csytrf.o \ -csytri.o \ -csytrs.o \ -ctbcon.o \ -ctbrfs.o \ -ctbtrs.o \ -ctfsm.o \ -ctftri.o \ -ctfttp.o \ -ctfttr.o \ -ctgevc.o \ -ctgex2.o \ -ctgexc.o \ -ctgsen.o \ -ctgsja.o \ -ctgsna.o \ -ctgsy2.o \ -ctgsyl.o \ -ctpcon.o \ -ctprfs.o \ -ctptri.o \ -ctptrs.o \ -ctpttf.o \ -ctpttr.o \ -ctrcon.o \ -ctrevc.o \ -ctrexc.o \ -ctrrfs.o \ -ctrsen.o \ -ctrsna.o \ -ctrsyl.o \ -ctrti2.o \ -ctrtri.o \ -ctrtrs.o \ -ctrttf.o \ -ctrttp.o \ -ctzrqf.o \ -ctzrzf.o \ -cung2l.o \ -cung2r.o \ -cungbr.o \ -cunghr.o \ -cungl2.o \ -cunglq.o \ -cungql.o \ -cungqr.o \ -cungr2.o \ -cungrq.o \ -cungtr.o \ -cunm2l.o \ -cunm2r.o \ -cunmbr.o \ -cunmhr.o \ -cunml2.o \ -cunmlq.o \ -cunmql.o \ -cunmqr.o \ -cunmr2.o \ -cunmr3.o \ -cunmrq.o \ -cunmrz.o \ -cunmtr.o \ -cupgtr.o \ -cupmtr.o \ -dbdsdc.o \ -dbdsqr.o \ -ddisna.o \ -dgbbrd.o \ -dgbcon.o \ -dgbequb.o \ -dgbequ.o \ -dgbrfs.o \ -dgbsv.o \ -dgbsvx.o \ -dgbtf2.o \ -dgbtrf.o \ -dgbtrs.o \ -dgebak.o \ -dgebal.o \ -dgebd2.o \ -dgebrd.o \ -dgecon.o \ -dgeequb.o \ -dgeequ.o \ -dgees.o \ -dgeesx.o \ -dgeev.o \ -dgeevx.o \ -dgegs.o \ -dgegv.o \ -dgehd2.o \ -dgehrd.o \ -dgejsv.o \ -dgelq2.o \ -dgelqf.o \ -dgelsd.o \ -dgels.o \ -dgelss.o \ -dgelsx.o \ -dgelsy.o \ -dgeql2.o \ -dgeqlf.o \ -dgeqp3.o \ -dgeqpf.o \ -dgeqr2.o \ -dgeqr2p.o \ -dgeqrf.o \ -dgeqrfp.o \ -dgerfs.o \ -dgerq2.o \ -dgerqf.o \ -dgesc2.o \ -dgesdd.o \ -dgesvd.o \ -dgesv.o \ -dgesvj.o \ -dgesvx.o \ -dgetc2.o \ -dgetf2.o \ -dgetrf.o \ -dgetri.o \ -dgetrs.o \ -dggbak.o \ -dggbal.o \ -dgges.o \ -dggesx.o \ -dggev.o \ -dggevx.o \ -dggglm.o \ -dgghrd.o \ -dgglse.o \ -dggqrf.o \ -dggrqf.o \ -dggsvd.o \ -dggsvp.o \ -dgsvj0.o \ -dgsvj1.o \ -dgtcon.o \ -dgtrfs.o \ -dgtsv.o \ -dgtsvx.o \ -dgttrf.o \ -dgttrs.o \ -dgtts2.o \ -dhgeqz.o \ -dhsein.o \ -dhseqr.o \ -disnan.o \ -dlabad.o \ -dlabrd.o \ -dlacn2.o \ -dlacon.o \ -dlacpy.o \ -dladiv.o \ -dlae2.o \ -dlaebz.o \ -dlaed0.o \ -dlaed1.o \ -dlaed2.o \ -dlaed3.o \ -dlaed4.o \ -dlaed5.o \ -dlaed6.o \ -dlaed7.o \ -dlaed8.o \ -dlaed9.o \ -dlaeda.o \ -dlaein.o \ -dlaev2.o \ -dlaexc.o \ -dlag2.o \ -dlag2s.o \ -dlags2.o \ -dlagtf.o \ -dlagtm.o \ -dlagts.o \ -dlagv2.o \ -dlahqr.o \ -dlahr2.o \ -dlahrd.o \ -dlaic1.o \ -dlaisnan.o \ -dlaln2.o \ -dlals0.o \ -dlalsa.o \ -dlalsd.o \ -dlamrg.o \ -dlaneg.o \ -dlangb.o \ -dlange.o \ -dlangt.o \ -dlanhs.o \ -dlansb.o \ -dlansf.o \ -dlansp.o \ -dlanst.o \ -dlansy.o \ -dlantb.o \ -dlantp.o \ -dlantr.o \ -dlanv2.o \ -dlapll.o \ -dlapmt.o \ -dlapy2.o \ -dlapy3.o \ -dlaqgb.o \ -dlaqge.o \ -dlaqp2.o \ -dlaqps.o \ -dlaqr0.o \ -dlaqr1.o \ -dlaqr2.o \ -dlaqr3.o \ -dlaqr4.o \ -dlaqr5.o \ -dlaqsb.o \ -dlaqsp.o \ -dlaqsy.o \ -dlaqtr.o \ -dlar1v.o \ -dlar2v.o \ -dlarfb.o \ -dlarf.o \ -dlarfg.o \ -dlarfgp.o \ -dlarft.o \ -dlarfx.o \ -dlargv.o \ -dlarnv.o \ -dlarra.o \ -dlarrb.o \ -dlarrc.o \ -dlarrd.o \ -dlarre.o \ -dlarrf.o \ -dlarrj.o \ -dlarrk.o \ -dlarrr.o \ -dlarrv.o \ -dlartg.o \ -dlartv.o \ -dlaruv.o \ -dlarzb.o \ -dlarz.o \ -dlarzt.o \ -dlas2.o \ -dlascl.o \ -dlasd0.o \ -dlasd1.o \ -dlasd2.o \ -dlasd3.o \ -dlasd4.o \ -dlasd5.o \ -dlasd6.o \ -dlasd7.o \ -dlasd8.o \ -dlasda.o \ -dlasdq.o \ -dlasdt.o \ -dlaset.o \ -dlasq1.o \ -dlasq2.o \ -dlasq3.o \ -dlasq4.o \ -dlasq5.o \ -dlasq6.o \ -dlasr.o \ -dlasrt.o \ -dlassq.o \ -dlasv2.o \ -dlaswp.o \ -dlasy2.o \ -dlasyf.o \ -dlat2s.o \ -dlatbs.o \ -dlatdf.o \ -dlatps.o \ -dlatrd.o \ -dlatrs.o \ -dlatrz.o \ -dlatzm.o \ -dlauu2.o \ -dlauum.o \ -dopgtr.o \ -dopmtr.o \ -dorg2l.o \ -dorg2r.o \ -dorgbr.o \ -dorghr.o \ -dorgl2.o \ -dorglq.o \ -dorgql.o \ -dorgqr.o \ -dorgr2.o \ -dorgrq.o \ -dorgtr.o \ -dorm2l.o \ -dorm2r.o \ -dormbr.o \ -dormhr.o \ -dorml2.o \ -dormlq.o \ -dormql.o \ -dormqr.o \ -dormr2.o \ -dormr3.o \ -dormrq.o \ -dormrz.o \ -dormtr.o \ -dpbcon.o \ -dpbequ.o \ -dpbrfs.o \ -dpbstf.o \ -dpbsv.o \ -dpbsvx.o \ -dpbtf2.o \ -dpbtrf.o \ -dpbtrs.o \ -dpftrf.o \ -dpftri.o \ -dpftrs.o \ -dpocon.o \ -dpoequb.o \ -dpoequ.o \ -dporfs.o \ -dposv.o \ -dposvx.o \ -dpotf2.o \ -dpotrf.o \ -dpotri.o \ -dpotrs.o \ -dppcon.o \ -dppequ.o \ -dpprfs.o \ -dppsv.o \ -dppsvx.o \ -dpptrf.o \ -dpptri.o \ -dpptrs.o \ -dpstf2.o \ -dpstrf.o \ -dptcon.o \ -dpteqr.o \ -dptrfs.o \ -dptsv.o \ -dptsvx.o \ -dpttrf.o \ -dpttrs.o \ -dptts2.o \ -drscl.o \ -dsbevd.o \ -dsbev.o \ -dsbevx.o \ -dsbgst.o \ -dsbgvd.o \ -dsbgv.o \ -dsbgvx.o \ -dsbtrd.o \ -dsfrk.o \ -dsgesv.o \ -dspcon.o \ -dspevd.o \ -dspev.o \ -dspevx.o \ -dspgst.o \ -dspgvd.o \ -dspgv.o \ -dspgvx.o \ -dsposv.o \ -dsprfs.o \ -dspsv.o \ -dspsvx.o \ -dsptrd.o \ -dsptrf.o \ -dsptri.o \ -dsptrs.o \ -dstebz.o \ -dstedc.o \ -dstegr.o \ -dstein.o \ -dstemr.o \ -dsteqr.o \ -dsterf.o \ -dstevd.o \ -dstev.o \ -dstevr.o \ -dstevx.o \ -dsycon.o \ -dsyequb.o \ -dsyevd.o \ -dsyev.o \ -dsyevr.o \ -dsyevx.o \ -dsygs2.o \ -dsygst.o \ -dsygvd.o \ -dsygv.o \ -dsygvx.o \ -dsyrfs.o \ -dsysv.o \ -dsysvx.o \ -dsytd2.o \ -dsytf2.o \ -dsytrd.o \ -dsytrf.o \ -dsytri.o \ -dsytrs.o \ -dtbcon.o \ -dtbrfs.o \ -dtbtrs.o \ -dtfsm.o \ -dtftri.o \ -dtfttp.o \ -dtfttr.o \ -dtgevc.o \ -dtgex2.o \ -dtgexc.o \ -dtgsen.o \ -dtgsja.o \ -dtgsna.o \ -dtgsy2.o \ -dtgsyl.o \ -dtpcon.o \ -dtprfs.o \ -dtptri.o \ -dtptrs.o \ -dtpttf.o \ -dtpttr.o \ -dtrcon.o \ -dtrevc.o \ -dtrexc.o \ -dtrrfs.o \ -dtrsen.o \ -dtrsna.o \ -dtrsyl.o \ -dtrti2.o \ -dtrtri.o \ -dtrtrs.o \ -dtrttf.o \ -dtrttp.o \ -dtzrqf.o \ -dtzrzf.o \ -dzsum1.o \ -icmax1.o \ -ieeeck.o \ -ilaclc.o \ -ilaclr.o \ -iladiag.o \ -iladlc.o \ -iladlr.o \ -ilaenv.o \ -ilaprec.o \ -ilaslc.o \ -ilaslr.o \ -ilatrans.o \ -ilauplo.o \ -ilaver.o \ -ilazlc.o \ -ilazlr.o \ -iparmq.o \ -izmax1.o \ -lsamen.o \ -sbdsdc.o \ -sbdsqr.o \ -scsum1.o \ -sdisna.o \ -sgbbrd.o \ -sgbcon.o \ -sgbequb.o \ -sgbequ.o \ -sgbrfs.o \ -sgbsv.o \ -sgbsvx.o \ -sgbtf2.o \ -sgbtrf.o \ -sgbtrs.o \ -sgebak.o \ -sgebal.o \ -sgebd2.o \ -sgebrd.o \ -sgecon.o \ -sgeequb.o \ -sgeequ.o \ -sgees.o \ -sgeesx.o \ -sgeev.o \ -sgeevx.o \ -sgegs.o \ -sgegv.o \ -sgehd2.o \ -sgehrd.o \ -sgejsv.o \ -sgelq2.o \ -sgelqf.o \ -sgelsd.o \ -sgels.o \ -sgelss.o \ -sgelsx.o \ -sgelsy.o \ -sgeql2.o \ -sgeqlf.o \ -sgeqp3.o \ -sgeqpf.o \ -sgeqr2.o \ -sgeqr2p.o \ -sgeqrf.o \ -sgeqrfp.o \ -sgerfs.o \ -sgerq2.o \ -sgerqf.o \ -sgesc2.o \ -sgesdd.o \ -sgesvd.o \ -sgesv.o \ -sgesvj.o \ -sgesvx.o \ -sgetc2.o \ -sgetf2.o \ -sgetrf.o \ -sgetri.o \ -sgetrs.o \ -sggbak.o \ -sggbal.o \ -sgges.o \ -sggesx.o \ -sggev.o \ -sggevx.o \ -sggglm.o \ -sgghrd.o \ -sgglse.o \ -sggqrf.o \ -sggrqf.o \ -sggsvd.o \ -sggsvp.o \ -sgsvj0.o \ -sgsvj1.o \ -sgtcon.o \ -sgtrfs.o \ -sgtsv.o \ -sgtsvx.o \ -sgttrf.o \ -sgttrs.o \ -sgtts2.o \ -shgeqz.o \ -shsein.o \ -shseqr.o \ -sisnan.o \ -slabad.o \ -slabrd.o \ -slacn2.o \ -slacon.o \ -slacpy.o \ -sladiv.o \ -slae2.o \ -slaebz.o \ -slaed0.o \ -slaed1.o \ -slaed2.o \ -slaed3.o \ -slaed4.o \ -slaed5.o \ -slaed6.o \ -slaed7.o \ -slaed8.o \ -slaed9.o \ -slaeda.o \ -slaein.o \ -slaev2.o \ -slaexc.o \ -slag2d.o \ -slag2.o \ -slags2.o \ -slagtf.o \ -slagtm.o \ -slagts.o \ -slagv2.o \ -slahqr.o \ -slahr2.o \ -slahrd.o \ -slaic1.o \ -slaisnan.o \ -slaln2.o \ -slals0.o \ -slalsa.o \ -slalsd.o \ -slamrg.o \ -slaneg.o \ -slangb.o \ -slange.o \ -slangt.o \ -slanhs.o \ -slansb.o \ -slansf.o \ -slansp.o \ -slanst.o \ -slansy.o \ -slantb.o \ -slantp.o \ -slantr.o \ -slanv2.o \ -slapll.o \ -slapmt.o \ -slapy2.o \ -slapy3.o \ -slaqgb.o \ -slaqge.o \ -slaqp2.o \ -slaqps.o \ -slaqr0.o \ -slaqr1.o \ -slaqr2.o \ -slaqr3.o \ -slaqr4.o \ -slaqr5.o \ -slaqsb.o \ -slaqsp.o \ -slaqsy.o \ -slaqtr.o \ -slar1v.o \ -slar2v.o \ -slarfb.o \ -slarf.o \ -slarfg.o \ -slarfgp.o \ -slarft.o \ -slarfx.o \ -slargv.o \ -slarnv.o \ -slarra.o \ -slarrb.o \ -slarrc.o \ -slarrd.o \ -slarre.o \ -slarrf.o \ -slarrj.o \ -slarrk.o \ -slarrr.o \ -slarrv.o \ -slartg.o \ -slartv.o \ -slaruv.o \ -slarzb.o \ -slarz.o \ -slarzt.o \ -slas2.o \ -slascl.o \ -slasd0.o \ -slasd1.o \ -slasd2.o \ -slasd3.o \ -slasd4.o \ -slasd5.o \ -slasd6.o \ -slasd7.o \ -slasd8.o \ -slasda.o \ -slasdq.o \ -slasdt.o \ -slaset.o \ -slasq1.o \ -slasq2.o \ -slasq3.o \ -slasq4.o \ -slasq5.o \ -slasq6.o \ -slasr.o \ -slasrt.o \ -slassq.o \ -slasv2.o \ -slaswp.o \ -slasy2.o \ -slasyf.o \ -slatbs.o \ -slatdf.o \ -slatps.o \ -slatrd.o \ -slatrs.o \ -slatrz.o \ -slatzm.o \ -slauu2.o \ -slauum.o \ -sopgtr.o \ -sopmtr.o \ -sorg2l.o \ -sorg2r.o \ -sorgbr.o \ -sorghr.o \ -sorgl2.o \ -sorglq.o \ -sorgql.o \ -sorgqr.o \ -sorgr2.o \ -sorgrq.o \ -sorgtr.o \ -sorm2l.o \ -sorm2r.o \ -sormbr.o \ -sormhr.o \ -sorml2.o \ -sormlq.o \ -sormql.o \ -sormqr.o \ -sormr2.o \ -sormr3.o \ -sormrq.o \ -sormrz.o \ -sormtr.o \ -spbcon.o \ -spbequ.o \ -spbrfs.o \ -spbstf.o \ -spbsv.o \ -spbsvx.o \ -spbtf2.o \ -spbtrf.o \ -spbtrs.o \ -spftrf.o \ -spftri.o \ -spftrs.o \ -spocon.o \ -spoequb.o \ -spoequ.o \ -sporfs.o \ -sposv.o \ -sposvx.o \ -spotf2.o \ -spotrf.o \ -spotri.o \ -spotrs.o \ -sppcon.o \ -sppequ.o \ -spprfs.o \ -sppsv.o \ -sppsvx.o \ -spptrf.o \ -spptri.o \ -spptrs.o \ -spstf2.o \ -spstrf.o \ -sptcon.o \ -spteqr.o \ -sptrfs.o \ -sptsv.o \ -sptsvx.o \ -spttrf.o \ -spttrs.o \ -sptts2.o \ -srscl.o \ -ssbevd.o \ -ssbev.o \ -ssbevx.o \ -ssbgst.o \ -ssbgvd.o \ -ssbgv.o \ -ssbgvx.o \ -ssbtrd.o \ -ssfrk.o \ -sspcon.o \ -sspevd.o \ -sspev.o \ -sspevx.o \ -sspgst.o \ -sspgvd.o \ -sspgv.o \ -sspgvx.o \ -ssprfs.o \ -sspsv.o \ -sspsvx.o \ -ssptrd.o \ -ssptrf.o \ -ssptri.o \ -ssptrs.o \ -sstebz.o \ -sstedc.o \ -sstegr.o \ -sstein.o \ -sstemr.o \ -ssteqr.o \ -ssterf.o \ -sstevd.o \ -sstev.o \ -sstevr.o \ -sstevx.o \ -ssycon.o \ -ssyequb.o \ -ssyevd.o \ -ssyev.o \ -ssyevr.o \ -ssyevx.o \ -ssygs2.o \ -ssygst.o \ -ssygvd.o \ -ssygv.o \ -ssygvx.o \ -ssyrfs.o \ -ssysv.o \ -ssysvx.o \ -ssytd2.o \ -ssytf2.o \ -ssytrd.o \ -ssytrf.o \ -ssytri.o \ -ssytrs.o \ -stbcon.o \ -stbrfs.o \ -stbtrs.o \ -stfsm.o \ -stftri.o \ -stfttp.o \ -stfttr.o \ -stgevc.o \ -stgex2.o \ -stgexc.o \ -stgsen.o \ -stgsja.o \ -stgsna.o \ -stgsy2.o \ -stgsyl.o \ -stpcon.o \ -stprfs.o \ -stptri.o \ -stptrs.o \ -stpttf.o \ -stpttr.o \ -strcon.o \ -strevc.o \ -strexc.o \ -strrfs.o \ -strsen.o \ -strsna.o \ -strsyl.o \ -strti2.o \ -strtri.o \ -strtrs.o \ -strttf.o \ -strttp.o \ -stzrqf.o \ -stzrzf.o \ -xerbla.o \ -zbdsqr.o \ -zcgesv.o \ -zcposv.o \ -zdrscl.o \ -zgbbrd.o \ -zgbcon.o \ -zgbequb.o \ -zgbequ.o \ -zgbrfs.o \ -zgbsv.o \ -zgbsvx.o \ -zgbtf2.o \ -zgbtrf.o \ -zgbtrs.o \ -zgebak.o \ -zgebal.o \ -zgebd2.o \ -zgebrd.o \ -zgecon.o \ -zgeequb.o \ -zgeequ.o \ -zgees.o \ -zgeesx.o \ -zgeev.o \ -zgeevx.o \ -zgegs.o \ -zgegv.o \ -zgehd2.o \ -zgehrd.o \ -zgelq2.o \ -zgelqf.o \ -zgelsd.o \ -zgels.o \ -zgelss.o \ -zgelsx.o \ -zgelsy.o \ -zgeql2.o \ -zgeqlf.o \ -zgeqp3.o \ -zgeqpf.o \ -zgeqr2.o \ -zgeqr2p.o \ -zgeqrf.o \ -zgeqrfp.o \ -zgerfs.o \ -zgerq2.o \ -zgerqf.o \ -zgesc2.o \ -zgesdd.o \ -zgesvd.o \ -zgesv.o \ -zgesvx.o \ -zgetc2.o \ -zgetf2.o \ -zgetrf.o \ -zgetri.o \ -zgetrs.o \ -zggbak.o \ -zggbal.o \ -zgges.o \ -zggesx.o \ -zggev.o \ -zggevx.o \ -zggglm.o \ -zgghrd.o \ -zgglse.o \ -zggqrf.o \ -zggrqf.o \ -zggsvd.o \ -zggsvp.o \ -zgtcon.o \ -zgtrfs.o \ -zgtsv.o \ -zgtsvx.o \ -zgttrf.o \ -zgttrs.o \ -zgtts2.o \ -zhbevd.o \ -zhbev.o \ -zhbevx.o \ -zhbgst.o \ -zhbgvd.o \ -zhbgv.o \ -zhbgvx.o \ -zhbtrd.o \ -zhecon.o \ -zheequb.o \ -zheevd.o \ -zheev.o \ -zheevr.o \ -zheevx.o \ -zhegs2.o \ -zhegst.o \ -zhegvd.o \ -zhegv.o \ -zhegvx.o \ -zherfs.o \ -zhesv.o \ -zhesvx.o \ -zhetd2.o \ -zhetf2.o \ -zhetrd.o \ -zhetrf.o \ -zhetri.o \ -zhetrs.o \ -zhfrk.o \ -zhgeqz.o \ -zhpcon.o \ -zhpevd.o \ -zhpev.o \ -zhpevx.o \ -zhpgst.o \ -zhpgvd.o \ -zhpgv.o \ -zhpgvx.o \ -zhprfs.o \ -zhpsv.o \ -zhpsvx.o \ -zhptrd.o \ -zhptrf.o \ -zhptri.o \ -zhptrs.o \ -zhsein.o \ -zhseqr.o \ -zlabrd.o \ -zlacgv.o \ -zlacn2.o \ -zlacon.o \ -zlacp2.o \ -zlacpy.o \ -zlacrm.o \ -zlacrt.o \ -zladiv.o \ -zlaed0.o \ -zlaed7.o \ -zlaed8.o \ -zlaein.o \ -zlaesy.o \ -zlaev2.o \ -zlag2c.o \ -zlags2.o \ -zlagtm.o \ -zlahef.o \ -zlahqr.o \ -zlahr2.o \ -zlahrd.o \ -zlaic1.o \ -zlals0.o \ -zlalsa.o \ -zlalsd.o \ -zlangb.o \ -zlange.o \ -zlangt.o \ -zlanhb.o \ -zlanhe.o \ -zlanhf.o \ -zlanhp.o \ -zlanhs.o \ -zlanht.o \ -zlansb.o \ -zlansp.o \ -zlansy.o \ -zlantb.o \ -zlantp.o \ -zlantr.o \ -zlapll.o \ -zlapmt.o \ -zlaqgb.o \ -zlaqge.o \ -zlaqhb.o \ -zlaqhe.o \ -zlaqhp.o \ -zlaqp2.o \ -zlaqps.o \ -zlaqr0.o \ -zlaqr1.o \ -zlaqr2.o \ -zlaqr3.o \ -zlaqr4.o \ -zlaqr5.o \ -zlaqsb.o \ -zlaqsp.o \ -zlaqsy.o \ -zlar1v.o \ -zlar2v.o \ -zlarcm.o \ -zlarfb.o \ -zlarf.o \ -zlarfg.o \ -zlarfgp.o \ -zlarft.o \ -zlarfx.o \ -zlargv.o \ -zlarnv.o \ -zlarrv.o \ -zlartg.o \ -zlartv.o \ -zlarzb.o \ -zlarz.o \ -zlarzt.o \ -zlascl.o \ -zlaset.o \ -zlasr.o \ -zlassq.o \ -zlaswp.o \ -zlasyf.o \ -zlat2c.o \ -zlatbs.o \ -zlatdf.o \ -zlatps.o \ -zlatrd.o \ -zlatrs.o \ -zlatrz.o \ -zlatzm.o \ -zlauu2.o \ -zlauum.o \ -zpbcon.o \ -zpbequ.o \ -zpbrfs.o \ -zpbstf.o \ -zpbsv.o \ -zpbsvx.o \ -zpbtf2.o \ -zpbtrf.o \ -zpbtrs.o \ -zpftrf.o \ -zpftri.o \ -zpftrs.o \ -zpocon.o \ -zpoequb.o \ -zpoequ.o \ -zporfs.o \ -zposv.o \ -zposvx.o \ -zpotf2.o \ -zpotrf.o \ -zpotri.o \ -zpotrs.o \ -zppcon.o \ -zppequ.o \ -zpprfs.o \ -zppsv.o \ -zppsvx.o \ -zpptrf.o \ -zpptri.o \ -zpptrs.o \ -zpstf2.o \ -zpstrf.o \ -zptcon.o \ -zpteqr.o \ -zptrfs.o \ -zptsv.o \ -zptsvx.o \ -zpttrf.o \ -zpttrs.o \ -zptts2.o \ -zrot.o \ -zspcon.o \ -zspmv.o \ -zspr.o \ -zsprfs.o \ -zspsv.o \ -zspsvx.o \ -zsptrf.o \ -zsptri.o \ -zsptrs.o \ -zstedc.o \ -zstegr.o \ -zstein.o \ -zstemr.o \ -zsteqr.o \ -zsycon.o \ -zsyequb.o \ -zsymv.o \ -zsyr.o \ -zsyrfs.o \ -zsysv.o \ -zsysvx.o \ -zsytf2.o \ -zsytrf.o \ -zsytri.o \ -zsytrs.o \ -ztbcon.o \ -ztbrfs.o \ -ztbtrs.o \ -ztfsm.o \ -ztftri.o \ -ztfttp.o \ -ztfttr.o \ -ztgevc.o \ -ztgex2.o \ -ztgexc.o \ -ztgsen.o \ -ztgsja.o \ -ztgsna.o \ -ztgsy2.o \ -ztgsyl.o \ -ztpcon.o \ -ztprfs.o \ -ztptri.o \ -ztptrs.o \ -ztpttf.o \ -ztpttr.o \ -ztrcon.o \ -ztrevc.o \ -ztrexc.o \ -ztrrfs.o \ -ztrsen.o \ -ztrsna.o \ -ztrsyl.o \ -ztrti2.o \ -ztrtri.o \ -ztrtrs.o \ -ztrttf.o \ -ztrttp.o \ -ztzrqf.o \ -ztzrzf.o \ -zung2l.o \ -zung2r.o \ -zungbr.o \ -zunghr.o \ -zungl2.o \ -zunglq.o \ -zungql.o \ -zungqr.o \ -zungr2.o \ -zungrq.o \ -zungtr.o \ -zunm2l.o \ -zunm2r.o \ -zunmbr.o \ -zunmhr.o \ -zunml2.o \ -zunmlq.o \ -zunmql.o \ -zunmqr.o \ -zunmr2.o \ -zunmr3.o \ -zunmrq.o \ -zunmrz.o \ -zunmtr.o \ -zupgtr.o \ -zupmtr.o \ - ../INSTALL/dlamch.o \ - ../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \ - ../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o +DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o +ifdef USEXBLAS SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \ - sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o \ + sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \ sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \ sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o \ sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \ sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \ slascl2.o sla_wwaddw.o +endif + +CLASRC = \ + cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o cgbsvx.o \ + cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \ + cgecon.o cgeequ.o cgees.o cgeesx.o cgeev.o cgeevx.o \ + cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o cgelqf.o \ + cgels.o cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \ + cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \ + cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o cgesvd.o \ + cgesvx.o cgetc2.o cgetf2.o cgetri.o \ + cggbak.o cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o \ + cgghrd.o cgglse.o cggqrf.o cggrqf.o \ + cggsvd.o cggsvp.o \ + cgtcon.o cgtrfs.o cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbev.o \ + chbevd.o chbevx.o chbgst.o chbgv.o chbgvd.o chbgvx.o chbtrd.o \ + checon.o cheev.o cheevd.o cheevr.o cheevx.o chegs2.o chegst.o \ + chegv.o chegvd.o chegvx.o cherfs.o chesv.o chesvx.o chetd2.o \ + chetf2.o chetrd.o \ + chetrf.o chetri.o chetri2.o chetri2x.o cheswapr.o \ + chetrs.o chetrs2.o chgeqz.o chpcon.o chpev.o chpevd.o \ + chpevx.o chpgst.o chpgv.o chpgvd.o chpgvx.o chprfs.o chpsv.o \ + chpsvx.o \ + chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o clabrd.o \ + clacgv.o clacon.o clacn2.o clacp2.o clacpy.o clacrm.o clacrt.o cladiv.o \ + claed0.o claed7.o claed8.o \ + claein.o claesy.o claev2.o clags2.o clagtm.o \ + clahef.o clahqr.o \ + clahrd.o clahr2.o claic1.o clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \ + clanhb.o clanhe.o \ + clanhp.o clanhs.o clanht.o clansb.o clansp.o clansy.o clantb.o \ + clantp.o clantr.o clapll.o clapmt.o clarcm.o claqgb.o claqge.o \ + claqhb.o claqhe.o claqhp.o claqp2.o claqps.o claqsb.o \ + claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o claqr5.o \ + claqsp.o claqsy.o clar1v.o clar2v.o ilaclr.o ilaclc.o \ + clarf.o clarfb.o clarfg.o clarft.o clarfgp.o \ + clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \ + clarz.o clarzb.o clarzt.o clascl.o claset.o clasr.o classq.o \ + claswp.o clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \ + clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \ + cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \ + cposv.o cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \ + cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o \ + cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o cpttrs.o cptts2.o \ + crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \ + cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \ + cstegr.o cstein.o csteqr.o csycon.o csymv.o \ + csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \ + csyswapr.o csytrs.o csytrs2.o csyconv.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \ + ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \ + ctprfs.o ctptri.o \ + ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \ + ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \ + cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o \ + cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o cunmhr.o cunml2.o \ + cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \ + cunmtr.o cupgtr.o cupmtr.o icmax1.o scsum1.o cstemr.o \ + chfrk.o ctfttp.o clanhf.o cpftrf.o cpftri.o cpftrs.o ctfsm.o ctftri.o \ + ctfttr.o ctpttf.o ctpttr.o ctrttf.o ctrttp.o \ + cgeequb.o cgbequb.o csyequb.o cpoequb.o cheequb.o \ + cbbcsd.o clapmr.o cunbdb.o cuncsd.o \ + cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \ + ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o + +ifdef USEXBLAS +CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \ + cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \ + csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \ + cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o \ + cposvxx.o cporfsx.o cla_porfsx_extended.o \ + cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o \ + cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o \ + cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o \ + chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \ + cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \ + cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o +endif + +ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o + +DLASRC = \ + dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o \ + dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \ + dgebrd.o dgecon.o dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o \ + dgegs.o dgegv.o dgehd2.o dgehrd.o dgelq2.o dgelqf.o \ + dgels.o dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o \ + dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \ + dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o dgesvd.o dgesvx.o \ + dgetc2.o dgetf2.o dgetrf.o dgetri.o \ + dgetrs.o dggbak.o dggbal.o dgges.o dggesx.o dggev.o dggevx.o \ + dggglm.o dgghrd.o dgglse.o dggqrf.o \ + dggrqf.o dggsvd.o dggsvp.o dgtcon.o dgtrfs.o dgtsv.o \ + dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \ + dhsein.o dhseqr.o dlabrd.o dlacon.o dlacn2.o \ + dlaein.o dlaexc.o dlag2.o dlags2.o dlagtm.o dlagv2.o dlahqr.o \ + dlahrd.o dlahr2.o dlaic1.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \ + dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o dlansp.o \ + dlansy.o dlantb.o dlantp.o dlantr.o dlanv2.o \ + dlapll.o dlapmt.o \ + dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqsb.o dlaqsp.o dlaqsy.o \ + dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \ + dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \ + dlarf.o dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o \ + dlargv.o dlarrv.o dlartv.o \ + dlarz.o dlarzb.o dlarzt.o dlaswp.o dlasy2.o dlasyf.o \ + dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o dlauu2.o \ + dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \ + dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \ + dorgrq.o dorgtr.o dorm2l.o dorm2r.o \ + dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o dormr2.o \ + dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \ + dpbstf.o dpbsv.o dpbsvx.o \ + dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o \ + dposvx.o dpotf2.o dpotrf.o dpotri.o dpotrs.o dpstrf.o dpstf2.o \ + dppcon.o dppequ.o \ + dpprfs.o dppsv.o dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \ + dpteqr.o dptrfs.o dptsv.o dptsvx.o dpttrs.o dptts2.o drscl.o \ + dsbev.o dsbevd.o dsbevx.o dsbgst.o dsbgv.o dsbgvd.o dsbgvx.o \ + dsbtrd.o dspcon.o dspev.o dspevd.o dspevx.o dspgst.o \ + dspgv.o dspgvd.o dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o \ + dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o dstevd.o dstevr.o \ + dstevx.o dsycon.o dsyev.o dsyevd.o dsyevr.o \ + dsyevx.o dsygs2.o dsygst.o dsygv.o dsygvd.o dsygvx.o dsyrfs.o \ + dsysv.o dsysvx.o \ + dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytri2.o dsytri2x.o \ + dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o dtbcon.o \ + dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \ + dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \ + dtptrs.o \ + dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \ + dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o \ + dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \ + dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \ + dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \ + dgejsv.o dgesvj.o dgsvj0.o dgsvj1.o \ + dgeequb.o dsyequb.o dpoequb.o dgbequb.o \ + dbbcsd.o dlapmr.o dorbdb.o dorcsd.o \ + dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \ + dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o +ifdef USEXBLAS DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \ - dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o \ + dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \ dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \ dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o \ dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \ dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \ dlascl2.o dla_wwaddw.o +endif -CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \ - cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o \ - csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \ - cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o \ - cposvxx.o cporfsx.o cla_porfsx_extended.o \ - cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o \ - cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o \ - cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o \ - chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \ - cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \ - cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o +ZLASRC = \ + zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o \ + zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \ + zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \ + zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \ + zgels.o zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \ + zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o \ + zgesc2.o zgesdd.o zgesv.o zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o \ + zgetri.o zgetrs.o \ + zggbak.o zggbal.o zgges.o zggesx.o zggev.o zggevx.o zggglm.o \ + zgghrd.o zgglse.o zggqrf.o zggrqf.o \ + zggsvd.o zggsvp.o \ + zgtcon.o zgtrfs.o zgtsv.o zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbev.o \ + zhbevd.o zhbevx.o zhbgst.o zhbgv.o zhbgvd.o zhbgvx.o zhbtrd.o \ + zhecon.o zheev.o zheevd.o zheevr.o zheevx.o zhegs2.o zhegst.o \ + zhegv.o zhegvd.o zhegvx.o zherfs.o zhesv.o zhesvx.o zhetd2.o \ + zhetf2.o zhetrd.o \ + zhetrf.o zhetri.o zhetri2.o zhetri2x.o zheswapr.o \ + zhetrs.o zhetrs2.o zhgeqz.o zhpcon.o zhpev.o zhpevd.o \ + zhpevx.o zhpgst.o zhpgv.o zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o \ + zhpsvx.o \ + zhptrd.o zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \ + zlacgv.o zlacon.o zlacn2.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o \ + zlaed0.o zlaed7.o zlaed8.o \ + zlaein.o zlaesy.o zlaev2.o zlags2.o zlagtm.o \ + zlahef.o zlahqr.o \ + zlahrd.o zlahr2.o zlaic1.o zlals0.o zlalsa.o zlalsd.o zlangb.o zlange.o \ + zlangt.o zlanhb.o \ + zlanhe.o \ + zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o \ + zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o zlaqge.o \ + zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqsb.o \ + zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \ + zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o ilazlr.o ilazlc.o \ + zlarcm.o zlarf.o zlarfb.o \ + zlarfg.o zlarft.o zlarfgp.o \ + zlarfx.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \ + zlarz.o zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o \ + zlassq.o zlaswp.o zlasyf.o \ + zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \ + zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o \ + zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \ + zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \ + zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \ + zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o zpttrs.o zptts2.o \ + zrot.o zspcon.o zspmv.o zspr.o zsprfs.o zspsv.o \ + zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \ + zstegr.o zstein.o zsteqr.o zsycon.o zsymv.o \ + zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \ + zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \ + ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \ + ztprfs.o ztptri.o \ + ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \ + ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o \ + zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o \ + zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o zunml2.o \ + zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o \ + zunmtr.o zupgtr.o \ + zupmtr.o izmax1.o dzsum1.o zstemr.o \ + zcgesv.o zcposv.o zlag2c.o clag2z.o zlat2c.o \ + zhfrk.o ztfttp.o zlanhf.o zpftrf.o zpftri.o zpftrs.o ztfsm.o ztftri.o \ + ztfttr.o ztpttf.o ztpttr.o ztrttf.o ztrttp.o \ + zgeequb.o zgbequb.o zsyequb.o zpoequb.o zheequb.o \ + zbbcsd.o zlapmr.o zunbdb.o zuncsd.o \ + zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \ + ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o +ifdef USEXBLAS ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \ - zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o \ + zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \ zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \ zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o \ zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o \ @@ -1502,16 +389,23 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \ zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \ zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \ zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o +endif -ALLXAUX = +all: ../$(LAPACKLIB) ifdef USEXBLAS ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX) endif -static: $(OBJS) $(ALLXOBJ) - ar ruv liblapack.a $(OBJS) +ALLOBJ=$(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \ + $(SCLAUX) $(DZLAUX) $(ALLAUX) + +clean: + rm -f *.o liblapack* + +static: $(ALLOBJ) $(ALLXOBJ) + ar ruv liblapack.a $(ALLOBJ) ranlib liblapack.a -shared: $(OBJS) $(ALLXOBJ) - cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.2 $(OBJS) -L.. -lblas -lm -lgfortran -lc +shared: $(ALLOBJ) $(ALLXOBJ) + cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc diff --git a/abs/core/lapack/PKGBUILD b/abs/core/lapack/PKGBUILD index 145e85f..cef5ff2 100644 --- a/abs/core/lapack/PKGBUILD +++ b/abs/core/lapack/PKGBUILD @@ -1,45 +1,31 @@ -# $Id: PKGBUILD 94550 2010-10-08 09:23:08Z ronald $ +# $Id: PKGBUILD 147948 2012-01-28 21:21:33Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Jason Taylor <jftaylor21@gmail.com> -pkgbase=lapack -pkgname=('blas' 'lapack') -pkgver=3.2.2 -pkgrel=2 +pkgname=lapack +pkgver=3.4.0 +pkgrel=1 url="http://www.netlib.org/lapack" +pkgdesc="Linear Algebra PACKage" makedepends=('gcc-fortran') +depends=("blas=${pkgver}") arch=('i686' 'x86_64') license=("custom") -source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz - lapack-3.1.1-make.inc.patch - Makefile.blas - Makefile.lapack - LICENSE.blas) -md5sums=('10832891c9e8100f81108c1ec7da0da4' - 'cdfcb9d9b162c18d9acbf63c5579ea26' - '51a84dd3b1f04289b6b7c7f56d59c368' - 'e7936c82c853870f0144f45e9656a7ea' - '38b6acb8ed5691d25863319d30a8b365') +source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz + Makefile.lapack) +sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f' + '2bedfe0d778b401b24d1fbf0eb1dc576d374be28') + build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch" + cd "${srcdir}/${pkgname}-${pkgver}" cp -f INSTALL/make.inc.gfortran make.inc - cp -f "${srcdir}/Makefile.blas" BLAS/SRC/Makefile cp -f "${srcdir}/Makefile.lapack" SRC/Makefile export FC=gfortran - pushd BLAS/SRC - make clean - FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o - FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared - cp libblas.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/" - popd - ln -s libblas.so.${pkgver} libblas.so - pushd INSTALL make clean make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC" @@ -50,35 +36,19 @@ build() { make clean make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared - cp liblapack.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/" + cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/" popd } -package_blas() { - pkgdesc="Basic Linear Algebra Subprograms" - depends=('gcc-libs>=4.5.0') - options=('force') +package() { install -m755 -d "${pkgdir}/usr/lib" - install -m755 "${srcdir}/${pkgbase}-${pkgver}/libblas.so.${pkgver}" \ - "${pkgdir}/usr/lib/" || return 1 - ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so" - ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so.3" - - install -m755 -d "${pkgdir}/usr/share/licenses/blas" - install -m644 "${srcdir}/LICENSE.blas" \ - "${pkgdir}/usr/share/licenses/blas/LICENSE" || return 1 -} - -package_lapack() { - pkgdesc="Linear Algebra PACKage" - depends=("blas=${pkgver}") - install -m755 -d "${pkgdir}/usr/lib" - install -m755 "${srcdir}/${pkgbase}-${pkgver}/liblapack.so.${pkgver}" \ - "${pkgdir}/usr/lib/" || return 1 + install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \ + "${pkgdir}/usr/lib/" ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so" ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3" install -m755 -d "${pkgdir}/usr/share/licenses/lapack" - install -m644 "${srcdir}/${pkgbase}-${pkgver}/LICENSE" \ - "${pkgdir}/usr/share/licenses/lapack/" || return 1 + install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ + "${pkgdir}/usr/share/licenses/lapack/" } + diff --git a/abs/core/lcms/PKGBUILD b/abs/core/lcms/PKGBUILD index effc73c..a8706fe 100644 --- a/abs/core/lcms/PKGBUILD +++ b/abs/core/lcms/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 87526 2010-08-15 13:47:09Z ibiru $ +# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $ # Maintainer: Tobias Kieslich <neri@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=lcms pkgver=1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight color management development library/engine" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') -depends=('libtiff>=3.9.4') +depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('8af94611baf20d9646c7c2c285859818') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -Dm 644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/lcms2/PKGBUILD b/abs/core/lcms2/PKGBUILD new file mode 100644 index 0000000..e601882 --- /dev/null +++ b/abs/core/lcms2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 148812 2012-02-05 11:51:30Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=lcms2 +pkgver=2.3 +pkgrel=2 +pkgdesc="Small-footprint color management engine, version 2" +arch=('i686' 'x86_64') +license=('MIT') +depends=('libtiff') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) +sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/ldns/PKGBUILD b/abs/core/ldns/PKGBUILD new file mode 100644 index 0000000..e936b0b --- /dev/null +++ b/abs/core/ldns/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 159413 2012-05-23 22:28:28Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> + +pkgname=ldns +pkgver=1.6.13 +pkgrel=1 +pkgdesc='Fast DNS library supporting recent RFCs' +url='http://www.nlnetlabs.nl/projects/ldns/' +license=('custom:BSD') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('openssl' 'dnssec-anchors') +optdepends=('libpcap: ldns-dpa tool') +makedepends=('libpcap') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('859f633d10b763f06b602e2113828cbbd964c7eb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-drill \ + --with-examples \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/less/PKGBUILD b/abs/core/less/PKGBUILD index a83ec60..4b12894 100644 --- a/abs/core/less/PKGBUILD +++ b/abs/core/less/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 47851 2009-07-28 09:48:01Z allan $ +# $Id: PKGBUILD 149934 2012-02-11 23:29:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less -pkgver=436 -pkgrel=1 +pkgver=444 +pkgrel=3 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') url="http://www.greenwoodsoftware.com/less" groups=('base') -depends=('ncurses') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('817bf051953ad2dea825a1cdf460caa4') +depends=('ncurses' 'pcre') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('56f9f76ffe13f70155f47f6b3c87d421' + 'd5fafbd94a9cfdeaad0c82143a033fe5') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + make } + package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - install -dm755 $pkgdir/bin - mv $pkgdir/usr/bin/$pkgname $pkgdir/bin/ + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}"/usr install } diff --git a/abs/core/less/zless b/abs/core/less/zless deleted file mode 100644 index 93d560b..0000000 --- a/abs/core/less/zless +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${PAGER=less} -export PAGER - -PATH="/usr/bin:$PATH" -export PATH - -exec zmore ${1+"$@"} diff --git a/abs/core/libao/PKGBUILD b/abs/core/libao/PKGBUILD index 43cfe18..acc0d54 100644 --- a/abs/core/libao/PKGBUILD +++ b/abs/core/libao/PKGBUILD @@ -1,32 +1,39 @@ -# $Id: PKGBUILD 82932 2010-06-19 13:31:58Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 149069 2012-02-05 16:27:23Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libao -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=2 -pkgdesc="A cross-platform audio output library and plugins" -url="http://www.xiph.org/ao" +pkgdesc='Cross-platform audio output library and plugins' +url='http://xiph.org/ao/' arch=('i686' 'x86_64') license=('GPL') -depends=('glibc' 'alsa-lib') -backup=('etc/libao.conf') options=('!libtool') +depends=('alsa-lib') +#makedepends=('libpulse') +backup=('etc/libao.conf') source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz" - 'libao.conf') -md5sums=('08283fbe1f587619053a156254afecec' - '3ae8f3e3f1492210b3519af0f1f3c572') + 'libao.conf') +sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd' + '558b3d297e0956af6959565db477023dbd492ca0') + +#conflicts=('libao-pulse') +#provides=("libao-pulse=${pkgver}-${pkgrel}") +#replaces=('libao-pulse') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --enable-alsa-mmap \ + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - # Add conf file - install -Dm0644 ${srcdir}/libao.conf ${pkgdir}/etc/libao.conf || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/libao.conf "${pkgdir}"/etc/libao.conf } diff --git a/abs/core/libao/__changelog b/abs/core/libao/__changelog new file mode 100644 index 0000000..88b33f5 --- /dev/null +++ b/abs/core/libao/__changelog @@ -0,0 +1 @@ +removed pulse diff --git a/abs/core/libarchive/PKGBUILD b/abs/core/libarchive/PKGBUILD index d0b2735..e3f7385 100644 --- a/abs/core/libarchive/PKGBUILD +++ b/abs/core/libarchive/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 85003 2010-07-06 13:24:34Z dan $ +# $Id: PKGBUILD 155375 2012-04-02 16:12:53Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> + pkgname=libarchive -pkgver=2.8.4 -pkgrel=3 +pkgver=3.0.4 +pkgrel=1 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') -depends=('zlib' 'bzip2' 'xz' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('83b237a542f27969a8d68ac217dc3796') -sha256sums=('86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688') - -# pacman.static build fails unless we keep the libtool files (or unless we link -# the missing symbols inside the libarchive .a static lib, but that is dirty) -options=('libtool') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') +source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz") +md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16') +sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --without-xml2 + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" - make || return 1 + make check } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING } diff --git a/abs/core/libart-lgpl/PKGBUILD b/abs/core/libart-lgpl/PKGBUILD index 92d659f..de97c2b 100644 --- a/abs/core/libart-lgpl/PKGBUILD +++ b/abs/core/libart-lgpl/PKGBUILD @@ -1,20 +1,24 @@ -# $Id$ +# $Id: PKGBUILD 150419 2012-02-17 12:52:28Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libart-lgpl pkgver=2.3.21 -pkgrel=1 +pkgrel=2 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL') -depends=('glibc') source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2) options=('!libtool') sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { - cd ${startdir}/src/libart_lgpl-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/libart_lgpl-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/libart_lgpl-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libart-lgpl/art_misc.h-cplusplus.patch b/abs/core/libart-lgpl/art_misc.h-cplusplus.patch deleted file mode 100644 index dea8eb0..0000000 --- a/abs/core/libart-lgpl/art_misc.h-cplusplus.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: art_misc.h -=================================================================== ---- art_misc.h (revision 277) -+++ art_misc.h (working copy) -@@ -34,9 +34,15 @@ - #include <libart_lgpl/art_config.h> - #endif - -+#ifdef __cplusplus -+extern "C" { -+#endif - void *art_alloc(size_t size); - void art_free(void *ptr); - void *art_realloc(void *ptr, size_t size); -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - - /* These aren't, strictly speaking, configuration macros, but they're - damn handy to have around, and may be worth playing with for -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 277) -+++ ChangeLog (working copy) -@@ -1,3 +1,10 @@ -+2007-03-01 Frederic Crozat <fcrozat@mandriva.com> -+ -+ reviewed by: Dom Lachowicz <cinamod@hotmail.com> -+ -+ * art_misc.h: Fix header when included in C++. -+ Patch from Goetz Waschk and Laurent Montel. -+ - 2007-02-28 Kjartan Maraas <kmaraas@gnome.org> - - configure.in: Release 2.3.19 diff --git a/abs/core/libass/PKGBUILD b/abs/core/libass/PKGBUILD new file mode 100644 index 0000000..3bf6771 --- /dev/null +++ b/abs/core/libass/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 146950 2012-01-19 15:31:00Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> + +pkgname=libass +pkgver=0.10.0 +pkgrel=3 +pkgdesc="A portable library for SSA/ASS subtitles rendering" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libass/" +license=('BSD') +depends=('enca' 'fontconfig' 'fribidi') +makedepends=('pkg-config') +options=(!libtool) +source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('1855bddc4c167f96968dddeeda0eb45c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/libassuan/PKGBUILD b/abs/core/libassuan/PKGBUILD new file mode 100644 index 0000000..12e79ce --- /dev/null +++ b/abs/core/libassuan/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146745 2012-01-16 22:52:52Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=libassuan +pkgver=2.0.3 +pkgrel=1 +pkgdesc="A IPC library used by some GnuPG related software" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/related_software/libassuan" +depends=('libgpg-error') +options=('!libtool') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=libassuan.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} +md5sums=('179d1918325fdb928c7bd90b8a514fc7') diff --git a/abs/core/gcc/gcc.install b/abs/core/libassuan/libassuan.install index 83d89b0..07e2672 100644 --- a/abs/core/gcc/gcc.install +++ b/abs/core/libassuan/libassuan.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) +infodir=usr/share/info +filelist=(assuan.info) post_install() { [ -x usr/bin/install-info ] || return 0 @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/libatasmart/PKGBUILD b/abs/core/libatasmart/PKGBUILD index 470b933..36c54c9 100644 --- a/abs/core/libatasmart/PKGBUILD +++ b/abs/core/libatasmart/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 141499 2011-10-31 03:19:13Z andrea $ +# $Id: PKGBUILD 160363 2012-06-01 12:58:30Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64') license=('LGPL') -depends=('udev>=171') +depends=('udev') url="http://0pointer.de/blog/projects/being-smart.html" options=('!libtool') source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz") diff --git a/abs/core/libavc1394/PKGBUILD b/abs/core/libavc1394/PKGBUILD index 1a359f4..98a6836 100644 --- a/abs/core/libavc1394/PKGBUILD +++ b/abs/core/libavc1394/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 37800 2009-05-03 21:23:26Z jgc $ +# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $ # Maintainer: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=libavc1394 -pkgver=0.5.3 -pkgrel=3 +pkgver=0.5.4 +pkgrel=1 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands." arch=("i686" "x86_64") url="http://sourceforge.net/projects/libavc1394/" license=('LGPL') -depends=('libraw1394>=2.0.2') +depends=('libraw1394') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz) -md5sums=('09e30b1fb5ae455b6d8407e457a711a3') +source=("http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz") +md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libcap/PKGBUILD b/abs/core/libcap/PKGBUILD index a08e96c..99d938b 100644 --- a/abs/core/libcap/PKGBUILD +++ b/abs/core/libcap/PKGBUILD @@ -1,22 +1,31 @@ -#$Id: PKGBUILD 64614 2010-01-21 11:40:53Z allan $ -# Maintainer: Hugo Doria <hugo@archlinux.org> +#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap -pkgver=2.19 -pkgrel=1 +pkgver=2.22 +pkgrel=3 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') -url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -license=('GPL') +url="http://sites.google.com/site/fullycapable/" +license=('GPL2') depends=('glibc' 'attr') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz) -md5sums=('9caa6dafc9e3db4cbaecdb8e48f23fa2') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('b4896816b626bea445f0b3849bdd4077' + '9d0983e25e5a251d098507f9561d2b27') build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)/\$(lib)|LIBDIR=\$(FAKEROOT)/\$(lib)|g" Make.Rules || return 1 - make prefix=/usr DESTDIR=${pkgdir} install + make +} - rm ${pkgdir}/lib/*.a || return 1 - chmod 755 ${pkgdir}/lib/libcap.so.${pkgver} || return 1 +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install + + chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver} + rm ${pkgdir}/usr/lib/libcap.a + + install -Dm644 pam_cap/capability.conf \ + $pkgdir/usr/share/doc/$pkgname/capability.conf.example } diff --git a/abs/core/libcdaudio/01-cddb-bufferoverflow.patch b/abs/core/libcdaudio/01-cddb-bufferoverflow.patch new file mode 100644 index 0000000..0a44497 --- /dev/null +++ b/abs/core/libcdaudio/01-cddb-bufferoverflow.patch @@ -0,0 +1,15 @@ +Author: Moritz Muehlenhoff <jmm@inutil.org> +Description: CAN-2005-0706: Bufferoverflow in CDDB lookup parsing + +diff -Naurp libcdaudio.orig/src/cddb.c libcdaudio/src/cddb.c +--- libcdaudio.orig/src/cddb.c 2009-08-02 10:30:05.000000000 +0000 ++++ libcdaudio/src/cddb.c 2009-08-02 10:34:57.000000000 +0000 +@@ -1052,7 +1052,7 @@ cddb_query(int cd_desc, int sock, + } + + query->query_matches = 0; +- while(!cddb_read_line(sock, inbuffer, 256)) { ++ while(query->query_matches < MAX_INEXACT_MATCHES && !cddb_read_line(sock, inbuffer, 256)) { + slashed = 0; + if(strchr(inbuffer, '/') != NULL && parse_disc_artist) { + index = 0; diff --git a/abs/core/libcdaudio/02-cddb-bufferoverflow.patch b/abs/core/libcdaudio/02-cddb-bufferoverflow.patch new file mode 100644 index 0000000..b542273 --- /dev/null +++ b/abs/core/libcdaudio/02-cddb-bufferoverflow.patch @@ -0,0 +1,15 @@ +Author: Moritz Muehlenhoff <jmm@inutil.org> +Description: CVE-2008-5030 + +diff -Naurp libcdaudio.orig/src/cddb.c libcdaudio/src/cddb.c +--- libcdaudio.orig/src/cddb.c 2008-09-07 23:53:16.000000000 +0000 ++++ libcdaudio/src/cddb.c 2008-11-12 21:32:21.000000000 +0000 +@@ -1679,7 +1679,7 @@ cddb_read_disc_data(int cd_desc, struct + free(file); + + while(!feof(cddb_data)) { +- fgets(inbuffer, 512, cddb_data); ++ fgets(inbuffer, 256, cddb_data); + cddb_process_line(inbuffer, data); + } + diff --git a/abs/core/libcdaudio/PKGBUILD b/abs/core/libcdaudio/PKGBUILD index 0494dbd..2a287e5 100644 --- a/abs/core/libcdaudio/PKGBUILD +++ b/abs/core/libcdaudio/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: arjan <arjan@archlinux.org> -#contributor Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 150528 2012-02-18 12:08:44Z pierre $ +# Maintainer: +# Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libcdaudio pkgver=0.99.12 -pkgrel=3 -pkgdesc="A portable library for controlling Audio CDs and managing the transfers of information with the CDDB system." -arch=(i686 x86_64) +pkgrel=6 +pkgdesc="Library for controlling Audio CDs and interacting with CDDB" +arch=('i686' 'x86_64') url="http://libcdaudio.sourceforge.net/" license=('GPL') -depends=(glibc) -source=(http://dl.sourceforge.net/sourceforge/libcdaudio/$pkgname-${pkgver}p2.tar.gz) -md5sums=('15de3830b751818a54a42899bd3ae72c') +depends=('glibc') options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/libcdaudio/${pkgname}-${pkgver}.tar.gz" + '01-cddb-bufferoverflow.patch' + '02-cddb-bufferoverflow.patch') +md5sums=('63b49cf14d53eed31e7a87cca17a3963' + 'f78c881b92cd7d25472daa90af284e18' + 'e36755c125d2710dc8619bb401e37444') build() { - cd $startdir/src/$pkgname-${pkgver}p2 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/01-cddb-bufferoverflow.patch" + patch -Np1 -i "${srcdir}/02-cddb-bufferoverflow.patch" ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make } +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/libcddb/PKGBUILD b/abs/core/libcddb/PKGBUILD index 7031705..51b3b7d 100644 --- a/abs/core/libcddb/PKGBUILD +++ b/abs/core/libcddb/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 78167 2010-04-20 00:31:41Z dgriffiths $ +# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libcddb pkgver=1.3.2 -pkgrel=2 -pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +pkgrel=3 arch=('i686' 'x86_64') +pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +url="http://sourceforge.net/projects/libcddb/" license=('LGPL') options=('!libtool') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -url="http://sourceforge.net/projects/libcddb/" +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('8bb4a6f542197e8e9648ae597cd6bc8a') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make } + package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/abs/core/libcec/PKGBUILD b/abs/core/libcec/PKGBUILD new file mode 100644 index 0000000..be742f5 --- /dev/null +++ b/abs/core/libcec/PKGBUILD @@ -0,0 +1,26 @@ +pkgname=libcec +pkgver=1.8.0 +pkgrel=1 +pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" +arch=('i686' 'x86_64') +url="https://github.com/Pulse-Eight/libcec" +license=('GPL') +depends=('udev' 'lockdev') +source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") +_srcfolder=Pulse-Eight-libcec-b0a5e4f +sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec') +options=(!libtool) + +build() { + mv "$_srcfolder" "$pkgname-$pkgver" + + cd "$pkgname-$pkgver" + autoreconf -vif + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/core/libcroco/PKGBUILD b/abs/core/libcroco/PKGBUILD index e2a2c1f..caffa7e 100644 --- a/abs/core/libcroco/PKGBUILD +++ b/abs/core/libcroco/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 26973 2009-02-15 00:05:10Z jgc $ +# $Id: PKGBUILD 156890 2012-04-23 09:08:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libcroco -pkgver=0.6.2 -pkgrel=2 -pkgdesc="GNOME CSS2 parsing and manipulation toolkit" +pkgver=0.6.5 +pkgrel=1 +pkgdesc="A CSS parsing library" arch=('x86_64' 'i686') -depends=('glib2>=2.18.4' 'libxml2>=2.7.3') -makedepends=('intltool' 'pkgconfig') +depends=('glib2' 'libxml2') +makedepends=('intltool') license=('LGPL') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -md5sums=('1429c597aa4b75fc610ab3a542c99209') +sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } - diff --git a/abs/core/libdaemon/PKGBUILD b/abs/core/libdaemon/PKGBUILD index 73427b8..f12c1fa 100644 --- a/abs/core/libdaemon/PKGBUILD +++ b/abs/core/libdaemon/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 67398 2010-02-06 16:22:40Z thayer $ +# $Id: PKGBUILD 149075 2012-02-05 16:45:57Z bisson $ # Contributor: Manolis Tzanidakis -# Contributor: Mark Rosenstand <mark@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Mark Rosenstand <mark@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libdaemon pkgver=0.14 -pkgrel=1 -pkgdesc="A lightweight C library which eases the writing of UNIX daemons" -url="http://0pointer.de/lennart/projects/libdaemon/" +pkgrel=2 +pkgdesc='Lightweight C library that eases the writing of UNIX daemons' +url='http://0pointer.de/lennart/projects/libdaemon/' license=('LGPL') arch=('i686' 'x86_64') -depends=('glibc') -source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz) +source=("http://0pointer.de/lennart/projects/libdaemon/${pkgname}-${pkgver}.tar.gz") options=('!libtool') -md5sums=('509dc27107c21bcd9fbf2f95f5669563') +sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --disable-lynx || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --localstatedir=/var --disable-lynx --disable-static + make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libdatrie/PKGBUILD b/abs/core/libdatrie/PKGBUILD index 166cd43..21eca6b 100644 --- a/abs/core/libdatrie/PKGBUILD +++ b/abs/core/libdatrie/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 87837 2010-08-18 12:55:23Z jgc $ +# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libdatrie -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe." -url="http://linux.thai.net/~thep/datrie/datrie.html" +url="http://linux.thai.net/projects/datrie" license=('LGPL') arch=('i686' 'x86_64') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz) -md5sums=('7f7d592114f98db9e4c7171c3f2befc5') +md5sums=('c9b057d07198d66e1ac2eff32937d3d4') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } - diff --git a/abs/core/libdmx/PKGBUILD b/abs/core/libdmx/PKGBUILD index a189b3d..7265dc7 100644 --- a/abs/core/libdmx/PKGBUILD +++ b/abs/core/libdmx/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 97777 2010-11-01 22:06:48Z jgc $ +# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdmx -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49aeab743cb8b667829efda140487b69a7148676') +source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index aa350d5..4833360 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -1,40 +1,44 @@ -# $Id$ +# $Id: PKGBUILD 162833 2012-07-01 07:57:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.26 +pkgver=2.4.37 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') depends=('glibc' 'libpciaccess') +makedepends=('cairo' 'valgrind') +replaces=('libdrm-new' 'libdrm-nouveau') options=('!libtool') url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -md5sums=('062569426773f69b11a47a7712bba770' - 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') +sha256sums=('e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f' + 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7' + '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - -# libtoolize --force + cd $pkgname-$pkgver + patch -Np1 -i ../no-pthread-stubs.patch + + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ - --enable-intel \ - --enable-radeon \ - --enable-vmwgfx-experimental-api \ - --enable-nouveau-experimental-api + --enable-vmwgfx-experimental-api make } +check() { + cd $pkgname-$pkgver + make -k check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/" } diff --git a/abs/core/libdrm/git_fixes.diff b/abs/core/libdrm/git_fixes.diff new file mode 100644 index 0000000..dc80155 --- /dev/null +++ b/abs/core/libdrm/git_fixes.diff @@ -0,0 +1,13 @@ +diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +index 19441f3..eb9dd32 100644 +--- a/intel/intel_bufmgr_gem.c ++++ b/intel/intel_bufmgr_gem.c +@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) + bufmgr_gem->vma_cache.next, + vma_list); + assert(bo_gem->map_count == 0); +- DRMLISTDEL(&bo_gem->vma_list); ++ DRMLISTDELINIT(&bo_gem->vma_list); + + if (bo_gem->mem_virtual) { + munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch index 348c2a7..6745f4b 100644 --- a/abs/core/libdrm/no-pthread-stubs.patch +++ b/abs/core/libdrm/no-pthread-stubs.patch @@ -1,6 +1,6 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 +diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac +--- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000 ++++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000 @@ -47,10 +47,6 @@ LT_INIT([disable-static]) @@ -9,29 +9,50 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - AC_SUBST(PCIACCESS_CFLAGS) - AC_SUBST(PCIACCESS_LIBS) ---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,14 +26,13 @@ + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + AC_ARG_ENABLE([udev], +diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am +--- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000 ++++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000 +@@ -26,7 +26,6 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ $(PCIACCESS_CFLAGS) \ + $(VALGRIND_CFLAGS) \ -I$(top_srcdir)/include/drm - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la +@@ -35,7 +34,6 @@ libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ + libdrm_intel_la_LIBADD = ../libdrm.la \ +- @PTHREADSTUBS_LIBS@ \ + @PCIACCESS_LIBS@ \ + @CLOCK_LIB@ + +diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am +--- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000 ++++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000 +@@ -2,14 +2,13 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/nouveau \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm \ + -DDEBUG + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) + libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined +-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_nouveau_la_LIBADD = ../libdrm.la - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ ---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 + libdrm_nouveau_la_SOURCES = nouveau.c \ + pushbuf.c \ +diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am +--- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000 ++++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000 @@ -26,13 +26,12 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ @@ -47,20 +68,3 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac libdrm_radeon_la_SOURCES = \ radeon_bo_gem.c \ ---- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/abs/core/libdvdread/DVDFileStat.patch b/abs/core/libdvdread/DVDFileStat.patch deleted file mode 100644 index 6431122..0000000 --- a/abs/core/libdvdread/DVDFileStat.patch +++ /dev/null @@ -1,237 +0,0 @@ -diff -pruN libdvdread-4.1.3/src/dvd_reader.c libdvdread-4.1.3.new/src/dvd_reader.c ---- libdvdread-4.1.3/src/dvd_reader.c 2008-09-06 23:55:51.000000000 +0200 -+++ libdvdread-4.1.3.new/src/dvd_reader.c 2009-02-28 01:36:20.000000000 +0100 -@@ -889,6 +889,187 @@ void DVDCloseFile( dvd_file_t *dvd_file - } - } - -+static int DVDFileStatVOBUDF(dvd_reader_t *dvd, int title, -+ int menu, dvd_stat_t *statbuf) -+{ -+ char filename[ MAX_UDF_FILE_NAME_LEN ]; -+ uint32_t size; -+ off_t tot_size; -+ off_t parts_size[9]; -+ int nr_parts = 0; -+ int n; -+ -+ if( title == 0 ) { -+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" ); -+ } else { -+ sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); -+ } -+ if(!UDFFindFile( dvd, filename, &size )) { -+ return -1; -+ } -+ tot_size = size; -+ nr_parts = 1; -+ parts_size[0] = size; -+ -+ if( !menu ) { -+ int cur; -+ -+ for( cur = 2; cur < 10; cur++ ) { -+ sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur ); -+ if( !UDFFindFile( dvd, filename, &size ) ) { -+ break; -+ } -+ parts_size[nr_parts] = size; -+ tot_size += size; -+ nr_parts++; -+ } -+ } -+ -+ statbuf->size = tot_size; -+ statbuf->nr_parts = nr_parts; -+ for(n = 0; n < nr_parts; n++) { -+ statbuf->parts_size[n] = parts_size[n]; -+ } -+ return 0; -+} -+ -+ -+static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title, -+ int menu, dvd_stat_t *statbuf ) -+{ -+ char filename[ MAX_UDF_FILE_NAME_LEN ]; -+ char full_path[ PATH_MAX + 1 ]; -+ struct stat fileinfo; -+ off_t tot_size; -+ off_t parts_size[9]; -+ int nr_parts = 0; -+ int n; -+ -+ -+ -+ if( title == 0 ) { -+ sprintf( filename, "VIDEO_TS.VOB" ); -+ } else { -+ sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); -+ } -+ if( !findDVDFile( dvd, filename, full_path ) ) { -+ return -1; -+ } -+ -+ if( stat( full_path, &fileinfo ) < 0 ) { -+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); -+ return -1; -+ } -+ -+ -+ tot_size = fileinfo.st_size; -+ nr_parts = 1; -+ parts_size[0] = fileinfo.st_size; -+ -+ if( !menu ) { -+ int cur; -+ -+ for( cur = 2; cur < 10; cur++ ) { -+ -+ sprintf( filename, "VTS_%02d_%d.VOB", title, cur ); -+ if( !findDVDFile( dvd, filename, full_path ) ) { -+ break; -+ } -+ -+ if( stat( full_path, &fileinfo ) < 0 ) { -+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); -+ break; -+ } -+ -+ parts_size[nr_parts] = fileinfo.st_size; -+ tot_size += parts_size[nr_parts]; -+ nr_parts++; -+ } -+ } -+ -+ statbuf->size = tot_size; -+ statbuf->nr_parts = nr_parts; -+ for(n = 0; n < nr_parts; n++) { -+ statbuf->parts_size[n] = parts_size[n]; -+ } -+ return 0; -+} -+ -+ -+int DVDFileStat(dvd_reader_t *dvd, int titlenum, -+ dvd_read_domain_t domain, dvd_stat_t *statbuf) -+{ -+ char filename[ MAX_UDF_FILE_NAME_LEN ]; -+ char full_path[ PATH_MAX + 1 ]; -+ struct stat fileinfo; -+ uint32_t size; -+ -+ /* Check arguments. */ -+ if( dvd == NULL || titlenum < 0 ) { -+ errno = EINVAL; -+ return -1; -+ } -+ -+ switch( domain ) { -+ case DVD_READ_INFO_FILE: -+ if( titlenum == 0 ) { -+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" ); -+ } else { -+ sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum ); -+ } -+ break; -+ case DVD_READ_INFO_BACKUP_FILE: -+ if( titlenum == 0 ) { -+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" ); -+ } else { -+ sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum ); -+ } -+ break; -+ case DVD_READ_MENU_VOBS: -+ if( dvd->isImageFile ) { -+ return DVDFileStatVOBUDF( dvd, titlenum, 1, statbuf ); -+ } else { -+ return DVDFileStatVOBPath( dvd, titlenum, 1, statbuf ); -+ } -+ break; -+ case DVD_READ_TITLE_VOBS: -+ if( titlenum == 0 ) { -+ return -1; -+ } -+ if( dvd->isImageFile ) { -+ return DVDFileStatVOBUDF( dvd, titlenum, 0, statbuf ); -+ } else { -+ return DVDFileStatVOBPath( dvd, titlenum, 0, statbuf ); -+ } -+ break; -+ default: -+ fprintf( stderr, "libdvdread: Invalid domain for file stat.\n" ); -+ errno = EINVAL; -+ return -1; -+ } -+ -+ if( dvd->isImageFile ) { -+ if( UDFFindFile( dvd, filename, &size ) ) { -+ statbuf->size = size; -+ statbuf->nr_parts = 1; -+ statbuf->parts_size[0] = size; -+ return 0; -+ } -+ } else { -+ if( findDVDFile( dvd, filename, full_path ) ) { -+ if( stat( full_path, &fileinfo ) < 0 ) { -+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); -+ } else { -+ statbuf->size = fileinfo.st_size; -+ statbuf->nr_parts = 1; -+ statbuf->parts_size[0] = statbuf->size; -+ return 0; -+ } -+ } -+ } -+ return -1; -+} -+ - /* Internal, but used from dvd_udf.c */ - int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, - size_t block_count, unsigned char *data, -diff -pruN libdvdread-4.1.3/src/dvd_reader.h libdvdread-4.1.3.new/src/dvd_reader.h ---- libdvdread-4.1.3/src/dvd_reader.h 2008-09-06 23:55:51.000000000 +0200 -+++ libdvdread-4.1.3.new/src/dvd_reader.h 2009-02-28 01:36:49.000000000 +0100 -@@ -115,6 +115,42 @@ typedef enum { - } dvd_read_domain_t; - - /** -+ * -+ */ -+typedef struct { -+ off_t size; /**< Total size of file in bytes */ -+ int nr_parts; /**< Number of file parts */ -+ off_t parts_size[9]; /**< Size of each part in bytes */ -+} dvd_stat_t; -+ -+/** -+ * Stats a file on the DVD given the title number and domain. -+ * The information about the file is stored in a dvd_stat_t -+ * which contains information about the size of the file and -+ * the number of parts in case of a multipart file and the respective -+ * sizes of the parts. -+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB -+ * The size of VTS_02_1.VOB will be stored in stat->parts_size[0], -+ * VTS_02_2.VOB in stat->parts_size[1], ... -+ * The total size (sum of all parts) is stored in stat->size and -+ * stat->nr_parts will hold the number of parts. -+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files. -+ * -+ * This function is only of use if you want to get the size of each file -+ * in the filesystem. These sizes are not needed to use any other -+ * functions in libdvdread. -+ * -+ * @param dvd A dvd read handle. -+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0. -+ * @param domain Which domain. -+ * @param stat Pointer to where the result is stored. -+ * @return If successful 0, otherwise -1. -+ * -+ * int DVDFileStat(dvd, titlenum, domain, stat); -+ */ -+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *); -+ -+/** - * Opens a file on the DVD given the title number and domain. - * - * If the title number is 0, the video manager information is opened diff --git a/abs/core/libdvdread/PKGBUILD b/abs/core/libdvdread/PKGBUILD index 3e5ece3..53a51bc 100644 --- a/abs/core/libdvdread/PKGBUILD +++ b/abs/core/libdvdread/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 80196 2010-05-13 15:59:09Z andrea $ -# Maintainer: +# $Id: PKGBUILD 144377 2011-12-05 12:49:24Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libdvdread -pkgver=4.1.3 -pkgrel=3 +pkgver=4.2.0 +pkgrel=1 pkgdesc="Provides a simple foundation for reading DVD video disks" arch=(i686 x86_64) -url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/" +url="http://dvdnav.mplayerhq.hu" license=('GPL') depends=('glibc') makedepends=('libdvdcss') optdepends=('libdvdcss: for decoding encrypted DVDs') options=('!libtool') -source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2" - 'DVDFileStat.patch') -md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8' - '0e8e8c19f811a06dc761322e208cbda0') +source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097') build() { cd "${srcdir}/${pkgname}-${pkgver}" # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324) - patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1 - ./autogen.sh --prefix=/usr || return 1 - make || return 1 + ./autogen.sh --prefix=/usr + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libdvdread/__changelog b/abs/core/libdvdread/__changelog deleted file mode 100644 index 35387a5..0000000 --- a/abs/core/libdvdread/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -DVDFileStat.patch has DOS new lines. To fix: -sed -i 's/.$//' DVDFileStat.patch diff --git a/abs/core/libedit/PKGBUILD b/abs/core/libedit/PKGBUILD new file mode 100644 index 0000000..3ea5bbf --- /dev/null +++ b/abs/core/libedit/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 153493 2012-03-15 00:07:12Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Roman Cheplyaka <roma@ro-che.info> + +pkgname=libedit +pkgver=20120311_3.0 +pkgrel=1 +pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' +url='http://www.thrysoee.dk/editline/' +arch=('i686' 'x86_64') +license=('BSD') +depends=('ncurses') +options=('!libtool') +source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") +sha1sums=('2a4be10c33af5e3b09c1d3c8829b02fe5b41796b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver/_/-}" + ./configure --prefix=/usr --enable-widec --enable-static=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver/_/-}" + make prefix="${pkgdir}"/usr install + + cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3 + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE +} diff --git a/abs/core/libevent/PKGBUILD b/abs/core/libevent/PKGBUILD index e78d693..a697da6 100644 --- a/abs/core/libevent/PKGBUILD +++ b/abs/core/libevent/PKGBUILD @@ -1,18 +1,18 @@ -# $Id$ -# Maintainer: +# $Id: PKGBUILD 159369 2012-05-22 19:07:09Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Judd <jvinet@zeroflux.org> pkgname=libevent -pkgver=2.0.10 +pkgver=2.0.19 pkgrel=1 pkgdesc="An event notification library" -license=('GPL2') arch=('i686' 'x86_64') url="http://www.monkey.org/~provos/libevent/" +license=('BSD') depends=('openssl') -source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz") +optdepends=('python2: to use event_rpcgen.py') options=('!libtool') -md5sums=('a37401d26cbbf28185211d582741a3d4') +source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -21,8 +21,14 @@ build() { make } -package() { +check() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make DESTDIR=${pkgdir} install + make check || true # this never worked, should be taken upstream } +package() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make DESTDIR="${pkgdir}" install +} +md5sums=('91111579769f46055b0a438f5cc59572' + 'a211997b20913954f744a665f31f77d2') diff --git a/abs/core/libexif/PKGBUILD b/abs/core/libexif/PKGBUILD index 5f4b9c4..52fdc4a 100644 --- a/abs/core/libexif/PKGBUILD +++ b/abs/core/libexif/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 59235 2009-11-21 16:13:46Z jgc $ +# $Id: PKGBUILD 151067 2012-02-24 17:47:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libexif -pkgver=0.6.19 -pkgrel=1 +pkgver=0.6.20 +pkgrel=2 pkgdesc="A library to parse an EXIF file and read the data from those tags" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('LGPL') url="http://sourceforge.net/projects/libexif" depends=('glibc') options=('!libtool') source=(http://downloads.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('56144a030a4c875c600b1ccf713f69f7') +md5sums=('19844ce6b5d075af16f0d45de1e8a6a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libffi/PKGBUILD b/abs/core/libffi/PKGBUILD new file mode 100644 index 0000000..ec02865 --- /dev/null +++ b/abs/core/libffi/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libffi +pkgver=3.0.11 +pkgrel=1 +pkgdesc="A portable, high level programming interface to various calling conventions" +arch=('i686' 'x86_64') +url="http://sourceware.org/libffi" +license=('MIT') +depends=('glibc') +checkdepends=('dejagnu') +options=('!libtool') +install=libffi.install +source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) +md5sums=('f69b9693227d976835b4857b1ba7d0e3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/libffi/libffi.install b/abs/core/libffi/libffi.install new file mode 100644 index 0000000..903bede --- /dev/null +++ b/abs/core/libffi/libffi.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libffi.info.gz) + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/libfontenc/PKGBUILD b/abs/core/libfontenc/PKGBUILD index 19404ac..314c8fc 100644 --- a/abs/core/libfontenc/PKGBUILD +++ b/abs/core/libfontenc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96490 2010-10-21 21:08:10Z jgc $ +# $Id: PKGBUILD 151844 2012-03-03 13:37:37Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfontenc -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 font encoding library" arch=('i686' 'x86_64') @@ -12,19 +12,18 @@ depends=('zlib') makedepends=('pkgconfig' 'xproto>=7.0.18') options=('!libtool') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ba158e4c10a1aff2351ef632def03dec0e0ee11e') +sha1sums=('90bdd53d75585dd0f06ad7bc23faccd8a01bb733') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-encodingsdir=/usr/share/fonts/encodings - - make || return 1 + --with-encodingsdir=/usr/share/fonts/encodings + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libgcrypt/PKGBUILD b/abs/core/libgcrypt/PKGBUILD index 2f27ff0..e3a887b 100644 --- a/abs/core/libgcrypt/PKGBUILD +++ b/abs/core/libgcrypt/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 85547 2010-07-15 21:16:57Z andyrtr $ +# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt -pkgver=1.4.6 -pkgrel=2 +pkgver=1.5.0 +pkgrel=3 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" license=('LGPL') -depends=('libgpg-error>=1.7') -options=(!libtool) +depends=('libgpg-error>=1.10-2') +options=('!libtool' '!emptydirs') +install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('dbf99425a4fe9217c84ce3a35d938634') +sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') build() { cd ${srcdir}/${pkgname}-${pkgver} - # keep static library for , needed for cryptsetup - ./configure --prefix=/usr --disable-padlock-support + ./configure --prefix=/usr \ + --disable-static \ + --disable-padlock-support #$EXTRAFLAGS make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ || return 1 - mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ || return 1 - ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so || return 1 } diff --git a/abs/core/libgcrypt/libgcrypt.install b/abs/core/libgcrypt/libgcrypt.install index 81547f5..79b8782 100644 --- a/abs/core/libgcrypt/libgcrypt.install +++ b/abs/core/libgcrypt/libgcrypt.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(gcrypt.info) +filelist=(gcrypt.info.gz gcrypt.info-1.gz) post_install() { [ -x usr/bin/install-info ] || return 0 @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/libglade/PKGBUILD b/abs/core/libglade/PKGBUILD index ee1611c..182b671 100644 --- a/abs/core/libglade/PKGBUILD +++ b/abs/core/libglade/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 30217 2009-03-17 18:11:58Z jgc $ +# $Id: PKGBUILD 151071 2012-02-24 17:50:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="Allows you to load glade interface files in a program at runtime" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('LGPL') depends=('gtk2>=2.16.0' 'libxml2>=2.7.3') makedepends=('python2' 'pkgconfig') @@ -20,9 +20,13 @@ md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" || return 1 - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 libglade-convert "${pkgdir}/usr/bin/" || return 1 + patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" + PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 libglade-convert "${pkgdir}/usr/bin/" } diff --git a/abs/core/libgpg-error/PKGBUILD b/abs/core/libgpg-error/PKGBUILD index 1c12394..c0cc77f 100644 --- a/abs/core/libgpg-error/PKGBUILD +++ b/abs/core/libgpg-error/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87301 2010-08-12 05:22:29Z andyrtr $ +# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=libgpg-error -pkgver=1.9 +pkgver=1.10 pkgrel=2 pkgdesc="Support library for libgcrypt" arch=(i686 x86_64) @@ -11,8 +11,8 @@ license=('LGPL') depends=('glibc' 'sh') options=(!libtool) source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('521b98aa9395e7eaf0ef2236233a0796') + #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) +md5sums=('736a03daa9dc5873047d4eb4a9c22a16') build() { @@ -21,13 +21,12 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}/" install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/ - ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so } - diff --git a/abs/core/libgssglue/PKGBUILD b/abs/core/libgssglue/PKGBUILD index 12c0698..d651bf6 100644 --- a/abs/core/libgssglue/PKGBUILD +++ b/abs/core/libgssglue/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62214 2010-01-04 09:19:11Z tpowa $ +# $Id: PKGBUILD 133594 2011-07-29 21:01:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libgssglue -pkgver=0.1 -pkgrel=2 -pkgdesc="exports a gssapi interface which calls other random gssapi libraries" +pkgver=0.3 +pkgrel=1 +pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" arch=('i686' 'x86_64') url="http://www.citi.umich.edu/projects/nfsv4/linux/" license=('BSD') @@ -14,19 +14,21 @@ backup=(etc/gssapi_mech.conf) options=('!libtool') source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz gssapi_mech.conf) -md5sums=('ce1b4c758e6de01b712d154c5c97e540' - '234b9cca75a33af98eda3f1683756879') +md5sums=('48aaad11b7371ba3270faa322202c038' + '080be866717e4e06fa6f7d6f43cb395a') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make } + package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install || return 1 + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir/" install + # Configuration - install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf + install -Dm644 "$srcdir"/gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf # install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/libgssglue/COPYING + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/libgssglue/COPYING } diff --git a/abs/core/libgssglue/gssapi_mech.conf b/abs/core/libgssglue/gssapi_mech.conf index f71aca0..9a832ee 100644 --- a/abs/core/libgssglue/gssapi_mech.conf +++ b/abs/core/libgssglue/gssapi_mech.conf @@ -15,8 +15,8 @@ # library initialization function # ================================ ========================== # The MIT K5 gssapi library, use special function for initialization. -#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -/usr/lib/libgssapi.so mechglue_internal_krb5_init +/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init +#/usr/lib/libgssapi.so mechglue_internal_krb5_init # # The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize diff --git a/abs/core/libgusb/PKGBUILD b/abs/core/libgusb/PKGBUILD new file mode 100644 index 0000000..ec1f261 --- /dev/null +++ b/abs/core/libgusb/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 144366 2011-12-05 11:59:52Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgusb +pkgver=0.1.3 +pkgrel=1 +pkgdesc="GLib wrapper around libusb1" +arch=('i686' 'x86_64') +url="https://gitorious.org/gusb/" +license=('LGPL2.1') +depends=('udev') +source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha256sums=('4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/libice/PKGBUILD b/abs/core/libice/PKGBUILD index 70a538c..0144fe7 100644 --- a/abs/core/libice/PKGBUILD +++ b/abs/core/libice/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 96500 2010-10-21 21:18:07Z jgc $ +# $Id: PKGBUILD 151848 2012-03-03 13:42:06Z andyrtr $ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libice -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="X11 Inter-Client Exchange library" arch=('i686' 'x86_64') @@ -12,18 +13,17 @@ makedepends=('pkgconfig' 'xtrans>=1.2.5') options=('!libtool') source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2) license=('custom') -sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d') +sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324') build() { cd "${srcdir}/libICE-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd "${srcdir}/libICE-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/libid3tag/10_utf16.diff b/abs/core/libid3tag/10_utf16.diff new file mode 100644 index 0000000..a3218d2 --- /dev/null +++ b/abs/core/libid3tag/10_utf16.diff @@ -0,0 +1,48 @@ +#! /bin/sh -e +## 10_utf16.dpatch by <kurt@roeckx.be> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Handle bogus UTF16 sequences that have a length that is not +## DP: an even number of 8 bit characters. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c +--- libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.000000000 +0100 ++++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.000000000 +0100 +@@ -282,5 +282,18 @@ + + free(utf16); + ++ if (end == *ptr && length % 2 != 0) ++ { ++ /* We were called with a bogus length. It should always ++ * be an even number. We can deal with this in a few ways: ++ * - Always give an error. ++ * - Try and parse as much as we can and ++ * - return an error if we're called again when we ++ * already tried to parse everything we can. ++ * - tell that we parsed it, which is what we do here. ++ */ ++ (*ptr)++; ++ } ++ + return ucs4; + } diff --git a/abs/core/libid3tag/11_unknown_encoding.diff b/abs/core/libid3tag/11_unknown_encoding.diff new file mode 100644 index 0000000..7387f2f --- /dev/null +++ b/abs/core/libid3tag/11_unknown_encoding.diff @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_unknown_encoding.dpatch by Andreas Henriksson <andreas@fatal.se> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: In case of an unknown/invalid encoding, id3_parse_string() will +## DP: return NULL, but the return value wasn't checked resulting +## DP: in segfault in id3_ucs4_length(). This is the only place +## DP: the return value wasn't checked. + +@DPATCH@ +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { diff --git a/abs/core/libid3tag/CVE-2008-2109.patch b/abs/core/libid3tag/CVE-2008-2109.patch new file mode 100644 index 0000000..26c54c5 --- /dev/null +++ b/abs/core/libid3tag/CVE-2008-2109.patch @@ -0,0 +1,11 @@ +--- field.c.orig 2008-05-05 09:49:15.000000000 -0400 ++++ field.c 2008-05-05 09:49:25.000000000 -0400 +@@ -291,7 +291,7 @@ + + end = *ptr + length; + +- while (end - *ptr > 0) { ++ while (end - *ptr > 0 && **ptr != '\0') { + ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); + if (ucs4 == 0) + goto fail; diff --git a/abs/core/libid3tag/PKGBUILD b/abs/core/libid3tag/PKGBUILD index aad7fb2..6f2b929 100644 --- a/abs/core/libid3tag/PKGBUILD +++ b/abs/core/libid3tag/PKGBUILD @@ -1,21 +1,38 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 150540 2012-02-18 12:17:15Z pierre $ +# Maintainer: +# Contributor: dorphell <dorphell@archlinux.org> + pkgname=libid3tag pkgver=0.15.1b -pkgrel=2 +pkgrel=7 pkgdesc="library for id3 tagging" -url="http://www.underbit.com/products/mad/" -depends=('zlib') arch=('i686' 'x86_64') -source=(ftp://ftp.mars.org/pub/mpeg/$pkgname-$pkgver.tar.gz id3tag.pc) url="http://www.underbit.com/products/mad/" -md5sums=('e5808ad997ba32c498803822078748c3' 'cd5ea001dc24505040b781ad1de9ddf2') +license=('GPL') +depends=('zlib') +makedepends=('gperf') +options=('!libtool') +source=("ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz" + 'id3tag.pc' + '10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch') +md5sums=('e5808ad997ba32c498803822078748c3' + '8bb41fd814fafcc37ec8bc88f5545a4a' + '4f9df4011e6a8c23240fff5de2d05f6e' + '3ca856b97924d48a0fdfeff0bd83ce7d' + 'c51822ea6301b1ca469975f0c9ee8e34') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/10_utf16.diff + patch -p1 -i ${srcdir}/11_unknown_encoding.diff + patch -Np0 -i ${srcdir}/CVE-2008-2109.patch + ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 $startdir/src/id3tag.pc $startdir/pkg/usr/lib/pkgconfig/id3tag.pc - find $startdir/pkg -name '*.la' -exec rm {} \; + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/id3tag.pc" "${pkgdir}/usr/lib/pkgconfig/id3tag.pc" } diff --git a/abs/core/libid3tag/id3tag.pc b/abs/core/libid3tag/id3tag.pc index 07a8fae..3155de7 100644 --- a/abs/core/libid3tag/id3tag.pc +++ b/abs/core/libid3tag/id3tag.pc @@ -6,5 +6,5 @@ includedir=/usr/include Name: ID3TAG Description: libid3tag - ID3 tag manipulation library Version: 0.15.0b -Libs: -L${libdir} -lid3tag -zf +Libs: -L${libdir} -lid3tag -lz Cflags: diff --git a/abs/core/libiec61883/PKGBUILD b/abs/core/libiec61883/PKGBUILD index dbb0b49..cd00382 100644 --- a/abs/core/libiec61883/PKGBUILD +++ b/abs/core/libiec61883/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jason Chu <jason@archlinux.org> +# $Id: PKGBUILD 144006 2011-12-01 16:55:03Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> # Contributor: Stephen Caraher <moskvax@gmail.com> @@ -8,20 +9,22 @@ pkgver=1.2.0 pkgrel=3 pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394" arch=('i686' 'x86_64') -url="http://www.linux1394.org/" +url="http://www.kernel.org/pub/linux/libs/ieee1394/" license=('LGPL') depends=('libraw1394') options=('!libtool') -source=(http://www.kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.gz) +source=("http://ftp.osuosl.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.gz") md5sums=('8af39fff74988073c3ad53fbab147da9') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p0 <$startdir/libiec61883-1.2.0-Makefile.patch + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 -# mkdir -p $startdir/pkg/usr/bin/.libs -# cp $startdir/src/$pkgname-$pkgver/examples/test-mpeg2 $startdir/pkg/usr/bin || return 1 -# cp $startdir/src/$pkgname-$pkgver/examples/.libs/lt-test-mpeg2 $startdir/pkg/usr/bin/.libs || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libiec61883/libiec61883-1.2.0-Makefile.patch b/abs/core/libiec61883/libiec61883-1.2.0-Makefile.patch deleted file mode 100644 index 59166ce..0000000 --- a/abs/core/libiec61883/libiec61883-1.2.0-Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- examples/Makefile.in.orig 2010-01-01 03:30:47.294012274 +0000 -+++ examples/Makefile.in 2010-01-01 03:35:31.530650431 +0000 -@@ -33,8 +33,8 @@ - build_triplet = @build@ - host_triplet = @host@ - noinst_PROGRAMS = test-amdtp$(EXEEXT) test-dv$(EXEEXT) \ -- test-mpeg2$(EXEEXT) test-plugs$(EXEEXT) --bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) -+ test-plugs$(EXEEXT) -+bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) test-mpeg2$(EXEEXT) - subdir = examples - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - ---- examples/Makefile.am.orig 2010-01-01 03:30:57.440678420 +0000 -+++ examples/Makefile.am 2010-01-01 03:33:34.714412431 +0000 -@@ -1,6 +1,6 @@ - --noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs --bin_PROGRAMS = plugreport plugctl -+noinst_PROGRAMS = test-amdtp test-dv test-plugs -+bin_PROGRAMS = plugreport plugctl test-mpeg2 - man_MANS = plugreport.1 plugctl.1 - EXTRA_DIST = plugreport.1 plugctl.1 - diff --git a/abs/core/libirman/PKGBUILD b/abs/core/libirman/PKGBUILD index 3305a78..7e9e0e1 100644 --- a/abs/core/libirman/PKGBUILD +++ b/abs/core/libirman/PKGBUILD @@ -3,20 +3,24 @@ pkgname=libirman pkgver=0.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Irman driver lcd library" arch=('i686' 'x86_64') url="http://www.lirc.org" license=('LGPL') -options=(!libtool) +options=('!libtool') backup=('etc/irman.conf') depends=('glibc') -source=(http://downloads.sourceforge.net/lirc/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/lirc/${pkgname}-${pkgver}.tar.bz2") md5sums=('4a2708d53b6c79659c073cfefed57f78') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libjpeg-turbo/PKGBUILD b/abs/core/libjpeg-turbo/PKGBUILD new file mode 100644 index 0000000..f882559 --- /dev/null +++ b/abs/core/libjpeg-turbo/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> + +pkgname=libjpeg-turbo +pkgver=1.2.1 +pkgrel=1 +pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" +arch=('i686' 'x86_64') +url="http://libjpeg-turbo.virtualgl.org/" +license=('GPL' 'custom') +depends=('glibc') +makedepends=('nasm') +provides=('libjpeg=8.0.2') +conflicts=('libjpeg') +replaces=('libjpeg') +options=('!libtool') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # put documentation in a reasonable directory... + sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in + sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in + + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make test +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + # provide jpegint.h as it is required by various software + install -m644 jpegint.h "$pkgdir/usr/include/" + + # do not distributre libturbojpeg as it is unversioned + rm "$pkgdir"/usr/lib/libturbojpeg.{so,a} + rm "$pkgdir/usr/include/turbojpeg.h" + rm "$pkgdir/usr/bin/tjbench" + + install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" + ln -s ../../doc/libjpeg-turbo/README \ + "$pkgdir/usr/share/licenses/libjpeg-turbo/README" + ln -s ../../doc/libjpeg-turbo/README-turbo.txt \ + "$pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt" +} diff --git a/abs/core/libjpeg/PKGBUILD b/abs/core/libjpeg/PKGBUILD deleted file mode 100644 index bd2b17f..0000000 --- a/abs/core/libjpeg/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 81760 2010-06-02 23:44:07Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=libjpeg -pkgver=8.0.2 -_pkgver=8b -pkgrel=1 -pkgdesc="Library of JPEG support functions" -arch=('i686' 'x86_64') -url="http://www.ijg.org/" -license=('custom') -depends=('glibc') -makedepends=('libtool') -options=('!libtool') -source=(http://www.ijg.org/files/jpegsrc.v${_pkgver}.tar.gz) -md5sums=('e022acbc5b36cd2cb70785f5b575661e') - -build() { - cd $srcdir/jpeg-${_pkgver} - ./configure --prefix=/usr --enable-shared --enable-static - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install - - # See FS#11116 - re-assess current need sometime... - install -m644 jpegint.h $pkgdir/usr/include - - install -Dm644 README $pkgdir/usr/share/licenses/libjpeg/README -} diff --git a/abs/core/libjpeg6/PKGBUILD b/abs/core/libjpeg6/PKGBUILD deleted file mode 100644 index 659aaf6..0000000 --- a/abs/core/libjpeg6/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> -pkgname=libjpeg6 -pkgver=6b -pkgrel=11 -pkgdesc="Library of JPEG support functions" -arch=('i686' 'x86_64') -url="http://ijg.org" -license=('custom') -depends=('glibc') -makedepends=('libtool') -options=(!libtool) -install=libjpeg6.install -source=(ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v$pkgver.tar.gz) -md5sums=('dbd5f3b47ed13132f04c685d608a7547') - -build() { - cd $srcdir/jpeg-$pkgver - cp /usr/share/libtool/config/config.{guess,sub} . - sed -i "s#./libtool#libtool#" configure - ./configure --prefix=/opt/libjpeg6 --enable-shared --enable-static - make || return 1 - mkdir -p $pkgdir/opt/libjpeg6/{bin,lib,include,man/man1} - make prefix=$pkgdir/opt/libjpeg6 mandir=$pkgdir/usr/share/man/man1 install - install -m644 jpegint.h $pkgdir/opt/libjpeg6/include - install -Dm644 README $pkgdir/opt/libjpeg6/share/licenses/libjpeg/README -} diff --git a/abs/core/libjpeg6/libjpeg6.install b/abs/core/libjpeg6/libjpeg6.install deleted file mode 100644 index 0d3173d..0000000 --- a/abs/core/libjpeg6/libjpeg6.install +++ /dev/null @@ -1,25 +0,0 @@ -# arg 1: the new package version -post_install() { - grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf - mv /tmp/ld.so.conf /etc/ld.so.conf - echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf - ldconfig -} -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf - mv /tmp/ld.so.conf /etc/ld.so.conf - echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf - ldconfig -} -# arg 1: the old package version -post_remove() { - grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf - mv /tmp/ld.so.conf /etc/ld.so.conf - ldconfig -} - -op=$1 -shift -$op $* diff --git a/abs/core/libjpeg7/PKGBUILD b/abs/core/libjpeg7/PKGBUILD deleted file mode 100644 index 9622b3d..0000000 --- a/abs/core/libjpeg7/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 43707 2009-06-30 03:59:13Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=libjpeg7 -pkgver=7 -pkgrel=1 -pkgdesc="Library of JPEG support functions, version 7" -arch=('i686' 'x86_64') -url="http://www.ijg.org/" -license=('custom') -depends=('glibc') -makedepends=('libtool') -options=(!libtool) -source=(http://www.ijg.org/files/jpegsrc.v7.tar.gz) -md5sums=('382ef33b339c299b56baf1296cda9785') - -build() { - cd $srcdir/jpeg-$pkgver - ./configure --prefix=/usr --enable-shared --enable-static - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install - - # See FS#11116 - re-assess need with v7 release sometime... - install -m644 jpegint.h $pkgdir/usr/include - - install -Dm644 README $pkgdir/usr/share/licenses/libjpeg7/README - # Fix /usr/bin - for fn in $pkgdir/usr/bin/*; do mv $fn ${fn}7; done - # Fix /usr/lib - rm $pkgdir/usr/lib/libjpeg.{a,so} - # Fix /usr/share/man - for fn in $pkgdir/usr/share/man/man1/*; do mv $fn ${fn%.1}7; done - # Fix /usr/include - mkdir -p $pkgdir/usr/include/libjpeg7 - mv $pkgdir/usr/include/*.h $pkgdir/usr/include/libjpeg7 -} diff --git a/abs/core/libksba/PKGBUILD b/abs/core/libksba/PKGBUILD new file mode 100644 index 0000000..505a606 --- /dev/null +++ b/abs/core/libksba/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 149815 2012-02-11 07:14:25Z tpowa $ +# Maintainer: damir <damir@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=libksba +pkgver=1.2.0 +pkgrel=2 +pkgdesc="A CMS and X.509 access library" +arch=(i686 x86_64) +license=('GPL') +url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" +depends=('bash' 'libgpg-error' 'glibc') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +options=(!libtool) +install=libksba.install + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} +md5sums=('e797f370b69b4dc776499d6a071ae137') diff --git a/abs/core/libksba/libksba.install b/abs/core/libksba/libksba.install new file mode 100644 index 0000000..3715b89 --- /dev/null +++ b/abs/core/libksba/libksba.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(ksba.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/libldap/PKGBUILD b/abs/core/libldap/PKGBUILD deleted file mode 100644 index d99212b..0000000 --- a/abs/core/libldap/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 90284 2010-09-10 11:31:02Z andrea $ -# Maintainer: -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=libldap -pkgver=2.4.23 -pkgrel=1 -pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.openldap.org/" -backup=(etc/openldap/ldap.conf) -depends=('libsasl' 'openssl') -makedepends=('tcp_wrappers') -options=('!libtool') -source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz" - 'ntlm.patch') -md5sums=('90150b8c0d0192e10b30157e68844ddf' - 'dfa9eb6f2fd9d0a3dab0e1860923489e') - -build() { - cd ${srcdir}/openldap-${pkgver} - - patch -Np1 -i ${srcdir}/ntlm.patch - - ./configure --prefix=/usr \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib/openldap \ - --enable-crypt --enable-dynamic \ - --with-threads --enable-wrappers \ - --enable-spasswd --with-cyrus-sasl \ - --disable-bdb --disable-hdb - - cd include - make - - cd ../libraries - make depend - make - - cd ../doc/man/man3 - make - - cd ../man5 - make -} - -package() { - cd ${srcdir}/openldap-${pkgver} - - cd include - make DESTDIR=${pkgdir} install - - cd ../libraries - make DESTDIR=${pkgdir} install - - cd ../doc/man/man3 - make DESTDIR=${pkgdir} install - - cd ../man5 - install -Dm644 ldap.conf.5.tmp \ - ${pkgdir}/usr/share/man/man5/ldap.conf.5 - - # get rid of duplicate default conf files - rm ${pkgdir}/etc/openldap/*.default - - ln -sf liblber.so ${pkgdir}/usr/lib/liblber.so.2 - ln -sf libldap.so ${pkgdir}/usr/lib/libldap.so.2 - - install -Dm644 ${srcdir}/openldap-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/abs/core/libldap/peercred.patch b/abs/core/libldap/peercred.patch deleted file mode 100644 index 7d159b7..0000000 --- a/abs/core/libldap/peercred.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libraries/liblutil/getpeereid.c 2008-02-12 00:24:13.000000000 +0100 -+++ ./libraries/liblutil/getpeereid.c 2008-06-12 12:55:34.000000000 +0200 -@@ -14,6 +14,8 @@ - * <http://www.OpenLDAP.org/license.html>. - */ - -+#define _GNU_SOURCE -+ - #include "portable.h" - - #ifndef HAVE_GETPEEREID diff --git a/abs/core/libmcrypt/PKGBUILD b/abs/core/libmcrypt/PKGBUILD index bdacb84..aae4586 100644 --- a/abs/core/libmcrypt/PKGBUILD +++ b/abs/core/libmcrypt/PKGBUILD @@ -1,22 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 136970 2011-09-04 11:35:09Z pierre $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmcrypt pkgver=2.5.8 -pkgrel=1 +pkgrel=3 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms" -arch=(i686 x86_64) -license=('LGPL') -depends=('glibc') -options=('!libtool') -source=(http://heanet.dl.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2) url="http://mcrypt.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +options=('!libtool' '!emptydirs') +source=("http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2") md5sums=('c4f491dd411a09e9de3b8702ea6f73eb') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/abs/core/libmcrypt/aclocal-fixes.patch b/abs/core/libmcrypt/aclocal-fixes.patch deleted file mode 100644 index f001a18..0000000 --- a/abs/core/libmcrypt/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libmcrypt.m4.orig 2006-03-05 13:47:22.000000000 +0000 -+++ lib/libmcrypt.m4 2006-03-05 13:47:39.000000000 +0000 -@@ -14,7 +14,7 @@ - dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS - dnl --AC_DEFUN(AM_PATH_LIBMCRYPT, -+AC_DEFUN([AM_PATH_LIBMCRYPT], - [dnl - dnl Get the cflags and libraries from the libmcrypt-config script - dnl diff --git a/abs/core/libmp4v2/PKGBUILD b/abs/core/libmp4v2/PKGBUILD index 9182dd2..ceccc58 100644 --- a/abs/core/libmp4v2/PKGBUILD +++ b/abs/core/libmp4v2/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 71330 2010-03-06 18:41:25Z andrea $ -# Maintainer: +# $Id: PKGBUILD 159958 2012-05-27 10:22:24Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libmp4v2 -pkgver=1.9.1 +pkgver=2.0.0 pkgrel=1 pkgdesc="MPEG-4 library" arch=('i686' 'x86_64') license=('MPL') url="http://code.google.com/p/mp4v2/" +depends=('gcc-libs') options=('!libtool') -source=(http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2) -md5sums=('986701929ef15b03155ac4fb16444797') +source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") build() { cd ${srcdir}/mp4v2-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { cd ${srcdir}/mp4v2-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - make DESTDIR=${pkgdir} install-man || return 1 -}
\ No newline at end of file + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install-man +} +md5sums=('c91f06711225b34b4c192c9114887b14') diff --git a/abs/core/libmpc/PKGBUILD b/abs/core/libmpc/PKGBUILD index 9aad761..f482d41 100644 --- a/abs/core/libmpc/PKGBUILD +++ b/abs/core/libmpc/PKGBUILD @@ -1,28 +1,39 @@ -# $Id: PKGBUILD 82441 2010-06-11 06:42:48Z allan $ +# $Id: PKGBUILD 135910 2011-08-20 07:14:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=libmpc -pkgver=0.8.2 +pkgver=0.9 pkgrel=2 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64') -url="http://www.multiprecision.org" +url="http://www.multiprecision.org/" license=('LGPL') depends=('mpfr>=3.0.0') options=('!libtool') install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) -md5sums=('e98267ebd5648a39f881d66797122fb6') +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz + libmpc-0.9-configure_cflags_egrep_issue.patch) +md5sums=('0d6acab8d214bd7d1fbbc593e83dd00d' + '35d5bb02dc6c1153e581b7c34a738a08') build() { - cd $srcdir/mpc-$pkgver + cd "${srcdir}/mpc-${pkgver}" + + # http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html + patch -Np1 -i $srcdir/libmpc-0.9-configure_cflags_egrep_issue.patch + autoreconf + ./configure --prefix=/usr make +} + +check() { + cd "${srcdir}/mpc-${pkgver}" make check } package() { - cd $srcdir/mpc-$pkgver - make DESTDIR=$pkgdir/ install - mv -f $pkgdir/usr/share/info/{mpc,libmpc}.info + cd "${srcdir}/mpc-${pkgver}" + make DESTDIR="${pkgdir}" install + mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info } diff --git a/abs/core/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/abs/core/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch new file mode 100644 index 0000000..3bf3247 --- /dev/null +++ b/abs/core/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch @@ -0,0 +1,63 @@ +--- trunk/configure.ac 2011/02/21 12:18:31 932 ++++ trunk/configure.ac 2011/02/21 16:41:09 936 +@@ -33,7 +33,7 @@ + AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) + +-dnl Extra arguments to configure ++# Extra arguments to configure + AC_ARG_WITH([mpfr_include], + [AC_HELP_STRING([--with-mpfr-include=DIR], + [MPFR include directory])], +@@ -85,18 +85,19 @@ + ) + + +-dnl Setup CC and CFLAGS ++# Setup CC and CFLAGS ++AC_PROG_CC ++AC_LANG(C) + +-dnl Check for user specification of CC or CFLAGS ++# Set up LibTool ++AC_PROG_LIBTOOL ++ ++# Check for user specification of CC or CFLAGS + if test -n "$CFLAGS" || test -n "$CC" ; then + user_redefine_cc=yes + fi + +-# Check for programs +-AC_PROG_CC +-AC_LANG(C) +- +-dnl Check GMP Header ++# Check GMP Header + AC_MSG_CHECKING(for gmp.h) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include "gmp.h" +@@ -105,22 +106,19 @@ + AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) + ]) + +-dnl Check for GMP CFLAGS in gmp.h ++# Check for GMP CFLAGS in gmp.h + if test -z "$user_redefine_cc" ; then + MPC_GMP_CC_CFLAGS + fi + + +-dnl Configs for Windows DLLs ++# Configs for Windows DLLs + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + MPC_WINDOWS + esac + + +-dnl Finally set up LibTool +-AC_PROG_LIBTOOL +- + # Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/abs/core/libmpc/libmpc.install b/abs/core/libmpc/libmpc.install index bb20831..b0718c7 100644 --- a/abs/core/libmpc/libmpc.install +++ b/abs/core/libmpc/libmpc.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(libmpc.info) post_install() { diff --git a/abs/core/libmysqlclient/PKGBUILD b/abs/core/libmysqlclient/PKGBUILD deleted file mode 100644 index 5ab1e46..0000000 --- a/abs/core/libmysqlclient/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 23680 2009-01-11 15:55:34Z douglas $ -# Maintainer: judd <jvinet@zeroflux.org> - -pkgname=libmysqlclient -pkgver=5.0.75 -pkgrel=2 -pkgdesc="MySQL client libraries" -arch=(i686 x86_64) -depends=('openssl' 'zlib') -makedepends=('gcc' 'readline' 'tcp_wrappers' 'libtool') -options=('!libtool') -license=('GPL') -url=('http://www.mysql.com/') -source=(http://mysql.cce.usp.br/Downloads/MySQL-5.0/mysql-$pkgver.tar.gz) - -build() { - # PIC - export CFLAGS="-fPIC ${CFLAGS}" - cd $startdir/src/mysql-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/sbin \ - --localstatedir=/var --sysconfdir=/etc \ - --without-debug --without-docs --without-bench --without-readline \ - --with-innodb --enable-local-infile --with-ssl \ - --with-charset=latin1 --with-collation=latin1_general_ci \ - --with-extra-charsets=complex --enable-thread-safe-client \ - --with-libwrap --with-berkeley-db - - for dir in include strings regex mysys dbug extra; do - pushd ${dir} || return 1 - make || return 1 - popd - done - for dir in libmysql libmysql_r; do - pushd ${dir} || return 1 - make link_sources - make || return 1 - make DESTDIR=${startdir}/pkg install - popd - done - cd include - make DESTDIR=${startdir}/pkg install - - cd ../scripts - make mysql_config - mkdir -p ${startdir}/pkg/usr/bin - install -m755 mysql_config ${startdir}/pkg/usr/bin - - # create library symlinks in /usr/lib - ln -sf mysql/libmysqlclient.so.15 $startdir/pkg/usr/lib/libmysqlclient.so.15 - ln -sf libmysqlclient.so.15 $startdir/pkg/usr/lib/libmysqlclient.so - ln -sf libmysqlclient.so.15 $startdir/pkg/usr/lib/libmysqlclient.so.1 - ln -sf mysql/libmysqlclient_r.so.15 $startdir/pkg/usr/lib/libmysqlclient_r.so.15 - ln -sf libmysqlclient_r.so.15 $startdir/pkg/usr/lib/libmysqlclient_r.so - ln -sf libmysqlclient_r.so.15 $startdir/pkg/usr/lib/libmysqlclient_r.so.1 -} -md5sums=('a234f0a60a7f8c290d9875cba3a2c5a2') diff --git a/abs/core/libnl/PKGBUILD b/abs/core/libnl/PKGBUILD new file mode 100644 index 0000000..da91aed --- /dev/null +++ b/abs/core/libnl/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 162745 2012-06-29 11:46:12Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=libnl +pkgver=3.2.11 +pkgrel=1 +pkgdesc="Library for applications dealing with netlink sockets" +arch=(i686 x86_64) +url="http://www.infradead.org/~tgr/libnl/" +license=(GPL) +depends=(glibc) +backup=(etc/libnl/classid etc/libnl/pktloc) +options=(!libtool) +source=("$url/files/$pkgname-$pkgver.tar.gz") +sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/core/libogg/PKGBUILD b/abs/core/libogg/PKGBUILD index b42aaa6..35bfbff 100644 --- a/abs/core/libogg/PKGBUILD +++ b/abs/core/libogg/PKGBUILD @@ -1,28 +1,38 @@ -# $Id: PKGBUILD 80639 2010-05-20 16:07:01Z ibiru $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ +# Maintainer: # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 +pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64') url="http://www.xiph.org/ogg/" license=('BSD') depends=('glibc') options=('!libtool') -source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz) -md5sums=('c95b73759acfc30712beef6ce4e88efa') +source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz + config_types.h) +md5sums=('84a35715170f2cd4c77a4448772b95d5' + 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + cd "$srcdir/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } + package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install || return 1 + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + +# install BSD license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # install BSD license - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING +# Resolve multilib conflict + if [[ $CARCH == "x86_64" ]]; then + mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h + install -m 644 "$srcdir/config_types.h" \ + "${pkgdir}/usr/include/ogg/config_types.h" + fi } diff --git a/abs/core/libogg/config_types.h b/abs/core/libogg/config_types.h new file mode 100644 index 0000000..8297a7a --- /dev/null +++ b/abs/core/libogg/config_types.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "config_types-32.h" +#elif __WORDSIZE == 64 +#include "config_types-64.h" +#else +#error "Unknown word size" +#endif diff --git a/abs/core/libpcap/PKGBUILD b/abs/core/libpcap/PKGBUILD index d471be1..ddafe52 100644 --- a/abs/core/libpcap/PKGBUILD +++ b/abs/core/libpcap/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 77149 2010-04-11 11:02:48Z thomas $ +# $Id: PKGBUILD 162746 2012-06-29 11:46:18Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap -pkgver=1.1.1 +pkgver=1.3.0 pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" license=('BSD') -depends=('glibc' 'libnl') +depends=('glibc' 'libnl' 'sh' 'libusbx') makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz) -sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85') +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} + libnl32.patch) build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ipv6 - make || return 1 - make shared || return 1 + patch -Np1 -i "${srcdir}/libnl32.patch" + autoreconf -f -i + ./configure --prefix=/usr --enable-ipv6 --with-libnl + make } + package() { cd ${srcdir}/${pkgname}-${pkgver} - install -d -m755 ${pkgdir}/usr/bin - make DESTDIR=${pkgdir} install install-shared || return 1 -# ln -s libpcap.so.${pkgver} ${pkgdir}/usr/lib/libpcap.so.1 -# ln -s libpcap.so.${pkgver} ${pkgdir}/usr/lib/libpcap.so + make DESTDIR=${pkgdir} install + # remove static library + rm -rf ${pkgdir}/usr/lib/libpcap.a + # backwards compatibility, programs often look for net/bpf.h mkdir -p ${pkgdir}/usr/include/net cd ${pkgdir}/usr/include/net @@ -34,3 +36,6 @@ package() { #install the license install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +md5sums=('f78455a92622b7a3c05c58b6ad1cec7e' + 'acf4f6ed8c7839dc935e807a2731316e' + 'd2c8c21d69d90d6370022583bfb29cf2') diff --git a/abs/core/libpcap/__changelog b/abs/core/libpcap/__changelog deleted file mode 100644 index 381637b..0000000 --- a/abs/core/libpcap/__changelog +++ /dev/null @@ -1 +0,0 @@ -PKGBUILD: comment out calls to create symlinks to libpcap.so...they already exist diff --git a/abs/core/libpcap/libnl32.patch b/abs/core/libpcap/libnl32.patch new file mode 100644 index 0000000..633fd00 --- /dev/null +++ b/abs/core/libpcap/libnl32.patch @@ -0,0 +1,19 @@ +diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in +--- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 ++++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 +@@ -433,12 +433,13 @@ + # + # Try libnl 2.x first. + # +- AC_CHECK_LIB(nl, nl_socket_alloc, ++ AC_CHECK_LIB(nl-3, nl_socket_alloc, + [ + # + # Yes, we have libnl 2.x. + # +- LIBS="-lnl-genl -lnl $LIBS" ++ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" ++ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" + AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) + AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) + ], diff --git a/abs/core/libpciaccess/PKGBUILD b/abs/core/libpciaccess/PKGBUILD index 07d67f8..4b5bc2e 100644 --- a/abs/core/libpciaccess/PKGBUILD +++ b/abs/core/libpciaccess/PKGBUILD @@ -1,27 +1,28 @@ # $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libpciaccess -pkgver=0.12.0 +pkgver=0.13.1 pkgrel=1 pkgdesc="X11 PCI access library" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') makedepends=('pkgconfig' 'xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1c77be1cf04a88bb21232e823bd9a64dab393398') +sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libpipeline/PKGBUILD b/abs/core/libpipeline/PKGBUILD new file mode 100644 index 0000000..4ba224b --- /dev/null +++ b/abs/core/libpipeline/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 160243 2012-05-31 15:59:08Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=libpipeline +pkgver=1.2.1 +pkgrel=1 +pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" +arch=('i686' 'x86_64') +url="http://libpipeline.nongnu.org/" +license=('GPL') +depends=('glibc') +options=('!libtool') +source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) +md5sums=('20896c919eca4acb3d2f13012fb7ba02') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i '/gets is a security hole/d' gnulib/lib/stdio.in.h + + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/abs/core/libpipeline/__changelog b/abs/core/libpipeline/__changelog new file mode 100644 index 0000000..e43f0c1 --- /dev/null +++ b/abs/core/libpipeline/__changelog @@ -0,0 +1,2 @@ + '/gets is a security hole/d' gnulib/lib/stdio.in.h + diff --git a/abs/core/libpng/PKGBUILD b/abs/core/libpng/PKGBUILD index 5dd7a5d..f37b138 100644 --- a/abs/core/libpng/PKGBUILD +++ b/abs/core/libpng/PKGBUILD @@ -1,45 +1,41 @@ -# $Id: PKGBUILD 94202 2010-10-05 08:24:27Z jgc $ +# $Id: PKGBUILD 161912 2012-06-16 14:11:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.4.4 -_apngver=1.4.4 +pkgver=1.5.11 +_apngver=1.5.11 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') url="http://www.libpng.org/pub/png/libpng.html" license=('custom') -depends=('zlib') +depends=('zlib' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('0342d1cedb9b9a80294dd1b1e2ec9ae9' - 'd5cd185e7da764a10ff9046d42449259') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") +md5sums=('57f838299e701b6db9e8389c5602dc18' + 'e9ddf7670e78ad93f4cc189c884d4f26') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" - - #libtoolize --force --copy - #aclocal - #autoconf - #automake --add-missing + patch -p1 -i ../libpng-$_apngver-apng.patch ./configure --prefix=/usr - make || return 1 + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install cd contrib/pngminus - make PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png - install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/" - install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png + install -m755 png2pnm pnm2png "$pkgdir/usr/bin/" + install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/core/libpng12/PKGBUILD b/abs/core/libpng12/PKGBUILD deleted file mode 100644 index 17ff1d0..0000000 --- a/abs/core/libpng12/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 58551 2009-11-08 22:37:12Z eric $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Maintainer: Travis Willard <travis@archlinux.org> -# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=libpng12 -_realname=libpng -pkgver=1.2.44 -pkgrel=1 -pkgdesc="A collection of routines used to create PNG format graphics files" -arch=('i686' 'x86_64') -url="http://www.libpng.org/pub/png/libpng.html" -license=('custom') -depends=('zlib') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${_realname}/${_realname}-${pkgver}.tar.bz2" - "http://littlesvr.ca/apng/diff/libpng-1.2.44-apng.patch") - -md5sums=('e3ac7879d62ad166a6f0c7441390d12b' - '8cb91087fd91000d2e35823587a2e7ef') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # Add animated PNG (apng) support - # see http://hp.vector.co.jp/authors/VA013651/freeSoftware/apng.html - patch -Np0 -i "${srcdir}/libpng-1.2.44-apng.patch" || return 1 - - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - - ./configure --prefix=/usr || return 1 - make ECHO=echo || return 1 - make ECHO=echo DESTDIR="${pkgdir}" install || return 1 - - #cd contrib/pngminus - #make ECHO=echo PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png - #install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/" - #install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 - # only libs needed - rm -rf ${pkgdir}/usr/lib/{libpng.so,libpng.a,pkgconfig} - rm -rf ${pkgdir}/usr/{include,share,bin} -} diff --git a/abs/core/libraw1394/PKGBUILD b/abs/core/libraw1394/PKGBUILD index 6b6c4bb..5bee5d9 100644 --- a/abs/core/libraw1394/PKGBUILD +++ b/abs/core/libraw1394/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 63209 2010-01-16 07:32:59Z tpowa $ +# $Id: PKGBUILD 149545 2012-02-08 13:57:56Z tpowa $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libraw1394 -pkgver=2.0.5 -pkgrel=1 +pkgver=2.0.7 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL2.1') pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver" depends=('glibc') makedepends=('pkgconfig') -url="http://www.linux1394.org/" -options=(!libtool force) -source=(http://downloads.sourceforge.net/project/libraw1394/libraw1394/${pkgname}-${pkgver}.tar.gz) +url="https://ieee1394.wiki.kernel.org/index.php/Main_Page" +options=(!libtool) +source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.bz2) build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make } -md5sums=('1db64231c78540c32859b591cb8b40cf') + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('997ef18ab8e2e21f3966dff00e92be28') diff --git a/abs/core/librpcsecgss/PKGBUILD b/abs/core/librpcsecgss/PKGBUILD index 690f075..71bb1bf 100644 --- a/abs/core/librpcsecgss/PKGBUILD +++ b/abs/core/librpcsecgss/PKGBUILD @@ -1,38 +1,32 @@ -# $Id: PKGBUILD 75199 2010-04-01 02:12:58Z pierre $ +# $Id: PKGBUILD 142792 2011-11-15 09:00:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> pkgname=librpcsecgss pkgver=0.19 -pkgrel=3 +pkgrel=7 pkgdesc="Library for RPCSECGSS support" arch=('i686' 'x86_64') url="http://www.citi.umich.edu/projects/nfsv4/linux/" license=('GPL') -depends=('glibc' 'heimdal') -makedepends=('pkgconfig' 'autoconf') +depends=('glibc' 'krb5' 'libgssglue') +makedepends=('pkg-config' 'autoconf') options=('!libtool') -source=("http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz" - librpcsecgss-0.18-heimdal.patch) -md5sums=('b45ed565bdc3099023aa35830ec92997' - '0cfe088551d5776f5bc08c1741a34346') +source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('b45ed565bdc3099023aa35830ec92997') build() { - cd "$srcdir/$pkgname-$pkgver" - - # Patch from gentoo for heimdal compatibility Bug #231395 - # http://bugs.gentoo.org/show_bug.cgi?id=231395 - patch -Np1 -i $srcdir/librpcsecgss-0.18-heimdal.patch || return 1 - - rm -f config.guess config.sub ltmain.sh - autoreconf -i - - GSSAPI_CFLAGS='-I/usr/include/gssapi' \ + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir/" install } diff --git a/abs/core/librsvg/PKGBUILD b/abs/core/librsvg/PKGBUILD index 41cbf51..284f405 100644 --- a/abs/core/librsvg/PKGBUILD +++ b/abs/core/librsvg/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 99478 2010-11-14 19:57:09Z ibiru $ +# $Id: PKGBUILD 156916 2012-04-23 09:09:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.32.1 +pkgver=2.36.1 pkgrel=1 -pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" +pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') -depends=('gtk2>=2.22.0' 'libcroco>=0.6.2') -makedepends=('intltool' 'gtk-doc') -optdepends=('python2: rsvg commandline utility') -options=('!libtool') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3') +options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \ - --with-croco --disable-static \ - --with-svgz --enable-gtk-theme + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/abs/core/librsvg/librsvg.install b/abs/core/librsvg/librsvg.install index 4d48b07..8852ebf 100644 --- a/abs/core/librsvg/librsvg.install +++ b/abs/core/librsvg/librsvg.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { diff --git a/abs/core/libsasl/0003_saslauthd_mdoc.patch b/abs/core/libsasl/0003_saslauthd_mdoc.patch new file mode 100644 index 0000000..694f4bb --- /dev/null +++ b/abs/core/libsasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/abs/core/libsasl/0010_maintainer_mode.patch b/abs/core/libsasl/0010_maintainer_mode.patch new file mode 100644 index 0000000..cf3d02a --- /dev/null +++ b/abs/core/libsasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by <fabbe@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/abs/core/libsasl/0011_saslauthd_ac_prog_libtool.patch b/abs/core/libsasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 0000000..3805b48 --- /dev/null +++ b/abs/core/libsasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by <fabbe@debian.org> + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/abs/core/libsasl/0012_xopen_crypt_prototype.patch b/abs/core/libsasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 0000000..d50ec83 --- /dev/null +++ b/abs/core/libsasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> + +When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/abs/core/libsasl/0016_pid_file_lock_creation_mask.patch b/abs/core/libsasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 0000000..e9170ce --- /dev/null +++ b/abs/core/libsasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/abs/core/libsasl/0018_auth_rimap_quotes.patch b/abs/core/libsasl/0018_auth_rimap_quotes.patch new file mode 100644 index 0000000..13fa999 --- /dev/null +++ b/abs/core/libsasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/abs/core/libsasl/0019_ldap_deprecated.patch b/abs/core/libsasl/0019_ldap_deprecated.patch new file mode 100644 index 0000000..8825256 --- /dev/null +++ b/abs/core/libsasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm <fabbe@debian.org>) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include <openssl/des.h> + #endif + ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + #include <lber.h> + #include <sasl.h> diff --git a/abs/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/abs/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 0000000..a49b553 --- /dev/null +++ b/abs/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/abs/core/libsasl/0025_ld_as_needed.patch b/abs/core/libsasl/0025_ld_as_needed.patch new file mode 100644 index 0000000..67b48b4 --- /dev/null +++ b/abs/core/libsasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose <doko@ubuntu.com> +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/abs/core/libsasl/0026_drop_krb5support_dependency.patch b/abs/core/libsasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 0000000..cc00867 --- /dev/null +++ b/abs/core/libsasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez <roberto@connexer.com> +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/abs/core/libsasl/0027_db5_support.patch b/abs/core/libsasl/0027_db5_support.patch new file mode 100644 index 0000000..5228240 --- /dev/null +++ b/abs/core/libsasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý <ondrej@debian.org> +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/abs/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/abs/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 0000000..14a3224 --- /dev/null +++ b/abs/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/abs/core/libsasl/PKGBUILD b/abs/core/libsasl/PKGBUILD index e5ba8e9..e668cda 100644 --- a/abs/core/libsasl/PKGBUILD +++ b/abs/core/libsasl/PKGBUILD @@ -1,54 +1,202 @@ -# $Id: PKGBUILD 96213 2010-10-19 11:41:43Z allan $ +# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +#pkgbase=('cyrus-sasl') +#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.23 -pkgrel=5 +pkgrel=9 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') -url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" +url="http://cyrusimap.web.cmu.edu/" license=('custom') -depends=('db>=4.8') -optdepends=('cyrus-sasl: saslauthd' - 'cyrus-sasl-plugins: authentication plugins other than sasldb') +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-db.patch) -options=('!makeflags') + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.conf.d + saslauthd) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' 'e27ddff076342e7a3041c4759817d04b' - '0658201497aad359c0d66b0ab8032859') + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') build() { cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch - patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-anon \ - --disable-cram \ - --disable-digest \ - --disable-gssapi \ - --enable-login \ - --disable-otp \ - --enable-plain \ - --mandir=/usr/share/man - for dir in include lib sasldb plugins utils; do - pushd ${dir} - make - popd - done + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom + make } -package() { +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + conflicts=('cyrus-sasl-plugins') + cd "${srcdir}/cyrus-sasl-${pkgver}" for dir in include lib sasldb plugins utils; do - pushd ${dir} || return 1 + pushd ${dir} make DESTDIR="${pkgdir}" install popd done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}-${pkgrel}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + backup=('etc/conf.d/saslauthd') + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 -d "${pkgdir}/etc/conf.d" + install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - # install license - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" } diff --git a/abs/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/abs/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 0000000..1294cb5 --- /dev/null +++ b/abs/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/abs/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/abs/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 0000000..8cd71c0 --- /dev/null +++ b/abs/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/abs/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/abs/core/libsasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 0000000..fd35632 --- /dev/null +++ b/abs/core/libsasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/abs/core/libsasl/cyrus-sasl-2.1.22-qa.patch b/abs/core/libsasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 0000000..4f7b04f --- /dev/null +++ b/abs/core/libsasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include <config.h> ++#include <stdio.h> + #include <sasl.h> + #include <prop.h> + #include <ctype.h> +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include <shadow.h> ++#include <string.h> + + extern char *crypt(); + diff --git a/abs/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/abs/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 0000000..f5f372d --- /dev/null +++ b/abs/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include <string.h> + #include <stdlib.h> + #include <pwd.h> ++#include <unistd.h> + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/abs/core/libsasl/cyrus-sasl-db.patch b/abs/core/libsasl/cyrus-sasl-db.patch deleted file mode 100644 index 08758ab..0000000 --- a/abs/core/libsasl/cyrus-sasl-db.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4 ---- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000 +0200 -+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392 +0200 -@@ -213,7 +213,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include <db.h>], ---- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28 17:09:18.000000000 +0200 -+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 +0200 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13 20:56:17.000000000 +0100 -+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556 +0200 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/abs/core/libsasl/saslauthd b/abs/core/libsasl/saslauthd new file mode 100644 index 0000000..6afafae --- /dev/null +++ b/abs/core/libsasl/saslauthd @@ -0,0 +1,49 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="saslauthd" +SASLAUTHD_BIN=/usr/sbin/saslauthd +SASLAUTHD_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $DAEMON_NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/libsasl/saslauthd.conf.d b/abs/core/libsasl/saslauthd.conf.d new file mode 100644 index 0000000..1672112 --- /dev/null +++ b/abs/core/libsasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" diff --git a/abs/core/libsm/PKGBUILD b/abs/core/libsm/PKGBUILD index 6bfe83f..945778b 100644 --- a/abs/core/libsm/PKGBUILD +++ b/abs/core/libsm/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 97792 2010-11-01 22:14:37Z jgc $ +# $Id: PKGBUILD 151850 2012-03-03 13:43:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsm -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="X11 Session Management library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libice' 'util-linux-ng') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2) -sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d') +sha1sums=('8d354a165e330022ffd3606aba562b8c8154213d') build() { cd "${srcdir}/libSM-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd "${srcdir}/libSM-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/libsndfile/ChangeLog b/abs/core/libsndfile/ChangeLog deleted file mode 100644 index f96b790..0000000 --- a/abs/core/libsndfile/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -2010-10-11 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.23-1 - * Upstream update - -2010-10-05 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.22-1 - * Upstream update - -2010-08-23 Eric Belanger <eric@archlinux.org> - - * Removed jack makedepends and optdepends (close FS#20574) - -2009-12-30 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.21-1 - * Upstream update - * Updated source url - -2009-07-09 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.20-3 - * Added libvorbis depends (close FS#15313) - -2009-06-03 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.20-2 - * Added jack-audio-connection-kit support (close FS#14658) - -2009-05-14 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.20-1 - * Upstream update - -2009-03-03 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.19-1 - * Upstream update - -2009-02-07 Eric Belanger <eric@archlinux.org> - - * libsndfile 1.0.18-1 - * Upstream update - * Added license - * Added ChangeLog diff --git a/abs/core/libsndfile/PKGBUILD b/abs/core/libsndfile/PKGBUILD index 8acc8f7..cff3c64 100644 --- a/abs/core/libsndfile/PKGBUILD +++ b/abs/core/libsndfile/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 94887 2010-10-11 21:28:29Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libsndfile -pkgver=1.0.23 -pkgrel=1 +pkgver=1.0.25 +pkgrel=2 pkgdesc="A C library for reading and writing files containing sampled sound" arch=('i686' 'x86_64') url="http://www.mega-nerd.com/libsndfile" license=('LGPL') depends=('alsa-lib' 'flac' 'libvorbis') +checkdepends=('python2') options=('!libtool') -changelog=ChangeLog -source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('d0e22b5ff2ef945615db33960376d733') -sha1sums=('dee36861b503fe7754f0131364523f45720a0914') +source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e' + 'a93d26016730cb9fa214c753d079ee77dca1f326') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \ + src/create_symbols_file.py programs/test-sndfile-metadata-set.py ./configure --prefix=/usr --disable-sqlite make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libsndfile/flac-1.1.4.dpatch b/abs/core/libsndfile/flac-1.1.4.dpatch deleted file mode 100644 index a0b68b5..0000000 --- a/abs/core/libsndfile/flac-1.1.4.dpatch +++ /dev/null @@ -1,486 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## flac-1.1.4.dpatch by Samuel Mimram <smimram@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adapt to FLAC 1.1.4 API. -## DP: Patch stolen from http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/lib/libsndfile/flac-1.1.4.patch. - -@DPATCH@ -diff -ruN libsndfile-1.0.17/configure libsndfile-1.0.17-new/configure ---- libsndfile-1.0.17/configure 2006-08-31 12:55:50.000000000 +0200 -+++ libsndfile-1.0.17-new/configure 2008-04-18 18:56:48.000000000 +0200 -@@ -31226,7 +31226,8 @@ - _ACEOF - - fi -- FLAC_LIBS="-lFLAC" -+ # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg -+ FLAC_LIBS="-lFLAC -logg" - fi - fi - -diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c ---- libsndfile-1.0.17~/src/flac.c 2006-08-31 11:22:19.000000000 +0200 -+++ libsndfile-1.0.17/src/flac.c 2007-06-15 12:38:53.000000000 +0200 -@@ -46,6 +46,13 @@ - #include "sfendian.h" - #include "float_cast.h" - -+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */ -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - /*------------------------------------------------------------------------------ - ** Private static functions. - */ -@@ -60,8 +67,14 @@ - } PFLAC_PCM ; - - typedef struct --{ FLAC__SeekableStreamDecoder *fsd ; -+{ -+#ifdef LEGACY_FLAC -+ FLAC__SeekableStreamDecoder *fsd ; - FLAC__SeekableStreamEncoder *fse ; -+#else -+ FLAC__StreamDecoder *fsd ; -+ FLAC__StreamEncoder *fse ; -+#endif - PFLAC_PCM pcmtype ; - void* ptr ; - unsigned pos, len, remain ; -@@ -108,6 +121,7 @@ - static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; - - /* Decoder Callbacks */ -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ; - static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ; - static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ; -@@ -116,13 +130,29 @@ - static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ; - static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ; - static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ; -+#else -+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ; -+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ; -+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ; -+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ; -+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ; -+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ; -+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ; -+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ; -+#endif - - /* Encoder Callbacks */ -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ; - #ifdef HAVE_FLAC_1_1_1 - static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ; - #endif - static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ; -+#else -+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ; -+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ; -+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ; -+#endif - - static const int legal_sample_rates [] = - { 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000 -@@ -283,51 +313,99 @@ - } /* flac_buffer_copy */ - - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderReadStatus - sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data) -+#else -+static FLAC__StreamDecoderReadStatus -+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - *bytes = psf_fread (buffer, 1, *bytes, psf) ; - if (*bytes > 0 && psf->error == 0) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ; - - return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ; -+#else -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ; -+ -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT ; -+#endif - } /* sf_flac_read_callback */ - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderSeekStatus - sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data) -+#else -+static FLAC__StreamDecoderSeekStatus -+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - psf_fseek (psf, absolute_byte_offset, SEEK_SET) ; - if (psf->error) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ; - - return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ; -+#else -+ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ; -+ -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK ; -+#endif - } /* sf_flac_seek_callback */ - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderTellStatus - sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data) -+#else -+static FLAC__StreamDecoderTellStatus -+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - *absolute_byte_offset = psf_ftell (psf) ; - if (psf->error) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ; - - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ; -+#else -+ return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ; -+ -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK ; -+#endif - } /* sf_flac_tell_callback */ - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderLengthStatus - sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data) -+#else -+static FLAC__StreamDecoderLengthStatus -+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - if ((*stream_length = psf->filelength) == 0) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ; - - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ; -+#else -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ; -+ -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ; -+#endif - } /* sf_flac_length_callback */ - - static FLAC__bool -+#ifdef LEGACY_FLAC - sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data) -+#else -+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - if (psf_ftell (psf) == psf->filelength) -@@ -337,7 +415,11 @@ - } /* sf_flac_eof_callback */ - - static FLAC__StreamDecoderWriteStatus -+#ifdef LEGACY_FLAC - sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) -+#else -+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - -@@ -353,7 +435,11 @@ - } /* sf_flac_write_callback */ - - static void -+#ifdef LEGACY_FLAC - sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data) -+#else -+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - switch (metadata->type) -@@ -387,7 +473,11 @@ - } /* sf_flac_meta_callback */ - - static void -+#ifdef LEGACY_FLAC - sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data) -+#else -+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ; -@@ -407,17 +497,29 @@ - return ; - } /* sf_flac_error_callback */ - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamEncoderSeekStatus - sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data) -+#else -+static FLAC__StreamEncoderSeekStatus -+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - psf_fseek (psf, absolute_byte_offset, SEEK_SET) ; - if (psf->error) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ; - - return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ; -+#else -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ; -+ -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ; -+#endif - } /* sf_flac_enc_seek_callback */ - -+#ifdef LEGACY_FLAC - #ifdef HAVE_FLAC_1_1_1 - static FLAC__SeekableStreamEncoderTellStatus - sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data) -@@ -430,9 +532,25 @@ - return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ; - } /* sf_flac_enc_tell_callback */ - #endif -+#else -+static FLAC__StreamEncoderTellStatus -+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data) -+{ SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; -+ -+ *absolute_byte_offset = psf_ftell (psf) ; -+ if (psf->error) -+ return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ; -+ -+ return FLAC__STREAM_ENCODER_TELL_STATUS_OK ; -+} /* sf_flac_enc_tell_callback */ -+#endif - - static FLAC__StreamEncoderWriteStatus -+#ifdef LEGACY_FLAC - sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data) -+#else -+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data) -+#endif - { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; - - if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0) -@@ -509,15 +627,27 @@ - return 0 ; - - if (psf->mode == SFM_WRITE) -- { FLAC__seekable_stream_encoder_finish (pflac->fse) ; -+ { -+#ifdef LEGACY_FLAC -+ FLAC__seekable_stream_encoder_finish (pflac->fse) ; - FLAC__seekable_stream_encoder_delete (pflac->fse) ; -+#else -+ FLAC__stream_encoder_finish (pflac->fse) ; -+ FLAC__stream_encoder_delete (pflac->fse) ; -+#endif - if (pflac->encbuffer) - free (pflac->encbuffer) ; - } ; - - if (psf->mode == SFM_READ) -- { FLAC__seekable_stream_decoder_finish (pflac->fsd) ; -+ { -+#ifdef LEGACY_FLAC -+ FLAC__seekable_stream_decoder_finish (pflac->fsd) ; - FLAC__seekable_stream_decoder_delete (pflac->fsd) ; -+#else -+ FLAC__stream_decoder_finish (pflac->fsd) ; -+ FLAC__stream_decoder_delete (pflac->fsd) ; -+#endif - } ; - - for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++) -@@ -546,17 +676,6 @@ - return SFE_FLAC_BAD_SAMPLE_RATE ; - - psf_fseek (psf, 0, SEEK_SET) ; -- if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL) -- return SFE_FLAC_NEW_DECODER ; -- FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ; -- FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ; -- --#ifdef HAVE_FLAC_1_1_1 -- FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ; --#endif -- FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ; -- FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ; -- FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ; - - switch (psf->sf.format & SF_FORMAT_SUBMASK) - { case SF_FORMAT_PCM_S8 : -@@ -574,12 +693,36 @@ - break ; - } ; - -+#ifdef LEGACY_FLAC -+ if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL) -+ return SFE_FLAC_NEW_DECODER ; -+ FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ; -+ FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ; -+ -+#ifdef HAVE_FLAC_1_1_1 -+ FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ; -+#endif -+ FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ; -+ FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ; -+ FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ; - FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ; - - if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK) - { psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ; - return SFE_FLAC_INIT_DECODER ; - } ; -+#else -+ if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL) -+ return SFE_FLAC_NEW_DECODER ; -+ FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ; -+ FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ; -+ FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ; -+ -+ if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) -+ { psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ; -+ return SFE_FLAC_INIT_DECODER ; -+ } ; -+#endif - - if (psf->error == 0) - psf->dataoffset = psf_ftell (psf) ; -@@ -593,6 +736,7 @@ - { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - - psf_fseek (psf, 0, SEEK_SET) ; -+#ifdef LEGACY_FLAC - if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL) - return SFE_FLAC_NEW_DECODER ; - -@@ -610,9 +754,22 @@ - return SFE_FLAC_INIT_DECODER ; - - FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ; -+#else -+ if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL) -+ return SFE_FLAC_NEW_DECODER ; -+ -+ if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK) -+ return SFE_FLAC_INIT_DECODER ; -+ -+ FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ; -+#endif - if (psf->error == 0) - { FLAC__uint64 position ; -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ; -+#else -+ FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; -+#endif - psf->dataoffset = position ; - } ; - -@@ -676,10 +833,18 @@ - flac_buffer_copy (psf) ; - - while (pflac->pos < pflac->len) -- { if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0) -+ { -+#ifdef LEGACY_FLAC -+ if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0) - break ; - if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK) - break ; -+#else -+ if (FLAC__stream_decoder_process_single (pflac->fsd) == 0) -+ break ; -+ if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM) -+ break ; -+#endif - } ; - - pflac->ptr = NULL ; -@@ -795,7 +960,11 @@ - while (len > 0) - { writecount = (len >= bufferlen) ? bufferlen : (int) len ; - convert (ptr + total, buffer, writecount) ; -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#else -+ if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#endif - thiswrite = writecount ; - else - break ; -@@ -837,7 +1006,11 @@ - while (len > 0) - { writecount = (len >= bufferlen) ? bufferlen : (int) len ; - convert (ptr + total, buffer, writecount) ; -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#else -+ if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#endif - thiswrite = writecount ; - else - break ; -@@ -879,7 +1052,11 @@ - while (len > 0) - { writecount = (len >= bufferlen) ? bufferlen : (int) len ; - convert (ptr + total, buffer, writecount, psf->norm_float) ; -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#else -+ if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#endif - thiswrite = writecount ; - else - break ; -@@ -1011,7 +1188,11 @@ - while (len > 0) - { writecount = (len >= bufferlen) ? bufferlen : (int) len ; - convert (ptr + total, buffer, writecount, psf->norm_double) ; -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#else -+ if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) -+#endif - thiswrite = writecount ; - else - break ; -@@ -1131,10 +1312,17 @@ - - if (psf->mode == SFM_READ) - { FLAC__uint64 position ; -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset)) - { FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ; - return offset ; - } ; -+#else -+ if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset)) -+ { FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; -+ return offset ; -+ } ; -+#endif - - return ((sf_count_t) -1) ; - } ; diff --git a/abs/core/libsndfile/lossy_comp_test-overflow.dpatch b/abs/core/libsndfile/lossy_comp_test-overflow.dpatch deleted file mode 100644 index bf5c829..0000000 --- a/abs/core/libsndfile/lossy_comp_test-overflow.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## lossy_comp_test-overflow.dpatch by Martin Michlmayr <tbm@cyrius.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Avoid a possible overflow in sum_abs. -## DP: See #362414. - -@DPATCH@ -diff -urNad libsndfile-1.0.17~/tests/lossy_comp_test.c libsndfile-1.0.17/tests/lossy_comp_test.c ---- libsndfile-1.0.17~/tests/lossy_comp_test.c 2006-08-31 11:22:07.000000000 +0200 -+++ libsndfile-1.0.17/tests/lossy_comp_test.c 2007-04-07 10:33:05.000000000 +0200 -@@ -691,7 +691,8 @@ - lcomp_test_int (const char *filename, int filetype, int channels, double margin) - { SNDFILE *file ; - SF_INFO sfinfo ; -- int k, m, *orig, *data, sum_abs ; -+ int k, m, *orig, *data ; -+ long long sum_abs ; - long datalen, seekpos ; - double scale ; - diff --git a/abs/core/libsndfile/overflow.dpatch b/abs/core/libsndfile/overflow.dpatch deleted file mode 100644 index 108b68c..0000000 --- a/abs/core/libsndfile/overflow.dpatch +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## overflow.dpatch by Samuel Mimram <smimram@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix a buffer overflow (CVE-2007-4974). See #443386. - -@DPATCH@ -diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c ---- libsndfile-1.0.17~/src/flac.c 2007-09-20 23:38:16.000000000 +0000 -+++ libsndfile-1.0.17/src/flac.c 2007-09-20 23:38:16.000000000 +0000 -@@ -57,7 +57,7 @@ - ** Private static functions. - */ - --#define ENC_BUFFER_SIZE 4096 -+#define ENC_BUFFER_SIZE 8192 - - typedef enum - { PFLAC_PCM_SHORT = 0, -@@ -202,6 +202,17 @@ - const FLAC__int32* const *buffer = pflac->wbuffer ; - unsigned i = 0, j, offset ; - -+ /* -+ ** frame->header.blocksize is variable and we're using a constant blocksize -+ ** of FLAC__MAX_BLOCK_SIZE. -+ ** Check our assumptions here. -+ */ -+ if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE) -+ { psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ; -+ psf->error = SFE_INTERNAL ; -+ return 0 ; -+ } ; -+ - if (pflac->ptr == NULL) - { /* - ** Not sure why this code is here and not elsewhere. -@@ -210,7 +221,7 @@ - pflac->bufferbackup = SF_TRUE ; - for (i = 0 ; i < frame->header.channels ; i++) - { if (pflac->rbuffer [i] == NULL) -- pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ; -+ pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ; - memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ; - } ; - pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ; diff --git a/abs/core/libssh2/PKGBUILD b/abs/core/libssh2/PKGBUILD new file mode 100644 index 0000000..520b900 --- /dev/null +++ b/abs/core/libssh2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 159788 2012-05-27 02:25:20Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.4.2 +pkgrel=1 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +provides=('libssh2.so') +options=('!libtool') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3' + '872cfb1d61dbd5acd0481ab030e8f130') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/abs/core/libtasn1/PKGBUILD b/abs/core/libtasn1/PKGBUILD index f43ca76..20d5bf4 100644 --- a/abs/core/libtasn1/PKGBUILD +++ b/abs/core/libtasn1/PKGBUILD @@ -1,26 +1,36 @@ -# $Id: PKGBUILD 79844 2010-05-08 11:48:57Z jgc $ +# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=2.6 -pkgrel=3 +pkgver=2.13 +pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') -options=('!libtool' '!emptydirs') +options=('!libtool') install=libtasn1.install -source=(ftp://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz) -md5sums=('d410671e13038324336917ceed7470a5') +source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) +sha1sums=('89120584bfedd244dab92df99e955a174c481851' + '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --with-packager=Archlinux \ --with-packager-bug-reports="http://bugs.archlinux.org/" \ - --with-packager-version=${pkgver}-${pkgrel} || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --with-packager-version=${pkgver}-${pkgrel} + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libthai/PKGBUILD b/abs/core/libthai/PKGBUILD index f96f7f3..8b2db3e 100644 --- a/abs/core/libthai/PKGBUILD +++ b/abs/core/libthai/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 71220 2010-03-05 15:38:39Z jgc $ +# $Id: PKGBUILD 156262 2012-04-16 13:46:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> + pkgname=libthai -pkgver=0.1.14 +pkgver=0.1.17 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" arch=('i686' 'x86_64') license=('LGPL') -depends=('libdatrie>=0.2.3') +depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('34f64b37ed8f8f49f4a18ae972e6f41e') +md5sums=('d94ddbf5e5a09a911c459f0a4ad1c041') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/libtheora/PKGBUILD b/abs/core/libtheora/PKGBUILD index 1592aa5..89cdaec 100644 --- a/abs/core/libtheora/PKGBUILD +++ b/abs/core/libtheora/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57638 2009-11-01 07:56:06Z eric $ +# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $ # Maintainer: Tom Killian <tom@archlinux.org> # Committer: dorphell <dorphell@archlinux.org> pkgname=libtheora pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open video codec developed by the Xiph.org" arch=('i686' 'x86_64') url="http://www.xiph.org" @@ -12,17 +12,20 @@ license=('BSD') depends=('libogg') makedepends=('libvorbis') options=('!libtool') -source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2) +source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') build() { cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr --enable-shared --disable-static + make } +package() { + cd "${srcdir}/libtheora-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/libtiff/CVE-2006-3459-3465.patch b/abs/core/libtiff/CVE-2006-3459-3465.patch deleted file mode 100644 index cb55b03..0000000 --- a/abs/core/libtiff/CVE-2006-3459-3465.patch +++ /dev/null @@ -1,669 +0,0 @@ -diff -ru tiff-3.8.2/libtiff/tif_dir.c tiff-3.8.2-goo/libtiff/tif_dir.c ---- tiff-3.8.2/libtiff/tif_dir.c 2006-03-21 16:42:50.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_dir.c 2006-07-14 13:52:01.027562000 +0100 -@@ -122,6 +122,7 @@ - { - static const char module[] = "_TIFFVSetField"; - -+ const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY); - TIFFDirectory* td = &tif->tif_dir; - int status = 1; - uint32 v32, i, v; -@@ -195,10 +196,12 @@ - break; - case TIFFTAG_ORIENTATION: - v = va_arg(ap, uint32); -+ const TIFFFieldInfo* fip; - if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) { -+ fip = _TIFFFieldWithTag(tif, tag); - TIFFWarningExt(tif->tif_clientdata, tif->tif_name, - "Bad value %lu for \"%s\" tag ignored", -- v, _TIFFFieldWithTag(tif, tag)->field_name); -+ v, fip ? fip->field_name : "Unknown"); - } else - td->td_orientation = (uint16) v; - break; -@@ -387,11 +390,15 @@ - * happens, for example, when tiffcp is used to convert between - * compression schemes and codec-specific tags are blindly copied. - */ -+ /* -+ * better not dereference fip if it is NULL. -+ * -- taviso@google.com 15 Jun 2006 -+ */ - if(fip == NULL || fip->field_bit != FIELD_CUSTOM) { - TIFFErrorExt(tif->tif_clientdata, module, - "%s: Invalid %stag \"%s\" (not supported by codec)", - tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", -- _TIFFFieldWithTag(tif, tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - status = 0; - break; - } -@@ -468,7 +475,7 @@ - if (fip->field_type == TIFF_ASCII) - _TIFFsetString((char **)&tv->value, va_arg(ap, char *)); - else { -- tv->value = _TIFFmalloc(tv_size * tv->count); -+ tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag Value"); - if (!tv->value) { - status = 0; - goto end; -@@ -563,7 +570,7 @@ - } - } - if (status) { -- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); -+ TIFFSetFieldBit(tif, fip->field_bit); - tif->tif_flags |= TIFF_DIRTYDIRECT; - } - -@@ -572,12 +579,12 @@ - return (status); - badvalue: - TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"", -- tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name); -+ tif->tif_name, v, fip ? fip->field_name : "Unknown"); - va_end(ap); - return (0); - badvalue32: - TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %ld for \"%s\"", -- tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name); -+ tif->tif_name, v32, fip ? fip->field_name : "Unknown"); - va_end(ap); - return (0); - } -@@ -813,12 +820,16 @@ - * If the client tries to get a tag that is not valid - * for the image's codec then we'll arrive here. - */ -+ /* -+ * dont dereference fip if it's NULL. -+ * -- taviso@google.com 15 Jun 2006 -+ */ - if( fip == NULL || fip->field_bit != FIELD_CUSTOM ) - { - TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField", - "%s: Invalid %stag \"%s\" (not supported by codec)", - tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", -- _TIFFFieldWithTag(tif, tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - ret_val = 0; - break; - } -diff -ru tiff-3.8.2/libtiff/tif_dirinfo.c tiff-3.8.2-goo/libtiff/tif_dirinfo.c ---- tiff-3.8.2/libtiff/tif_dirinfo.c 2006-02-07 13:51:03.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_dirinfo.c 2006-07-14 13:52:00.953558000 +0100 -@@ -775,7 +775,8 @@ - TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag", - "Internal error, unknown tag 0x%x", - (unsigned int) tag); -- assert(fip != NULL); -+ /* assert(fip != NULL); */ -+ - /*NOTREACHED*/ - } - return (fip); -@@ -789,7 +790,8 @@ - if (!fip) { - TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName", - "Internal error, unknown tag %s", field_name); -- assert(fip != NULL); -+ /* assert(fip != NULL); */ -+ - /*NOTREACHED*/ - } - return (fip); -diff -ru tiff-3.8.2/libtiff/tif_dirread.c tiff-3.8.2-goo/libtiff/tif_dirread.c ---- tiff-3.8.2/libtiff/tif_dirread.c 2006-03-21 16:42:50.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_dirread.c 2006-07-14 13:52:00.842557000 +0100 -@@ -29,6 +29,9 @@ - * - * Directory Read Support Routines. - */ -+ -+#include <limits.h> -+ - #include "tiffiop.h" - - #define IGNORE 0 /* tag placeholder used below */ -@@ -81,6 +84,7 @@ - uint16 dircount; - toff_t nextdiroff; - int diroutoforderwarning = 0; -+ int compressionknown = 0; - toff_t* new_dirlist; - - tif->tif_diroff = tif->tif_nextdiroff; -@@ -147,13 +151,20 @@ - } else { - toff_t off = tif->tif_diroff; - -- if (off + sizeof (uint16) > tif->tif_size) { -- TIFFErrorExt(tif->tif_clientdata, module, -- "%s: Can not read TIFF directory count", -- tif->tif_name); -- return (0); -+ /* -+ * Check for integer overflow when validating the dir_off, otherwise -+ * a very high offset may cause an OOB read and crash the client. -+ * -- taviso@google.com, 14 Jun 2006. -+ */ -+ if (off + sizeof (uint16) > tif->tif_size || -+ off > (UINT_MAX - sizeof(uint16))) { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "%s: Can not read TIFF directory count", -+ tif->tif_name); -+ return (0); - } else -- _TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16)); -+ _TIFFmemcpy(&dircount, tif->tif_base + off, -+ sizeof (uint16)); - off += sizeof (uint16); - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabShort(&dircount); -@@ -254,6 +265,7 @@ - while (fix < tif->tif_nfields && - tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag) - fix++; -+ - if (fix >= tif->tif_nfields || - tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) { - -@@ -264,17 +276,23 @@ - dp->tdir_tag, - dp->tdir_tag, - dp->tdir_type); -- -- TIFFMergeFieldInfo(tif, -- _TIFFCreateAnonFieldInfo(tif, -- dp->tdir_tag, -- (TIFFDataType) dp->tdir_type), -- 1 ); -+ /* -+ * creating anonymous fields prior to knowing the compression -+ * algorithm (ie, when the field info has been merged) could cause -+ * crashes with pathological directories. -+ * -- taviso@google.com 15 Jun 2006 -+ */ -+ if (compressionknown) -+ TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag, -+ (TIFFDataType) dp->tdir_type), 1 ); -+ else goto ignore; -+ - fix = 0; - while (fix < tif->tif_nfields && - tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag) - fix++; - } -+ - /* - * Null out old tags that we ignore. - */ -@@ -326,6 +344,7 @@ - dp->tdir_type, dp->tdir_offset); - if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v)) - goto bad; -+ else compressionknown++; - break; - /* XXX: workaround for broken TIFFs */ - } else if (dp->tdir_type == TIFF_LONG) { -@@ -540,6 +559,7 @@ - * Attempt to deal with a missing StripByteCounts tag. - */ - if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) { -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); - /* - * Some manufacturers violate the spec by not giving - * the size of the strips. In this case, assume there -@@ -556,7 +576,7 @@ - "%s: TIFF directory is missing required " - "\"%s\" field, calculating from imagelength", - tif->tif_name, -- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); -+ fip ? fip->field_name : "Unknown"); - if (EstimateStripByteCounts(tif, dir, dircount) < 0) - goto bad; - /* -@@ -580,6 +600,7 @@ - } else if (td->td_nstrips == 1 - && td->td_stripoffset[0] != 0 - && BYTECOUNTLOOKSBAD) { -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); - /* - * XXX: Plexus (and others) sometimes give a value of zero for - * a tag when they don't know what the correct value is! Try -@@ -589,13 +610,14 @@ - TIFFWarningExt(tif->tif_clientdata, module, - "%s: Bogus \"%s\" field, ignoring and calculating from imagelength", - tif->tif_name, -- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); -+ fip ? fip->field_name : "Unknown"); - if(EstimateStripByteCounts(tif, dir, dircount) < 0) - goto bad; - } else if (td->td_planarconfig == PLANARCONFIG_CONTIG - && td->td_nstrips > 2 - && td->td_compression == COMPRESSION_NONE - && td->td_stripbytecount[0] != td->td_stripbytecount[1]) { -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); - /* - * XXX: Some vendors fill StripByteCount array with absolutely - * wrong values (it can be equal to StripOffset array, for -@@ -604,7 +626,7 @@ - TIFFWarningExt(tif->tif_clientdata, module, - "%s: Wrong \"%s\" field, ignoring and calculating from imagelength", - tif->tif_name, -- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); -+ fip ? fip->field_name : "Unknown"); - if (EstimateStripByteCounts(tif, dir, dircount) < 0) - goto bad; - } -@@ -870,7 +892,13 @@ - - register TIFFDirEntry *dp; - register TIFFDirectory *td = &tif->tif_dir; -- uint16 i; -+ -+ /* i is used to iterate over td->td_nstrips, so must be -+ * at least the same width. -+ * -- taviso@google.com 15 Jun 2006 -+ */ -+ -+ uint32 i; - - if (td->td_stripbytecount) - _TIFFfree(td->td_stripbytecount); -@@ -947,16 +975,18 @@ - static int - CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count) - { -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); -+ - if (count > dir->tdir_count) { - TIFFWarningExt(tif->tif_clientdata, tif->tif_name, - "incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, -+ fip ? fip->field_name : "Unknown", - dir->tdir_count, count); - return (0); - } else if (count < dir->tdir_count) { - TIFFWarningExt(tif->tif_clientdata, tif->tif_name, - "incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, -+ fip ? fip->field_name : "Unknown", - dir->tdir_count, count); - return (1); - } -@@ -970,6 +1000,7 @@ - TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp) - { - int w = TIFFDataWidth((TIFFDataType) dir->tdir_type); -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - tsize_t cc = dir->tdir_count * w; - - /* Check for overflow. */ -@@ -1013,7 +1044,7 @@ - bad: - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Error fetching data for field \"%s\"", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - return (tsize_t) 0; - } - -@@ -1039,10 +1070,12 @@ - static int - cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv) - { -+ const TIFFFieldInfo* fip; - if (denom == 0) { -+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "%s: Rational with zero denominator (num = %lu)", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num); -+ fip ? fip->field_name : "Unknown", num); - return (0); - } else { - if (dir->tdir_type == TIFF_RATIONAL) -@@ -1159,6 +1192,20 @@ - static int - TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir) - { -+ /* -+ * Prevent overflowing the v stack arrays below by performing a sanity -+ * check on tdir_count, this should never be greater than two. -+ * -- taviso@google.com 14 Jun 2006. -+ */ -+ if (dir->tdir_count > 2) { -+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); -+ TIFFWarningExt(tif->tif_clientdata, tif->tif_name, -+ "unexpected count for field \"%s\", %lu, expected 2; ignored.", -+ fip ? fip->field_name : "Unknown", -+ dir->tdir_count); -+ return 0; -+ } -+ - switch (dir->tdir_type) { - case TIFF_BYTE: - case TIFF_SBYTE: -@@ -1329,14 +1376,15 @@ - case TIFF_DOUBLE: - return (TIFFFetchDoubleArray(tif, dir, (double*) v)); - default: -+ { const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - /* TIFF_NOTYPE */ - /* TIFF_ASCII */ - /* TIFF_UNDEFINED */ - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "cannot read TIFF_ANY type %d for field \"%s\"", - dir->tdir_type, -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); -- return (0); -+ fip ? fip->field_name : "Unknown"); -+ return (0); } - } - return (1); - } -@@ -1351,6 +1399,9 @@ - int ok = 0; - const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag); - -+ if (fip == NULL) { -+ return (0); -+ } - if (dp->tdir_count > 1) { /* array of values */ - char* cp = NULL; - -@@ -1493,6 +1544,7 @@ - TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl) - { - uint16 samples = tif->tif_dir.td_samplesperpixel; -+ const TIFFFieldInfo* fip; - int status = 0; - - if (CheckDirCount(tif, dir, (uint32) samples)) { -@@ -1510,9 +1562,10 @@ - - for (i = 1; i < check_count; i++) - if (v[i] != v[0]) { -+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Cannot handle different per-sample values for field \"%s\"", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - goto bad; - } - *pl = v[0]; -@@ -1534,6 +1587,7 @@ - TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl) - { - uint16 samples = tif->tif_dir.td_samplesperpixel; -+ const TIFFFieldInfo* fip; - int status = 0; - - if (CheckDirCount(tif, dir, (uint32) samples)) { -@@ -1551,9 +1605,10 @@ - check_count = samples; - for (i = 1; i < check_count; i++) - if (v[i] != v[0]) { -+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Cannot handle different per-sample values for field \"%s\"", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - goto bad; - } - *pl = v[0]; -@@ -1574,6 +1629,7 @@ - TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl) - { - uint16 samples = tif->tif_dir.td_samplesperpixel; -+ const TIFFFieldInfo* fip; - int status = 0; - - if (CheckDirCount(tif, dir, (uint32) samples)) { -@@ -1591,9 +1647,10 @@ - - for (i = 1; i < check_count; i++) - if (v[i] != v[0]) { -+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Cannot handle different per-sample values for field \"%s\"", -- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); -+ fip ? fip->field_name : "Unknown"); - goto bad; - } - *pl = v[0]; -diff -ru tiff-3.8.2/libtiff/tif_fax3.c tiff-3.8.2-goo/libtiff/tif_fax3.c ---- tiff-3.8.2/libtiff/tif_fax3.c 2006-03-21 16:42:50.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_fax3.c 2006-07-14 13:52:00.669557000 +0100 -@@ -1136,6 +1136,7 @@ - Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap) - { - Fax3BaseState* sp = Fax3State(tif); -+ const TIFFFieldInfo* fip; - - assert(sp != 0); - assert(sp->vsetparent != 0); -@@ -1181,7 +1182,13 @@ - default: - return (*sp->vsetparent)(tif, tag, ap); - } -- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); -+ -+ if ((fip = _TIFFFieldWithTag(tif, tag))) { -+ TIFFSetFieldBit(tif, fip->field_bit); -+ } else { -+ return (0); -+ } -+ - tif->tif_flags |= TIFF_DIRTYDIRECT; - return (1); - } -diff -ru tiff-3.8.2/libtiff/tif_jpeg.c tiff-3.8.2-goo/libtiff/tif_jpeg.c ---- tiff-3.8.2/libtiff/tif_jpeg.c 2006-03-21 16:42:50.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_jpeg.c 2006-07-14 13:52:00.655560000 +0100 -@@ -722,15 +722,31 @@ - segment_width = TIFFhowmany(segment_width, sp->h_sampling); - segment_height = TIFFhowmany(segment_height, sp->v_sampling); - } -- if (sp->cinfo.d.image_width != segment_width || -- sp->cinfo.d.image_height != segment_height) { -+ if (sp->cinfo.d.image_width < segment_width || -+ sp->cinfo.d.image_height < segment_height) { - TIFFWarningExt(tif->tif_clientdata, module, - "Improper JPEG strip/tile size, expected %dx%d, got %dx%d", - segment_width, - segment_height, - sp->cinfo.d.image_width, - sp->cinfo.d.image_height); -+ } -+ -+ if (sp->cinfo.d.image_width > segment_width || -+ sp->cinfo.d.image_height > segment_height) { -+ /* -+ * This case could be dangerous, if the strip or tile size has been -+ * reported as less than the amount of data jpeg will return, some -+ * potential security issues arise. Catch this case and error out. -+ * -- taviso@google.com 14 Jun 2006 -+ */ -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "JPEG strip/tile size exceeds expected dimensions," -+ "expected %dx%d, got %dx%d", segment_width, segment_height, -+ sp->cinfo.d.image_width, sp->cinfo.d.image_height); -+ return (0); - } -+ - if (sp->cinfo.d.num_components != - (td->td_planarconfig == PLANARCONFIG_CONTIG ? - td->td_samplesperpixel : 1)) { -@@ -761,6 +777,22 @@ - sp->cinfo.d.comp_info[0].v_samp_factor, - sp->h_sampling, sp->v_sampling); - -+ /* -+ * There are potential security issues here for decoders that -+ * have already allocated buffers based on the expected sampling -+ * factors. Lets check the sampling factors dont exceed what -+ * we were expecting. -+ * -- taviso@google.com 14 June 2006 -+ */ -+ if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling || -+ sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "Cannot honour JPEG sampling factors that" -+ " exceed those specified."); -+ return (0); -+ } -+ -+ - /* - * XXX: Files written by the Intergraph software - * has different sampling factors stored in the -@@ -1521,15 +1553,18 @@ - { - JPEGState *sp = JState(tif); - -- assert(sp != 0); -+ /* assert(sp != 0); */ - - tif->tif_tagmethods.vgetfield = sp->vgetparent; - tif->tif_tagmethods.vsetfield = sp->vsetparent; - -- if( sp->cinfo_initialized ) -- TIFFjpeg_destroy(sp); /* release libjpeg resources */ -- if (sp->jpegtables) /* tag value */ -- _TIFFfree(sp->jpegtables); -+ if (sp != NULL) { -+ if( sp->cinfo_initialized ) -+ TIFFjpeg_destroy(sp); /* release libjpeg resources */ -+ if (sp->jpegtables) /* tag value */ -+ _TIFFfree(sp->jpegtables); -+ } -+ - _TIFFfree(tif->tif_data); /* release local state */ - tif->tif_data = NULL; - -@@ -1541,6 +1576,7 @@ - { - JPEGState* sp = JState(tif); - TIFFDirectory* td = &tif->tif_dir; -+ const TIFFFieldInfo* fip; - uint32 v32; - - assert(sp != NULL); -@@ -1606,7 +1642,13 @@ - default: - return (*sp->vsetparent)(tif, tag, ap); - } -- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); -+ -+ if ((fip = _TIFFFieldWithTag(tif, tag))) { -+ TIFFSetFieldBit(tif, fip->field_bit); -+ } else { -+ return (0); -+ } -+ - tif->tif_flags |= TIFF_DIRTYDIRECT; - return (1); - } -@@ -1726,7 +1768,11 @@ - { - JPEGState* sp = JState(tif); - -- assert(sp != NULL); -+ /* assert(sp != NULL); */ -+ if (sp == NULL) { -+ TIFFWarningExt(tif->tif_clientdata, "JPEGPrintDir", "Unknown JPEGState"); -+ return; -+ } - - (void) flags; - if (TIFFFieldSet(tif,FIELD_JPEGTABLES)) -diff -ru tiff-3.8.2/libtiff/tif_next.c tiff-3.8.2-goo/libtiff/tif_next.c ---- tiff-3.8.2/libtiff/tif_next.c 2005-12-21 12:33:56.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_next.c 2006-07-14 13:52:00.556567000 +0100 -@@ -105,11 +105,16 @@ - * as codes of the form <color><npixels> - * until we've filled the scanline. - */ -+ /* -+ * Ensure the run does not exceed the scanline -+ * bounds, potentially resulting in a security issue. -+ * -- taviso@google.com 14 Jun 2006. -+ */ - op = row; - for (;;) { - grey = (n>>6) & 0x3; - n &= 0x3f; -- while (n-- > 0) -+ while (n-- > 0 && npixels < imagewidth) - SETPIXEL(op, grey); - if (npixels >= (int) imagewidth) - break; -diff -ru tiff-3.8.2/libtiff/tif_pixarlog.c tiff-3.8.2-goo/libtiff/tif_pixarlog.c ---- tiff-3.8.2/libtiff/tif_pixarlog.c 2006-03-21 16:42:50.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_pixarlog.c 2006-07-14 13:52:00.483557000 +0100 -@@ -768,7 +768,19 @@ - if (tif->tif_flags & TIFF_SWAB) - TIFFSwabArrayOfShort(up, nsamples); - -- for (i = 0; i < nsamples; i += llen, up += llen) { -+ /* -+ * if llen is not an exact multiple of nsamples, the decode operation -+ * may overflow the output buffer, so truncate it enough to prevent that -+ * but still salvage as much data as possible. -+ * -- taviso@google.com 14th June 2006 -+ */ -+ if (nsamples % llen) -+ TIFFWarningExt(tif->tif_clientdata, module, -+ "%s: stride %lu is not a multiple of sample count, " -+ "%lu, data truncated.", tif->tif_name, llen, nsamples); -+ -+ -+ for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) { - switch (sp->user_datafmt) { - case PIXARLOGDATAFMT_FLOAT: - horizontalAccumulateF(up, llen, sp->stride, -diff -ru tiff-3.8.2/libtiff/tif_read.c tiff-3.8.2-goo/libtiff/tif_read.c ---- tiff-3.8.2/libtiff/tif_read.c 2005-12-21 12:33:56.000000000 +0000 -+++ tiff-3.8.2-goo/libtiff/tif_read.c 2006-07-14 13:52:00.467568000 +0100 -@@ -31,6 +31,8 @@ - #include "tiffiop.h" - #include <stdio.h> - -+#include <limits.h> -+ - int TIFFFillStrip(TIFF*, tstrip_t); - int TIFFFillTile(TIFF*, ttile_t); - static int TIFFStartStrip(TIFF*, tstrip_t); -@@ -272,7 +274,13 @@ - if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) - _TIFFfree(tif->tif_rawdata); - tif->tif_flags &= ~TIFF_MYBUFFER; -- if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) { -+ /* -+ * This sanity check could potentially overflow, causing an OOB read. -+ * verify that offset + bytecount is > offset. -+ * -- taviso@google.com 14 Jun 2006 -+ */ -+ if ( td->td_stripoffset[strip] + bytecount > tif->tif_size || -+ bytecount > (UINT_MAX - td->td_stripoffset[strip])) { - /* - * This error message might seem strange, but it's - * what would happen if a read were done instead. -@@ -470,7 +478,13 @@ - if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) - _TIFFfree(tif->tif_rawdata); - tif->tif_flags &= ~TIFF_MYBUFFER; -- if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) { -+ /* -+ * We must check this calculation doesnt overflow, potentially -+ * causing an OOB read. -+ * -- taviso@google.com 15 Jun 2006 -+ */ -+ if (td->td_stripoffset[tile] + bytecount > tif->tif_size || -+ bytecount > (UINT_MAX - td->td_stripoffset[tile])) { - tif->tif_curtile = NOTILE; - return (0); - } diff --git a/abs/core/libtiff/ChangeLog b/abs/core/libtiff/ChangeLog deleted file mode 100644 index 88edcc7..0000000 --- a/abs/core/libtiff/ChangeLog +++ /dev/null @@ -1,35 +0,0 @@ -2010-06-20 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.4-1 - * Upstream update - -2009-11-05 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.2-1 - * Upstream update - -2009-08-28 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.1-1 - * Upstream update - -2009-08-26 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.0-1 - * Upstream update - * Updated url - * Updated patches - -2009-08-14 Eric Belanger <eric@archlinux.org> - - * libtiff 3.8.2-6 - * Added security fixes (close FS#15931) - -2008-09-05 Eric Belanger <eric@archlinux.org> - - * libtiff 3.8.2-4 - * Applied patch to fix buffer underflow in LZW decoding (tiff-3.8.2-CVE-2008-2327.patch) - * Added license - * Added freeglut optdepends - * FHS man pages - * Added ChangeLog diff --git a/abs/core/libtiff/PKGBUILD b/abs/core/libtiff/PKGBUILD index ed80a2b..2606aa1 100644 --- a/abs/core/libtiff/PKGBUILD +++ b/abs/core/libtiff/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 83314 2010-06-20 21:43:27Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 162307 2012-06-24 20:44:52Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff -pkgver=3.9.4 +pkgver=4.0.2 pkgrel=1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib') -makedepends=('libgl' 'freeglut' 'libxmu' 'libxi') +depends=('libjpeg' 'zlib' 'xz') +makedepends=('freeglut') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \ - libtiff-CVE-2009-2285.patch) -md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a') -sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) +sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352') build() { cd "${srcdir}/tiff-${pkgver}" - patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1 - make || return 1 + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/tiff-${pkgver}" + make check } package() { cd "${srcdir}/tiff-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/libtiff/libtiff-CVE-2009-2285.patch b/abs/core/libtiff/libtiff-CVE-2009-2285.patch deleted file mode 100644 index 435a84b..0000000 --- a/abs/core/libtiff/libtiff-CVE-2009-2285.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: tiff-3.8.2/libtiff/tif_lzw.c -=================================================================== ---- tiff-3.8.2.orig/libtiff/tif_lzw.c -+++ tiff-3.8.2/libtiff/tif_lzw.c -@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); -@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); diff --git a/abs/core/libtiff/tiff-3.8.2-CVE-2008-2327.patch b/abs/core/libtiff/tiff-3.8.2-CVE-2008-2327.patch deleted file mode 100644 index e6d74a6..0000000 --- a/abs/core/libtiff/tiff-3.8.2-CVE-2008-2327.patch +++ /dev/null @@ -1,64 +0,0 @@ -Fixes security issues in libTIFF's handling of LZW-encoded -images. The use of uninitialized data could lead to a buffer -underflow and a crash or arbitrary code execution. - -CVE-ID: CVE-2008-2327 -Security bug: https://bugs.gentoo.org/show_bug.cgi?id=234080 - -Index: tiff-3.8.2/libtiff/tif_lzw.c -=================================================================== ---- tiff-3.8.2.orig/libtiff/tif_lzw.c -+++ tiff-3.8.2/libtiff/tif_lzw.c -@@ -237,6 +237,12 @@ LZWSetupDecode(TIFF* tif) - sp->dec_codetab[code].length = 1; - sp->dec_codetab[code].next = NULL; - } while (code--); -+ /* -+ * Zero-out the unused entries -+ */ -+ _TIFFmemset(&sp->dec_codetab[CODE_CLEAR], 0, -+ (CODE_FIRST-CODE_CLEAR)*sizeof (code_t)); -+ - } - return (1); - } -@@ -408,12 +414,19 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - break; - if (code == CODE_CLEAR) { - free_entp = sp->dec_codetab + CODE_FIRST; -+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t)); - nbits = BITS_MIN; - nbitsmask = MAXCODE(BITS_MIN); - maxcodep = sp->dec_codetab + nbitsmask-1; - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -+ if (code == CODE_CLEAR) { -+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name, -+ "LZWDecode: Corrupted LZW table at scanline %d", -+ tif->tif_row); -+ return (0); -+ } - *op++ = (char)code, occ--; - oldcodep = sp->dec_codetab + code; - continue; -@@ -604,12 +617,19 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - break; - if (code == CODE_CLEAR) { - free_entp = sp->dec_codetab + CODE_FIRST; -+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t)); - nbits = BITS_MIN; - nbitsmask = MAXCODE(BITS_MIN); - maxcodep = sp->dec_codetab + nbitsmask; - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -+ if (code == CODE_CLEAR) { -+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name, -+ "LZWDecode: Corrupted LZW table at scanline %d", -+ tif->tif_row); -+ return (0); -+ } - *op++ = code, occ--; - oldcodep = sp->dec_codetab + code; - continue; diff --git a/abs/core/libtiff/tiff2pdf-compression.patch b/abs/core/libtiff/tiff2pdf-compression.patch deleted file mode 100644 index 2dae2dc..0000000 --- a/abs/core/libtiff/tiff2pdf-compression.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- tiff-3.8.2/tools/tiff2pdf.c 8 Jun 2006 11:27:11 -0000 1.35 -+++ tiff-3.8.2/tools/tiff2pdf.c 19 Jun 2006 20:12:08 -0000 1.36 -@@ -937,7 +937,7 @@ - - #ifdef JPEG_SUPPORT - if(t2p->pdf_defaultcompression==T2P_COMPRESS_JPEG){ -- if(t2p->pdf_defaultcompressionquality<100 || -+ if(t2p->pdf_defaultcompressionquality>100 || - t2p->pdf_defaultcompressionquality<1){ - t2p->pdf_defaultcompressionquality=0; - } -@@ -945,25 +945,17 @@ - #endif - #ifdef ZIP_SUPPORT - if(t2p->pdf_defaultcompression==T2P_COMPRESS_ZIP){ -- switch (t2p->pdf_defaultcompressionquality){ -- case 1: case 10: case 11: case 12: case 13: case 14: case 15: -- case 101: case 110: case 111: case 112: case 113: case 114: case 115: -- case 201: case 210: case 211: case 212: case 213: case 214: case 215: -- case 301: case 310: case 311: case 312: case 313: case 314: case 315: -- case 401: case 410: case 411: case 412: case 413: case 414: case 415: -- case 501: case 510: case 511: case 512: case 513: case 514: case 515: -- case 601: case 610: case 611: case 612: case 613: case 614: case 615: -- case 701: case 710: case 711: case 712: case 713: case 714: case 715: -- case 801: case 810: case 811: case 812: case 813: case 814: case 815: -- case 901: case 910: case 911: case 912: case 913: case 914: case 915: -- break; -- default: -- t2p->pdf_defaultcompressionquality=0; -+ uint16 m=t2p->pdf_defaultcompressionquality%100; -+ if(t2p->pdf_defaultcompressionquality/100 > 9 || -+ (m>1 && m<10) || m>15){ -+ t2p->pdf_defaultcompressionquality=0; - } - if(t2p->pdf_defaultcompressionquality%100 !=0){ -+ t2p->pdf_defaultcompressionquality/=100; -+ t2p->pdf_defaultcompressionquality*=100; - TIFFError( - TIFF2PDF_MODULE, -- "PNG Group predictor differencing not implemented, assuming compresion quality %u", -+ "PNG Group predictor differencing not implemented, assuming compression quality %u", - t2p->pdf_defaultcompressionquality); - } - t2p->pdf_defaultcompressionquality%=100; diff --git a/abs/core/libtiff/tiff2pdf-octal-printf.patch b/abs/core/libtiff/tiff2pdf-octal-printf.patch deleted file mode 100644 index f35b072..0000000 --- a/abs/core/libtiff/tiff2pdf-octal-printf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tiff-3.8.2/tools/tiff2pdf.c.orig 2006-03-21 11:42:51.000000000 -0500 -+++ tiff-3.8.2/tools/tiff2pdf.c 2006-06-07 17:54:01.027637232 -0400 -@@ -3668,7 +3668,7 @@ - written += TIFFWriteFile(output, (tdata_t) "(", 1); - for (i=0;i<len;i++){ - if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){ -- sprintf(buffer, "\\%.3o", pdfstr[i]); -+ sprintf(buffer, "\\%.3hho", pdfstr[i]); - written += TIFFWriteFile(output, (tdata_t) buffer, 4); - } else { - switch (pdfstr[i]){ diff --git a/abs/core/libtiff/tiffsplit-fname-overflow.patch b/abs/core/libtiff/tiffsplit-fname-overflow.patch deleted file mode 100644 index cc22589..0000000 --- a/abs/core/libtiff/tiffsplit-fname-overflow.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tiff-3.8.2/tools/tiffsplit.c.orig 2005-12-07 04:48:33.000000000 -0500 -+++ tiff-3.8.2/tools/tiffsplit.c 2006-06-01 21:20:25.039944864 -0400 -@@ -61,14 +61,13 @@ - return (-3); - } - if (argc > 2) -- strcpy(fname, argv[2]); -+ snprintf(fname, sizeof(fname), "%s", argv[2]); - in = TIFFOpen(argv[1], "r"); - if (in != NULL) { - do { - char path[1024+1]; - newfilename(); -- strcpy(path, fname); -- strcat(path, ".tif"); -+ snprintf(path, sizeof(path), "%s.tif", fname); - out = TIFFOpen(path, TIFFIsBigEndian(in)?"wb":"wl"); - if (out == NULL) - return (-2); diff --git a/abs/core/libtirpc/PKGBUILD b/abs/core/libtirpc/PKGBUILD index 3bde9db..6035cdb 100644 --- a/abs/core/libtirpc/PKGBUILD +++ b/abs/core/libtirpc/PKGBUILD @@ -1,23 +1,42 @@ -# $Id: PKGBUILD 62190 2010-01-04 08:39:59Z tpowa $ +# $Id: PKGBUILD 133597 2011-07-29 21:03:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=libtirpc -pkgver=0.2.1 -pkgrel=1 +pkgver=0.2.2 +pkgrel=2 pkgdesc="Transport Independent RPC library (SunRPC replacement)" -arch=(i686 x86_64) -depends=('glibc' 'libgssglue' 'heimdal') +arch=('i686' 'x86_64') url="http://libtirpc.sourceforge.net/" -license=('GPL2') -source=(http://downloads.sourceforge.net/sourceforge/libtirpc/$pkgname-$pkgver.tar.bz2) +license=('BSD') +depends=('libgssglue') backup=('etc/netconfig') -options=(!libtool) +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 + libtirpc-0.2.1-fortify.patch + libtirpc-0.2.3rc1.patch + libtirpc-fix-segfault-0.2.2.patch) +md5sums=('74c41c15c2909f7d11d9c7bfa7db6273' + '2e5c067f1651469dfbbdc91d3c9c60e8' + 'ac2a1657b44f4a99c37d8265b05b9133' + '5a3ab55934cad4e8b38fc90c54756472') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + # fix http://bugs.gentoo.org/293593 + # https://bugs.archlinux.org/task/20082 + patch -Np1 -i ../libtirpc-0.2.1-fortify.patch + # add patches from fedora git to make nfs-utils compile again + patch -Np1 -i ../libtirpc-0.2.3rc1.patch + patch -Np1 -i ../libtirpc-fix-segfault-0.2.2.patch + sh autogen.sh + autoreconf -fisv ./configure --prefix=/usr --enable-gss - make || return 1 - make DESTDIR=$pkgdir install || return 1 - # install netconfig - install -D -m644 doc/etc_netconfig $pkgdir/etc/netconfig + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } -md5sums=('d77eb15f464bf9d6e66259eaf78b2a4e') diff --git a/abs/core/libtirpc/libtirpc-0.2.1-fortify.patch b/abs/core/libtirpc/libtirpc-0.2.1-fortify.patch new file mode 100644 index 0000000..7375bf8 --- /dev/null +++ b/abs/core/libtirpc/libtirpc-0.2.1-fortify.patch @@ -0,0 +1,18 @@ +Index: libtirpc-0.2.1/src/getrpcport.c +=================================================================== +--- libtirpc-0.2.1.orig/src/getrpcport.c ++++ libtirpc-0.2.1/src/getrpcport.c +@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto + + if ((hp = gethostbyname(host)) == NULL) + return (0); ++ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) ++ return (0); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = 0; +- if (hp->h_length > sizeof(addr)) +- hp->h_length = sizeof(addr); + memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); + /* Inconsistent interfaces need casts! :-( */ + return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/abs/core/libtirpc/libtirpc-0.2.3rc1.patch b/abs/core/libtirpc/libtirpc-0.2.3rc1.patch new file mode 100644 index 0000000..d57a59e --- /dev/null +++ b/abs/core/libtirpc/libtirpc-0.2.3rc1.patch @@ -0,0 +1,637 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 7ee8cbc..6731ff9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ + svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c des_crypt.c ++ auth_time.c auth_des.c authdes_prot.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c +diff --git a/src/auth_des.c b/src/auth_des.c +index 37e7667..f0c8b8c 100644 +--- a/src/auth_des.c ++++ b/src/auth_des.c +@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window, + goto failed; + } + ad->ad_nis_srvr = NULL; /* not needed any longer */ ++ auth_get(auth); /* Reference for caller */ + return (auth); + + failed: +@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth) + FREE(auth, sizeof(AUTH)); + } + ++static bool_t ++authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) ++{ ++ return ((*xfunc)(xdrs, xwhere)); ++} ++ + static struct auth_ops * + authdes_ops(void) + { +@@ -487,6 +494,8 @@ authdes_ops(void) + ops.ah_validate = authdes_validate; + ops.ah_refresh = authdes_refresh; + ops.ah_destroy = authdes_destroy; ++ ops.ah_wrap = authdes_wrap; ++ ops.ah_unwrap = authdes_wrap; + } + mutex_unlock(&authdes_ops_lock); + return (&ops); +diff --git a/src/auth_gss.c b/src/auth_gss.c +index df3017a..a992049 100644 +--- a/src/auth_gss.c ++++ b/src/auth_gss.c +@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) + + if (!authgss_refresh(auth)) + auth = NULL; ++ else ++ auth_get(auth); /* Reference for caller */ + + clnt->cl_auth = save_auth; + +@@ -555,9 +557,20 @@ authgss_destroy_context(AUTH *auth) + + if (gd->gc.gc_ctx.length != 0) { + if (gd->established) { ++ AUTH *save_auth = NULL; ++ ++ /* Make sure we use the right auth_ops */ ++ if (gd->clnt->cl_auth != auth) { ++ save_auth = gd->clnt->cl_auth; ++ gd->clnt->cl_auth = auth; ++ } ++ + gd->gc.gc_proc = RPCSEC_GSS_DESTROY; + clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL, + (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT); ++ ++ if (save_auth != NULL) ++ gd->clnt->cl_auth = save_auth; + } + gss_release_buffer(&min_stat, &gd->gc.gc_ctx); + /* XXX ANDROS check size of context - should be 8 */ +diff --git a/src/auth_none.c b/src/auth_none.c +index a439ec6..008c589 100644 +--- a/src/auth_none.c ++++ b/src/auth_none.c +@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client) + { + } + ++static bool_t ++authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) ++{ ++ return ((*xfunc)(xdrs, xwhere)); ++} ++ + static struct auth_ops * + authnone_ops() + { +@@ -170,6 +176,8 @@ authnone_ops() + ops.ah_validate = authnone_validate; + ops.ah_refresh = authnone_refresh; + ops.ah_destroy = authnone_destroy; ++ ops.ah_wrap = authnone_wrap; ++ ops.ah_unwrap = authnone_wrap; + } + mutex_unlock(&ops_lock); + return (&ops); +diff --git a/src/auth_unix.c b/src/auth_unix.c +index c2469da..4b9b13f 100644 +--- a/src/auth_unix.c ++++ b/src/auth_unix.c +@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids) + */ + auth->ah_cred = au->au_origcred; + marshal_new_auth(auth); ++ auth_get(auth); /* Reference for caller */ + return (auth); + #ifndef _KERNEL + cleanup_authunix_create: +@@ -396,6 +397,12 @@ marshal_new_auth(auth) + XDR_DESTROY(xdrs); + } + ++static bool_t ++authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) ++{ ++ return ((*xfunc)(xdrs, xwhere)); ++} ++ + static struct auth_ops * + authunix_ops() + { +@@ -411,6 +418,8 @@ authunix_ops() + ops.ah_validate = authunix_validate; + ops.ah_refresh = authunix_refresh; + ops.ah_destroy = authunix_destroy; ++ ops.ah_wrap = authunix_wrap; ++ ops.ah_unwrap = authunix_wrap; + } + mutex_unlock(&ops_lock); + return (&ops); +diff --git a/src/authgss_prot.c b/src/authgss_prot.c +index 9d7fa09..0168318 100644 +--- a/src/authgss_prot.c ++++ b/src/authgss_prot.c +@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, + databuflen = end - start - 4; + XDR_SETPOS(xdrs, start + 4); + databuf.value = XDR_INLINE(xdrs, databuflen); ++ databuf.length = databuflen; + + xdr_stat = FALSE; + +@@ -169,7 +170,6 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, + XDR_SETPOS(xdrs, start); + if (!xdr_u_int(xdrs, (u_int *)&databuflen)) + return (FALSE); +- databuf.length = databuflen; + + /* Checksum rpc_gss_data_t. */ + maj_stat = gss_get_mic(&min_stat, ctx, qop, +diff --git a/src/clnt_dg.c b/src/clnt_dg.c +index 79fed5d..4a1f60a 100644 +--- a/src/clnt_dg.c ++++ b/src/clnt_dg.c +@@ -366,7 +366,7 @@ call_again: + + if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || + (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || +- (! (*xargs)(xdrs, argsp))) { ++ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) { + cu->cu_error.re_status = RPC_CANTENCODEARGS; + goto out; + } +@@ -400,8 +400,8 @@ get_reply: + * (We assume that this is actually only executed once.) + */ + reply_msg.acpted_rply.ar_verf = _null_auth; +- reply_msg.acpted_rply.ar_results.where = resultsp; +- reply_msg.acpted_rply.ar_results.proc = xresults; ++ reply_msg.acpted_rply.ar_results.where = NULL; ++ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; + + fd.fd = cu->cu_fd; + fd.events = POLLIN; +@@ -512,6 +512,10 @@ get_reply: + &reply_msg.acpted_rply.ar_verf)) { + cu->cu_error.re_status = RPC_AUTHERROR; + cu->cu_error.re_why = AUTH_INVALIDRESP; ++ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs, ++ xresults, resultsp)) { ++ if (cu->cu_error.re_status == RPC_SUCCESS) ++ cu->cu_error.re_status = RPC_CANTDECODERES; + } + if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { + xdrs->x_op = XDR_FREE; +diff --git a/src/clnt_vc.c b/src/clnt_vc.c +index 359063c..097cae8 100644 +--- a/src/clnt_vc.c ++++ b/src/clnt_vc.c +@@ -364,7 +364,7 @@ call_again: + if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || + (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || + (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || +- (! (*xdr_args)(xdrs, args_ptr))) { ++ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTENCODEARGS; + (void)xdrrec_endofrecord(xdrs, TRUE); +@@ -420,7 +420,8 @@ call_again: + &reply_msg.acpted_rply.ar_verf)) { + ct->ct_error.re_status = RPC_AUTHERROR; + ct->ct_error.re_why = AUTH_INVALIDRESP; +- } else if (! (*xdr_results)(xdrs, results_ptr)) { ++ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs, ++ xdr_results, results_ptr)) { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTDECODERES; + } +diff --git a/src/svc.c b/src/svc.c +index b4a63d0..08cd6c9 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -77,9 +77,6 @@ static struct svc_callout + + extern rwlock_t svc_lock; + extern rwlock_t svc_fd_lock; +-#ifdef HAVE_LIBGSSAPI +-extern struct svc_auth_ops svc_auth_gss_ops; +-#endif + + static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, + struct svc_callout **, char *); +@@ -717,11 +714,9 @@ svc_getreq_common (fd) + SVC_DESTROY (xprt); + break; + } +- else if ((xprt->xp_auth != NULL) +-#ifdef HAVE_LIBGSSAPI +- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops) +-#endif +- ) { ++ else if ((xprt->xp_auth != NULL) && ++ (xprt->xp_auth->svc_ah_private == NULL)) ++ { + xprt->xp_auth = NULL; + } + } +diff --git a/src/svc_auth.c b/src/svc_auth.c +index c6b3a0b..e80d5f9 100644 +--- a/src/svc_auth.c ++++ b/src/svc_auth.c +@@ -98,8 +98,8 @@ _authenticate(rqst, msg) + rqst->rq_xprt->xp_verf.oa_length = 0; + cred_flavor = rqst->rq_cred.oa_flavor; + switch (cred_flavor) { +- case AUTH_NULL: +- dummy = _svcauth_null(rqst, msg); ++ case AUTH_NONE: ++ dummy = _svcauth_none(rqst, msg); + return (dummy); + case AUTH_SYS: + dummy = _svcauth_unix(rqst, msg); +@@ -132,15 +132,6 @@ _authenticate(rqst, msg) + return (AUTH_REJECTEDCRED); + } + +-/*ARGSUSED*/ +-enum auth_stat +-_svcauth_null(rqst, msg) +- struct svc_req *rqst; +- struct rpc_msg *msg; +-{ +- return (AUTH_OK); +-} +- + /* + * Allow the rpc service to register new authentication types that it is + * prepared to handle. When an authentication flavor is registered, +diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c +index ce83859..9585069 100644 +--- a/src/svc_auth_unix.c ++++ b/src/svc_auth_unix.c +@@ -43,6 +43,8 @@ + + #include <rpc/rpc.h> + ++extern SVCAUTH svc_auth_none; ++ + /* + * Unix longhand authenticator + */ +@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg) + assert(rqst != NULL); + assert(msg != NULL); + ++ rqst->rq_xprt->xp_auth = &svc_auth_none; ++ + area = (struct area *) rqst->rq_clntcred; + aup = &area->area_aup; + aup->aup_machname = area->area_machname; +@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg) + struct svc_req *rqst; + struct rpc_msg *msg; + { ++ rqst->rq_xprt->xp_auth = &svc_auth_none; + return (AUTH_REJECTEDCRED); + } +diff --git a/src/svc_dg.c b/src/svc_dg.c +index 66a56ee..5ef9df2 100644 +--- a/src/svc_dg.c ++++ b/src/svc_dg.c +@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize) + su->su_cache = NULL; + xprt->xp_fd = fd; + xprt->xp_p2 = su; ++ xprt->xp_auth = NULL; + xprt->xp_verf.oa_base = su->su_verfbody; + svc_dg_ops(xprt); + xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); +@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg) + bool_t stat = FALSE; + size_t slen; + ++ xdrproc_t xdr_results; ++ caddr_t xdr_location; ++ bool_t has_args; ++ ++ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && ++ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { ++ has_args = TRUE; ++ xdr_results = msg->acpted_rply.ar_results.proc; ++ xdr_location = msg->acpted_rply.ar_results.where; ++ ++ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; ++ msg->acpted_rply.ar_results.where = NULL; ++ } else ++ has_args = FALSE; ++ + xdrs->x_op = XDR_ENCODE; + XDR_SETPOS(xdrs, 0); + msg->rm_xid = su->su_xid; +- if (xdr_replymsg(xdrs, msg)) { ++ if (xdr_replymsg(xdrs, msg) && ++ (!has_args || ++ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { + struct msghdr *msg = &su->su_msghdr; + struct iovec iov; + +@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) + xdrproc_t xdr_args; + void *args_ptr; + { +- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); ++ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), ++ xdr_args, args_ptr)) { ++ (void)svc_freeargs(xprt, xdr_args, args_ptr); ++ return FALSE; ++ } ++ return TRUE; + } + + static bool_t +@@ -288,6 +311,10 @@ svc_dg_destroy(xprt) + xprt_unregister(xprt); + if (xprt->xp_fd != -1) + (void)close(xprt->xp_fd); ++ if (xprt->xp_auth != NULL) { ++ SVCAUTH_DESTROY(xprt->xp_auth); ++ xprt->xp_auth = NULL; ++ } + XDR_DESTROY(&(su->su_xdrs)); + (void) mem_free(rpc_buffer(xprt), su->su_iosz); + (void) mem_free(su, sizeof (*su)); +diff --git a/src/svc_vc.c b/src/svc_vc.c +index aaaf2d7..74632e2 100644 +--- a/src/svc_vc.c ++++ b/src/svc_vc.c +@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize) + xprt->xp_p1 = r; + xprt->xp_p2 = NULL; + xprt->xp_p3 = NULL; ++ xprt->xp_auth = NULL; + xprt->xp_verf = _null_auth; + svc_vc_rendezvous_ops(xprt); + xprt->xp_port = (u_short)-1; /* It is the rendezvouser */ +@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize) + xdrrec_create(&(cd->xdrs), sendsize, recvsize, + xprt, read_vc, write_vc); + xprt->xp_p1 = cd; ++ xprt->xp_auth = NULL; + xprt->xp_verf.oa_base = cd->verf_body; + svc_vc_ops(xprt); /* truely deals with calls */ + xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ +@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt) + XDR_DESTROY(&(cd->xdrs)); + mem_free(cd, sizeof(struct cf_conn)); + } ++ if (xprt->xp_auth != NULL) { ++ SVCAUTH_DESTROY(xprt->xp_auth); ++ xprt->xp_auth = NULL; ++ } + if (xprt->xp_rtaddr.buf) + mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); + if (xprt->xp_ltaddr.buf) +@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg) + } + + xdrs->x_op = XDR_DECODE; +- (void)xdrrec_skiprecord(xdrs); ++ /* ++ * No need skip records with nonblocking connections ++ */ ++ if (cd->nonblock == FALSE) ++ (void)xdrrec_skiprecord(xdrs); + if (xdr_callmsg(xdrs, msg)) { + cd->x_id = msg->rm_xid; + return (TRUE); +@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) + + assert(xprt != NULL); + /* args_ptr may be NULL */ +- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs), +- args_ptr)); ++ ++ if (! SVCAUTH_UNWRAP(xprt->xp_auth, ++ &(((struct cf_conn *)(xprt->xp_p1))->xdrs), ++ xdr_args, args_ptr)) { ++ return FALSE; ++ } ++ return TRUE; + } + + static bool_t +@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg) + XDR *xdrs; + bool_t rstat; + ++ xdrproc_t xdr_results; ++ caddr_t xdr_location; ++ bool_t has_args; ++ + assert(xprt != NULL); + assert(msg != NULL); + + cd = (struct cf_conn *)(xprt->xp_p1); + xdrs = &(cd->xdrs); + ++ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && ++ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { ++ has_args = TRUE; ++ xdr_results = msg->acpted_rply.ar_results.proc; ++ xdr_location = msg->acpted_rply.ar_results.where; ++ ++ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; ++ msg->acpted_rply.ar_results.where = NULL; ++ } else ++ has_args = FALSE; ++ + xdrs->x_op = XDR_ENCODE; + msg->rm_xid = cd->x_id; +- rstat = xdr_replymsg(xdrs, msg); ++ rstat = FALSE; ++ if (xdr_replymsg(xdrs, msg) && ++ (!has_args || ++ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { ++ rstat = TRUE; ++ } + (void)xdrrec_endofrecord(xdrs, TRUE); + return (rstat); + } +diff --git a/src/xdr_rec.c b/src/xdr_rec.c +index 4e815d7..2aca623 100644 +--- a/src/xdr_rec.c ++++ b/src/xdr_rec.c +@@ -64,7 +64,6 @@ + #include <rpc/clnt.h> + #include <stddef.h> + #include "rpc_com.h" +-#include <unistd.h> + static bool_t xdrrec_getlong(XDR *, long *); + static bool_t xdrrec_putlong(XDR *, const long *); + static bool_t xdrrec_getbytes(XDR *, char *, u_int); +@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs) + RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; + off_t pos; + +- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1); +- if (pos != -1) +- switch (xdrs->x_op) { ++ switch (xdrs->x_op) { + +- case XDR_ENCODE: +- pos += rstrm->out_finger - rstrm->out_base; +- break; ++ case XDR_ENCODE: ++ pos = rstrm->out_finger - rstrm->out_base ++ - BYTES_PER_XDR_UNIT; ++ break; + +- case XDR_DECODE: +- pos -= rstrm->in_boundry - rstrm->in_finger; +- break; ++ case XDR_DECODE: ++ pos = rstrm->in_boundry - rstrm->in_finger ++ - BYTES_PER_XDR_UNIT; ++ break; + +- default: +- pos = (off_t) -1; +- break; +- } ++ default: ++ pos = (off_t) -1; ++ break; ++ } + return ((u_int) pos); + } + +diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h +index 734e6b9..5f66e67 100644 +--- a/tirpc/rpc/auth.h ++++ b/tirpc/rpc/auth.h +@@ -203,8 +203,22 @@ typedef struct __auth { + + } *ah_ops; + void *ah_private; ++ int ah_refcnt; + } AUTH; + ++static __inline int ++auth_get(AUTH *auth) ++{ ++ return __sync_add_and_fetch(&auth->ah_refcnt, 1); ++} ++ ++static __inline int ++auth_put(AUTH *auth) ++{ ++ return __sync_sub_and_fetch(&auth->ah_refcnt, 1); ++} ++ ++ + + /* + * Authentication ops. +@@ -234,10 +248,23 @@ typedef struct __auth { + #define auth_refresh(auth, msg) \ + ((*((auth)->ah_ops->ah_refresh))(auth, msg)) + +-#define AUTH_DESTROY(auth) \ +- ((*((auth)->ah_ops->ah_destroy))(auth)) +-#define auth_destroy(auth) \ +- ((*((auth)->ah_ops->ah_destroy))(auth)) ++#define AUTH_DESTROY(auth) \ ++ do { \ ++ int refs; \ ++ if ((refs = auth_put((auth))) == 0) \ ++ ((*((auth)->ah_ops->ah_destroy))(auth));\ ++ log_debug("%s: auth_put(), refs %d\n", \ ++ __func__, refs); \ ++ } while (0) ++ ++#define auth_destroy(auth) \ ++ do { \ ++ int refs; \ ++ if ((refs = auth_put((auth))) == 0) \ ++ ((*((auth)->ah_ops->ah_destroy))(auth));\ ++ log_debug("%s: auth_put(), refs %d\n", \ ++ __func__, refs); \ ++ } while (0) + + #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ + ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \ +@@ -373,7 +400,7 @@ __END_DECLS + __BEGIN_DECLS + struct svc_req; + struct rpc_msg; +-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *); ++enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); + enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); + enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); + __END_DECLS +diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h +index e3d6897..d2881ad 100644 +--- a/tirpc/rpc/des.h ++++ b/tirpc/rpc/des.h +@@ -33,6 +33,9 @@ + * Copyright (c) 1986 by Sun Microsystems, Inc. + */ + ++#ifndef _RPC_DES_H_ ++#define _RPC_DES_H_ ++ + #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ + #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ + +@@ -80,3 +83,5 @@ struct desparams { + * Software DES. + */ + extern int _des_crypt( char *, int, struct desparams * ); ++ ++#endif +diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h +index 659e90c..14269d1 100644 +--- a/tirpc/rpc/svc_auth.h ++++ b/tirpc/rpc/svc_auth.h +@@ -44,17 +44,23 @@ + /* + * Interface to server-side authentication flavors. + */ +-typedef struct { ++typedef struct SVCAUTH { + struct svc_auth_ops { +- int (*svc_ah_wrap)(void); +- int (*svc_ah_unwrap)(void); +- int (*svc_ah_destroy)(void); ++ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t, ++ caddr_t); ++ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t, ++ caddr_t); ++ int (*svc_ah_destroy)(struct SVCAUTH *); + } *svc_ah_ops; + caddr_t svc_ah_private; + } SVCAUTH; + +-#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) +-#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) ++#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ ++ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere)) ++#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \ ++ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere)) ++#define SVCAUTH_DESTROY(auth) \ ++ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth)) + + /* + * Server side authenticator diff --git a/abs/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch b/abs/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch new file mode 100644 index 0000000..8a04c16 --- /dev/null +++ b/abs/core/libtirpc/libtirpc-fix-segfault-0.2.2.patch @@ -0,0 +1,28 @@ +diff -up libtirpc-0.2.2/src/svc_dg.c.orig libtirpc-0.2.2/src/svc_dg.c +--- libtirpc-0.2.2/src/svc_dg.c.orig 2011-07-19 15:02:41.087631000 -0400 ++++ libtirpc-0.2.2/src/svc_dg.c 2011-07-19 15:04:43.154243000 -0400 +@@ -254,8 +254,8 @@ svc_dg_reply(xprt, msg) + XDR_SETPOS(xdrs, 0); + msg->rm_xid = su->su_xid; + if (xdr_replymsg(xdrs, msg) && +- (!has_args || +- (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { ++ (!has_args || (xprt->xp_auth && ++ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { + struct msghdr *msg = &su->su_msghdr; + struct iovec iov; + +diff -up libtirpc-0.2.2/src/svc_vc.c.orig libtirpc-0.2.2/src/svc_vc.c +--- libtirpc-0.2.2/src/svc_vc.c.orig 2011-07-19 15:05:28.577588000 -0400 ++++ libtirpc-0.2.2/src/svc_vc.c 2011-07-19 15:05:40.058928000 -0400 +@@ -698,8 +698,8 @@ svc_vc_reply(xprt, msg) + msg->rm_xid = cd->x_id; + rstat = FALSE; + if (xdr_replymsg(xdrs, msg) && +- (!has_args || +- (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { ++ (!has_args || (xprt->xp_auth && ++ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { + rstat = TRUE; + } + (void)xdrrec_endofrecord(xdrs, TRUE); diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD index f8b2119..96b3479 100644 --- a/abs/core/libtool/PKGBUILD +++ b/abs/core/libtool/PKGBUILD @@ -1,31 +1,49 @@ -# $Id: PKGBUILD 91152 2010-09-23 13:07:38Z allan $ +# $Id: PKGBUILD 162070 2012-06-19 12:28:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # NOTE: requires rebuilt with each new gcc version -pkgname=libtool -pkgver=2.4 -pkgrel=1 +pkgname=('libtool' 'libltdl') +pkgver=2.4.2 +pkgrel=6 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -depends=('sh' 'tar' 'texinfo') -groups=('base-devel') options=('!libtool') -install=libtool.install -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) -md5sums=('4e6144439d95d7332dc50ace6dd24c55') +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('2ec8997e0c07249eb4cbd072417d70fe' + '1e6ba57420c82c663c85e745d11c7eed') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} ./configure --prefix=/usr make +} + +check() { + cd ${srcdir}/${pkgbase}-${pkgver} make check } -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install +package_libtool() { + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.1') + groups=('base-devel') + install=libtool.install + + cd ${srcdir}/${pkgbase}-${pkgver} + + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ +} + +package_libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool" + + cd ${srcdir}/${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ + install-ltdlincludeHEADERS install-data-local + rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} } diff --git a/abs/core/libtool/libtool.install b/abs/core/libtool/libtool.install index 424c8cb..73cf564 100644 --- a/abs/core/libtool/libtool.install +++ b/abs/core/libtool/libtool.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(libtool.info libtool.info-1 libtool.info-2) post_install() { @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/libusb-compat/PKGBUILD b/abs/core/libusb-compat/PKGBUILD index b2b16ce..76b8f05 100644 --- a/abs/core/libusb-compat/PKGBUILD +++ b/abs/core/libusb-compat/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 101197 2010-11-28 15:10:38Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 162998 2012-07-05 06:50:21Z tpowa $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=libusb-compat -pkgver=0.1.3 -pkgrel=1 +pkgver=0.1.4 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64') -depends=('libusb' 'sh') url="http://libusb.sourceforge.net/" license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2) +depends=('libusb' 'sh') options=('!libtool') -md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2" + "libusb-0.1-libusbx.patch") +md5sums=('2ca521fffadd0c28fdf174e6ec73865b' + '1612c3982f307da1332d6db57b16742b') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13 + patch -Np0 -i ../libusb-0.1-libusbx.patch + ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } + diff --git a/abs/core/libusb-compat/libusb-0.1-libusbx.patch b/abs/core/libusb-compat/libusb-0.1-libusbx.patch new file mode 100644 index 0000000..6156365 --- /dev/null +++ b/abs/core/libusb-compat/libusb-0.1-libusbx.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/423135 + +--- libusb/core.c ++++ libusb/core.c +@@ -32,12 +32,6 @@ + static libusb_context *ctx = NULL; + static int usb_debug = 0; + +-enum usbi_log_level { +- LOG_LEVEL_DEBUG, +- LOG_LEVEL_INFO, +- LOG_LEVEL_WARNING, +- LOG_LEVEL_ERROR, +-}; + + #ifdef ENABLE_LOGGING + #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt) diff --git a/abs/core/libusb/PKGBUILD b/abs/core/libusb/PKGBUILD deleted file mode 100644 index 947361b..0000000 --- a/abs/core/libusb/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 101194 2010-11-28 15:05:41Z tpowa $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=libusb -pkgver=1.0.8 -pkgrel=1 -depends=('glibc') -pkgdesc="Library to enable user space application programs to communicate with USB devices." -arch=(i686 x86_64) -url="http://libusb.sourceforge.net/" -license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2) -options=(!libtool) -replaces=(libusb1) -md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/abs/core/libusbx/PKGBUILD b/abs/core/libusbx/PKGBUILD new file mode 100644 index 0000000..2c2795f --- /dev/null +++ b/abs/core/libusbx/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 162758 2012-06-29 16:50:44Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=libusbx +pkgver=1.0.12 +pkgrel=2 +depends=('glibc') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="http://libusbx.org" +license=('LGPL') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +options=(!libtool) +replaces=('libusb1' 'libusb') +provides=("libusb=$pkgver") +conflicts=("libusb") +md5sums=('c41352ac755c7992edfcbb2ea4ad1349') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/libvdpau/PKGBUILD b/abs/core/libvdpau/PKGBUILD index 283eb43..bb012a8 100644 --- a/abs/core/libvdpau/PKGBUILD +++ b/abs/core/libvdpau/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: $ +# $Id: PKGBUILD 143891 2011-11-30 19:04:39Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau pkgver=0.4.1 pkgrel=2 -pkgdesc="NVIDIA VDPAU library" -arch=('i686' 'x86_64') -url=http://cgit.freedesktop.org/~aplattner/libvdpau -depends=('gcc-libs>=4.3.3') +pkgdesc="Nvidia VDPAU library" +arch=(i686 x86_64) +url='http://cgit.freedesktop.org/~aplattner/libvdpau' +depends=('gcc-libs') conflicts=('nvidia-utils<190.42-2') -options=('!libtool' 'force') +options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('libx11') +sha256sums=('061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('8e1f0639bea4e4a842aee93ab64406cc') diff --git a/abs/core/libvisual-plugins/PKGBUILD b/abs/core/libvisual-plugins/PKGBUILD index efd92f4..8417dd2 100644 --- a/abs/core/libvisual-plugins/PKGBUILD +++ b/abs/core/libvisual-plugins/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="plugins for libvisual" arch=("i686" "x86_64") license=('GPL') url="http://www.localhost.nl/~synap/libvisual/" -depends=('libvisual>=0.4.0' 'gtk2>=2.18.6' 'mesa>=7.7' 'alsa-lib' 'esound' 'jack-audio-connection-kit') +depends=('libvisual>=0.4.0' 'gtk2>=2.18.6' 'mesa>=7.7' 'alsa-lib' ) makedepends=(pkgconfig) source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz") md5sums=('4330e9287f9d6fae02f482f428a1e77b') diff --git a/abs/core/libvisual/PKGBUILD b/abs/core/libvisual/PKGBUILD index 11b5667..511ebdf 100644 --- a/abs/core/libvisual/PKGBUILD +++ b/abs/core/libvisual/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 78070 2010-04-19 09:02:43Z dgriffiths $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 150455 2012-02-17 23:29:45Z allan $ +# Maintainer: pkgname=libvisual pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Abstraction library that comes between applications and audio visualisation plugins" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') url="http://sourceforge.net/projects/libvisual/" license=('LGPL') -depends=('glibc') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz") md5sums=('f4e78547c79ea8a8ad111cf8b85011bb') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/abs/core/libvorbis/PKGBUILD b/abs/core/libvorbis/PKGBUILD index 6d65a11..20b4270 100644 --- a/abs/core/libvorbis/PKGBUILD +++ b/abs/core/libvorbis/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 77086 2010-04-10 16:22:41Z andrea $ +# $Id: PKGBUILD 149459 2012-02-08 04:00:58Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libvorbis -pkgver=1.3.1 +pkgver=1.3.3 pkgrel=1 pkgdesc="Vorbis codec library" arch=('i686' 'x86_64') -license=('custom') -url="http://www.xiph.org/ogg/vorbis/" +url="http://www.xiph.org/vorbis/" +license=('BSD') depends=('libogg') options=('!libtool') source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz) -md5sums=('016e523fac70bdd786258a9d15fd36e9') +md5sums=('6b1a36f0d72332fae5130688e65efe1f') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" #-march=i686 optimizes too much, strip it out - CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static || return 1 - make || return 1 + CFLAGS=${CFLAGS/-march=$CARCH} LIBS+="-lm" ./configure --prefix=/usr --disable-static + make } -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install || return 1 - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" || return 1 +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 check } +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index af9afab..dfee942 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.3 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,14 +14,18 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8' - '4b756387426afb2a5bb7a155631ec42348abf5c1' - '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' + '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' + '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') build() { cd "${srcdir}/libX11-${pkgver}" ./configure --prefix=/usr --disable-static --disable-xf86bigfont make +} + +package() { + cd "${srcdir}/libX11-${pkgver}" make check } diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh index 26c49a2..39d5a97 100644 --- a/abs/core/libx11/xorg.csh +++ b/abs/core/libx11/xorg.csh @@ -3,9 +3,9 @@ setenv XDG_CONFIG_HOME ${HOME}/.config setenv XDG_CACHE_HOME ${HOME}/.cache if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ else - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} endif if (! ($?XDG_CONFIG_DIRS) ) then diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh index e1de686..4fc02e3 100644 --- a/abs/core/libx11/xorg.sh +++ b/abs/core/libx11/xorg.sh @@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CACHE_HOME=$HOME/.cache if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ else - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS fi if [ -z $XDG_CONFIG_DIRS ]; then diff --git a/abs/core/libxau/PKGBUILD b/abs/core/libxau/PKGBUILD index 1eeeb9c..8fe2023 100644 --- a/abs/core/libxau/PKGBUILD +++ b/abs/core/libxau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88375 2010-08-23 07:44:23Z jgc $ +# $Id: PKGBUILD 152650 2012-03-07 19:44:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="X11 authorisation library" arch=('i686' 'x86_64') @@ -13,17 +13,17 @@ makedepends=('pkgconfig') license=('custom') options=('!libtool') source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('0e1ab449f98026e4599f6e0d7491810d36c8fe4d') +sha1sums=('29c47207fd246425b906f525b2220235ce4cd0f6') build() { cd "${srcdir}/libXau-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd "${srcdir}/libXau-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxaw/PKGBUILD b/abs/core/libxaw/PKGBUILD index 5ca4994..687aaea 100644 --- a/abs/core/libxaw/PKGBUILD +++ b/abs/core/libxaw/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 96936 2010-10-25 18:15:19Z jgc $ +# $Id: PKGBUILD 160631 2012-06-02 21:31:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxaw -pkgver=1.0.8 +pkgver=1.0.11 pkgrel=1 pkgdesc="X11 Athena Widget library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxmu' 'libxpm') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2) -sha1sums=('b33192f2f9c2d2ee6570eda9199a60bd5f1515d1') +sha256sums=('87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492') build() { cd "${srcdir}/libXaw-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXaw-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/libxcb/PKGBUILD b/abs/core/libxcb/PKGBUILD index e1b20ae..2bbe1b9 100644 --- a/abs/core/libxcb/PKGBUILD +++ b/abs/core/libxcb/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 88380 2010-08-23 08:02:28Z jgc $ +# $Id: PKGBUILD 153294 2012-03-12 20:52:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.7 +pkgver=1.8.1 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.6' 'libxdmcp' 'libxau') +depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python2') -conflicts=('libx11<1.1.99.2') options=('!libtool') license=('custom') -source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2 +source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '3455e84642283bc91c8313af319002a20bbcbdf4') +sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" - libtoolize --force --copy - aclocal - autoconf - automake --add-missing - ./configure --prefix=/usr --enable-xinput - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" + PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch index f17de1b..8e8162f 100644 --- a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -1,10 +1,9 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -35,7 +35,7 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/abs/core/libxcomposite/PKGBUILD b/abs/core/libxcomposite/PKGBUILD index 854af09..23cec88 100644 --- a/abs/core/libxcomposite/PKGBUILD +++ b/abs/core/libxcomposite/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 97802 2010-11-01 22:21:28Z jgc $ +# $Id: PKGBUILD 151410 2012-02-26 10:37:09Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxcomposite pkgver=0.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Composite extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxfixes' 'compositeproto') makedepends=('xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2) +options=('!libtool') +source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2") sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') build() { cd "${srcdir}/libXcomposite-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXcomposite-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/libxcursor/PKGBUILD b/abs/core/libxcursor/PKGBUILD index 9e37fa7..16d6470 100644 --- a/abs/core/libxcursor/PKGBUILD +++ b/abs/core/libxcursor/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 97807 2010-11-01 22:23:46Z jgc $ +# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxcursor -pkgver=1.1.11 +pkgver=1.1.13 pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64) @@ -12,18 +13,18 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('35491bd17cbcdda712e1a064c67ccbc523e2702c') +sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') build() { cd "${srcdir}/libXcursor-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXcursor-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxdamage/PKGBUILD b/abs/core/libxdamage/PKGBUILD index 231b4ce..c33c0b6 100644 --- a/abs/core/libxdamage/PKGBUILD +++ b/abs/core/libxdamage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82169 2010-06-09 06:52:23Z jgc $ +# $Id: PKGBUILD 150392 2012-02-17 11:26:19Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxdamage pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 damaged region extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0') @@ -16,9 +16,12 @@ sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee') build() { cd "${srcdir}/libXdamage-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/libXdamage-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxdmcp/PKGBUILD b/abs/core/libxdmcp/PKGBUILD index 1c6c2fd..541f81e 100644 --- a/abs/core/libxdmcp/PKGBUILD +++ b/abs/core/libxdmcp/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 97611 2010-10-31 16:26:42Z jgc $ +# $Id: PKGBUILD 152771 2012-03-09 16:07:19Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxdmcp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 Display Manager Control Protocol library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('xproto' 'glibc') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2) -sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f') +source=("${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2") +sha1sums=('3b63e8fc1600c51d9897d017da190fc6c16245b6') build() { cd "${srcdir}/libXdmcp-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXdmcp-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxext/PKGBUILD b/abs/core/libxext/PKGBUILD index 2bebe1c..cfc998d 100644 --- a/abs/core/libxext/PKGBUILD +++ b/abs/core/libxext/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 97797 2010-11-01 22:17:28Z jgc $ +# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxext -pkgver=1.2.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="X11 miscellaneous extensions library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e') +source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") +sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') build() { cd "${srcdir}/libXext-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXext-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxfixes/PKGBUILD b/abs/core/libxfixes/PKGBUILD index 5565ebb..535bfba 100644 --- a/abs/core/libxfixes/PKGBUILD +++ b/abs/core/libxfixes/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 82357 2010-06-10 12:31:08Z jgc $ +# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfixes -pkgver=4.0.5 -pkgrel=3 +pkgver=5.0 +pkgrel=2 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11>=1.3.4' 'fixesproto>=4.1.1') -makedepends=('pkg-config') +depends=('libx11' 'fixesproto>=5.0') +makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2) -sha1sums=('255dfb9a8c50d795c60711ec4764f76cd0620cbf') +source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") +sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') build() { cd "${srcdir}/libXfixes-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make } + package() { cd "${srcdir}/libXfixes-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxfixes/xfixes_coverity576.patch b/abs/core/libxfixes/xfixes_coverity576.patch deleted file mode 100644 index f759ecc..0000000 --- a/abs/core/libxfixes/xfixes_coverity576.patch +++ /dev/null @@ -1,16 +0,0 @@ -=================================================================== -RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/lib/Xfixes/src/Xfixes.c,v -rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/lib/Xfixes/src/Xfixes.c,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- src/Xfixes.c 2005/05/17 17:02:24 1.3 -+++ src/Xfixes.c 2006/04/03 00:58:13 1.4 -@@ -86,6 +86,7 @@ - { - UnlockDisplay (dpy); - SyncHandle (); -+ Xfree(info); - return 0; - } - info->major_version = rep.majorVersion; diff --git a/abs/core/libxfont/PKGBUILD b/abs/core/libxfont/PKGBUILD index d42d1ed..41ab3ec 100644 --- a/abs/core/libxfont/PKGBUILD +++ b/abs/core/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $ +# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.3 +pkgver=1.4.5 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64) @@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7') +sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') build() { cd "${srcdir}/libXfont-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXfont-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxft/PKGBUILD b/abs/core/libxft/PKGBUILD index 4759400..b38f5ee 100644 --- a/abs/core/libxft/PKGBUILD +++ b/abs/core/libxft/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 160629 2012-06-02 21:27:53Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.2.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') @@ -11,13 +11,17 @@ url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') -source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') +source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') build() { cd "${srcdir}/libXft-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXft-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD index 42fabdc..045880e 100644 --- a/abs/core/libxi/PKGBUILD +++ b/abs/core/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 158868 2012-05-12 16:25:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.3 +pkgver=1.6.1 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') +sha1sums=('4b53b41fdaa3acc86606c696c68d5eed11454612') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/abs/core/libxinerama/PKGBUILD b/abs/core/libxinerama/PKGBUILD index de37eac..043cf6f 100644 --- a/abs/core/libxinerama/PKGBUILD +++ b/abs/core/libxinerama/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 97812 2010-11-01 22:26:22Z jgc $ +# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxinerama -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 Xinerama extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2) -sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4') +options=('!libtool') +source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") +sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') build() { cd "${srcdir}/libXinerama-${pkgver}" ./configure --prefix=/usr make - make DESTDIR="${pkgdir}" install } + package() { cd "${srcdir}/libXinerama-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxkbfile/PKGBUILD b/abs/core/libxkbfile/PKGBUILD index 369cb10..a4fb52c 100644 --- a/abs/core/libxkbfile/PKGBUILD +++ b/abs/core/libxkbfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97571 2010-10-31 16:00:12Z jgc $ +# $Id: PKGBUILD 152781 2012-03-09 16:19:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxkbfile -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 keyboard file manipulation library" arch=('i686' 'x86_64') license=('custom') @@ -11,19 +11,19 @@ url="http://xorg.freedesktop.org/" depends=('libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('0fed539ffbc05859bc666b425fafa42e046bef5f') +source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('05139829837c26e3a14a40a700f058c018bc71f5') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxml2/CVE-2011-0216.patch b/abs/core/libxml2/CVE-2011-0216.patch new file mode 100644 index 0000000..dfc99d4 --- /dev/null +++ b/abs/core/libxml2/CVE-2011-0216.patch @@ -0,0 +1,31 @@ +commit 69f04562f75212bfcabecd190ea8b06ace28ece2 +Author: Daniel Veillard <veillard@redhat.com> +Date: Fri Aug 19 11:05:04 2011 +0800 + + Fix an off by one error in encoding + + this off by one error doesn't seems to reproduce on linux + but the error is real. + +diff --git a/encoding.c b/encoding.c +index d1140bf..fb0c38a 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out, + if (in == NULL) return(-1); + + /* calculate space available */ +- written = out->size - out->use; ++ written = out->size - out->use - 1; /* count '\0' */ + toconv = in->use; + /* + * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38 +@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out, + toconv = in->use; + if (toconv == 0) + return (0); +- written = out->size - out->use; ++ written = out->size - out->use -1; /* count '\0' */ + if (toconv * 2 >= written) { + xmlBufferGrow(out, out->size + toconv * 2); + written = out->size - out->use - 1; diff --git a/abs/core/libxml2/CVE-2011-1944.patch b/abs/core/libxml2/CVE-2011-1944.patch new file mode 100644 index 0000000..62dd5d2 --- /dev/null +++ b/abs/core/libxml2/CVE-2011-1944.patch @@ -0,0 +1,100 @@ +commit d7958b21e7f8c447a26bb2436f08402b2c308be4 +Author: Chris Evans <scarybeasts@gmail.com> +Date: Wed Mar 23 08:13:06 2011 +0800 + + Fix some potential problems on reallocation failures + + The count was incremented before the allocation + and not fixed in case of failure + * xpath.c: corrects a few instances where the available count of some + structure is updated before we know the allocation actually + succeeds + +diff --git a/xpath.c b/xpath.c +index 8b56189..608fe00 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } ++ cur->nodeMax *= 2; + cur->nodeTab = temp; + } + cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); +@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } + cur->nodeTab = temp; ++ cur->nodeMax *= 2; + } + if (val->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) val; +@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { + } else if (val1->nodeNr == val1->nodeMax) { + xmlNodePtr *temp; + +- val1->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + val1->nodeTab = temp; ++ val1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + set1->nodeTab[set1->nodeNr++] = n2; + } diff --git a/abs/core/libxml2/CVE-2011-2834.patch b/abs/core/libxml2/CVE-2011-2834.patch new file mode 100644 index 0000000..cfc61e0 --- /dev/null +++ b/abs/core/libxml2/CVE-2011-2834.patch @@ -0,0 +1,61 @@ +commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd +Author: Daniel Veillard <veillard@redhat.com> +Date: Tue Oct 11 16:34:34 2011 +0800 + + Fix missing error status in XPath evaluation + + Started by Chris Evans, I added a few more place where the + error should have been set in the evaluation context. + +diff --git a/xpath.c b/xpath.c +index bcee2ea..d9d902c 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) + sizeof(ctxt->valueTab[0])); + if (tmp == NULL) { + xmlGenericError(xmlGenericErrorContext, "realloc failed !\n"); ++ ctxt->error = XPATH_MEMORY_ERROR; + return (0); + } + ctxt->valueMax *= 2; +@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (ch & 0xc0) != 0xc0 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + /* then skip over remaining bytes for this char */ +@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (*cptr++ & 0xc0) != 0x80 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + if (ch & 0x80) /* must have had error encountered */ +@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", + (char *) op->value4, (char *)op->value5); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + val = xmlXPathVariableLookupNS(ctxt->context, +@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + } + xmlGenericError(xmlGenericErrorContext, + "XPath: unknown precompiled operation %d\n", op->op); ++ ctxt->error = XPATH_INVALID_OPERAND; + return (total); + } + diff --git a/abs/core/libxml2/CVE-2011-3905.patch b/abs/core/libxml2/CVE-2011-3905.patch new file mode 100644 index 0000000..53373b7 --- /dev/null +++ b/abs/core/libxml2/CVE-2011-3905.patch @@ -0,0 +1,61 @@ +commit 77404b8b69bc122d12231807abf1a837d121b551 +Author: Chris Evans <scarybeasts@gmail.com> +Date: Wed Dec 14 16:18:25 2011 +0800 + + Make sure the parser returns when getting a Stop order + + patch backported from chromiun bug fixes, assuming author is Chris + +diff --git a/parser.c b/parser.c +index 21d7aa3..4e5dcb9 100644 +--- a/parser.c ++++ b/parser.c +@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + (ctxt->sax->processingInstruction != NULL)) + ctxt->sax->processingInstruction(ctxt->userData, + target, NULL); +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + return; + } + buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); +@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + } else { + xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); + } +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + } + } + +@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ return; + if (name == NULL) { + spacePop(ctxt); + return; +@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ goto done; + if (name == NULL) { + spacePop(ctxt); + ctxt->instate = XML_PARSER_EOF; +@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + xmlParseEndTag1(ctxt, 0); + #endif /* LIBXML_SAX1_ENABLED */ +- if (ctxt->nameNr == 0) { ++ if (ctxt->instate == XML_PARSER_EOF) { ++ /* Nothing */ ++ } else if (ctxt->nameNr == 0) { + ctxt->instate = XML_PARSER_EPILOG; + } else { + ctxt->instate = XML_PARSER_CONTENT; diff --git a/abs/core/libxml2/CVE-2011-3919.patch b/abs/core/libxml2/CVE-2011-3919.patch new file mode 100644 index 0000000..b307e57 --- /dev/null +++ b/abs/core/libxml2/CVE-2011-3919.patch @@ -0,0 +1,19 @@ +commit 5bd3c061823a8499b27422aee04ea20aae24f03e +Author: Daniel Veillard <veillard@redhat.com> +Date: Fri Dec 16 18:53:35 2011 +0800 + + Fix an allocation error when copying entities + +diff --git a/parser.c b/parser.c +index 4e5dcb9..c55e41d 100644 +--- a/parser.c ++++ b/parser.c +@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + + buffer[nbchars++] = '&'; + if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { +- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); + } + for (;i > 0;i--) + buffer[nbchars++] = *cur++; diff --git a/abs/core/libxml2/PKGBUILD b/abs/core/libxml2/PKGBUILD index 2566d0e..062f3be 100644 --- a/abs/core/libxml2/PKGBUILD +++ b/abs/core/libxml2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 149232 2012-02-06 15:50:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.7.8 -pkgrel=4 +pkgrel=2 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('custom') @@ -13,24 +13,61 @@ makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - largefile64.patch shared_library_versionning.patch) -md5sums=('8127a65e8c3b08856093099b52599c86' - '5ad4915665608ebfa5b89f7908467a72' - '84aeb7c6db023eae044e95d9211dba53') + http://www.w3.org/XML/Test/xmlts20080205.tar.gz + largefile64.patch + shared_library_versionning.patch + libxml2-2.7.8-xpath-freeing.patch + libxml2-2.7.8-xpath-freeing2.patch + CVE-2011-1944.patch + libxml2-2.7.8-xpath-hardening.patch + CVE-2011-0216.patch + CVE-2011-2834.patch + CVE-2011-3905.patch + CVE-2011-3919.patch + libxml2_fix_for_automake_1.12.patch) build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/largefile64.patch" patch -Np1 -i "${srcdir}/shared_library_versionning.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-freeing.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-freeing2.patch" + patch -Np1 -i "${srcdir}/CVE-2011-1944.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-hardening.patch" + patch -Np1 -i "${srcdir}/CVE-2011-0216.patch" + patch -Np1 -i "${srcdir}/CVE-2011-2834.patch" + patch -Np1 -i "${srcdir}/CVE-2011-3905.patch" + patch -Np1 -i "${srcdir}/CVE-2011-3919.patch" + patch -Np1 -i "${srcdir}/libxml2_fix_for_automake_1.12.patch" + autoreconf -fi + sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py ./configure --prefix=/usr --with-threads --with-history \ - --with-python=/usr/bin/python2.7 + --with-python=/usr/bin/python2 make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + mv "${srcdir}/xmlconf" . + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - +md5sums=('8127a65e8c3b08856093099b52599c86' + 'b255be9a1c7f7021e52448e4ec8d7a0d' + '5ad4915665608ebfa5b89f7908467a72' + '84aeb7c6db023eae044e95d9211dba53' + 'f1df70c66dac94233932baf2737465e0' + 'c22af2643840da65dea618bf6cd33b25' + 'd2b2b362a8681c30be98c4a2e7f2d2ea' + '5709a1408becc1f0c6f1c7513a254dd2' + '4f0f2d3a11329ebee0907be6002a160e' + '88e9c95a813d4f0cb392acc000bae366' + '28f3022a0d63ee408774eb5e4914b07e' + 'a9b901d9ff095a266d3a5c601db142b1' + '38311f3b3b99d8dccf95241865fa8702') diff --git a/abs/core/libxml2/__changelog b/abs/core/libxml2/__changelog new file mode 100644 index 0000000..68801b8 --- /dev/null +++ b/abs/core/libxml2/__changelog @@ -0,0 +1 @@ +added patch for libxml2 /libxml2_fix_for_automake_1.12.patch diff --git a/abs/core/libxml2/libxml2-2.7.8-xpath-freeing.patch b/abs/core/libxml2/libxml2-2.7.8-xpath-freeing.patch new file mode 100644 index 0000000..2844f4a --- /dev/null +++ b/abs/core/libxml2/libxml2-2.7.8-xpath-freeing.patch @@ -0,0 +1,30 @@ +commit df83c17e5a2646bd923f75e5e507bc80d73c9722 +Author: Daniel Veillard <veillard@redhat.com> +Date: Wed Nov 17 14:12:14 2010 +0100 + + Fix a potential freeing error in XPath + +diff --git a/xpath.c b/xpath.c +index 81e33f6..1447be5 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); + goto evaluation_error; + } + diff --git a/abs/core/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/abs/core/libxml2/libxml2-2.7.8-xpath-freeing2.patch new file mode 100644 index 0000000..714954d --- /dev/null +++ b/abs/core/libxml2/libxml2-2.7.8-xpath-freeing2.patch @@ -0,0 +1,26 @@ +commit fec31bcd452e77c10579467ca87a785b41115de6 +Author: Daniel Veillard <veillard@redhat.com> +Date: Thu Nov 18 11:07:24 2010 +0100 + + Small fix for previous commit + +diff --git a/xpath.c b/xpath.c +index 1447be5..8b56189 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr tmp; + /* pop the result if any */ + tmp = valuePop(ctxt); +- if (tmp != contextObj) ++ if (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); + valuePop(ctxt); ++ } + goto evaluation_error; + } + diff --git a/abs/core/libxml2/libxml2-2.7.8-xpath-hardening.patch b/abs/core/libxml2/libxml2-2.7.8-xpath-hardening.patch new file mode 100644 index 0000000..7a4ad86 --- /dev/null +++ b/abs/core/libxml2/libxml2-2.7.8-xpath-hardening.patch @@ -0,0 +1,223 @@ +commit 0f136dcd18c287073a4d67b03fdb9696d7010940 +Author: Daniel Veillard <veillard@redhat.com> +Date: Thu Aug 18 17:10:13 2011 +0800 + + Hardening of XPath evaluation + + Add a mechanism of frame for XPath evaluation when entering a function + or a scoped evaluation, also fix a potential problem in predicate + evaluation. + +diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h +index 1a9e30e..ddd9dd8 100644 +--- a/include/libxml/xpath.h ++++ b/include/libxml/xpath.h +@@ -68,7 +68,8 @@ typedef enum { + XPATH_UNDEF_PREFIX_ERROR, + XPATH_ENCODING_ERROR, + XPATH_INVALID_CHAR_ERROR, +- XPATH_INVALID_CTXT ++ XPATH_INVALID_CTXT, ++ XPATH_STACK_ERROR + } xmlXPathError; + + /* +@@ -380,6 +381,8 @@ struct _xmlXPathParserContext { + xmlXPathCompExprPtr comp; /* the precompiled expression */ + int xptr; /* it this an XPointer expression */ + xmlNodePtr ancestor; /* used for walking preceding axis */ ++ ++ int valueFrame; /* used to limit Pop on the stack */ + }; + + /************************************************************************ +diff --git a/xpath.c b/xpath.c +index b59ac5a..bcee2ea 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = { + "Encoding error\n", + "Char out of XML range\n", + "Invalid or incomplete context\n", ++ "Stack usage errror\n", + "?? Unknown error ??\n" /* Must be last in the list! */ + }; + #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ +@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + ************************************************************************/ + + /** ++ * xmlXPathSetFrame: ++ * @ctxt: an XPath parser context ++ * ++ * Set the callee evaluation frame ++ * ++ * Returns the previous frame value to be restored once done ++ */ ++static int ++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { ++ int ret; ++ ++ if (ctxt == NULL) ++ return(0); ++ ret = ctxt->valueFrame; ++ ctxt->valueFrame = ctxt->valueNr; ++ return(ret); ++} ++ ++/** ++ * xmlXPathPopFrame: ++ * @ctxt: an XPath parser context ++ * @frame: the previous frame value ++ * ++ * Remove the callee evaluation frame ++ */ ++static void ++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { ++ if (ctxt == NULL) ++ return; ++ if (ctxt->valueNr < ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ } ++ ctxt->valueFrame = frame; ++} ++ ++/** + * valuePop: + * @ctxt: an XPath evaluation context + * +@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt) + + if ((ctxt == NULL) || (ctxt->valueNr <= 0)) + return (NULL); ++ ++ if (ctxt->valueNr <= ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ return (NULL); ++ } ++ + ctxt->valueNr--; + if (ctxt->valueNr > 0) + ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; +@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { + ret->valueNr = 0; + ret->valueMax = 10; + ret->value = NULL; ++ ret->valueFrame = 0; + + ret->context = ctxt; + ret->comp = comp; +@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; + xmlNodePtr oldContextNode, contextNode = NULL; + xmlXPathContextPtr xpctxt = ctxt->context; ++ int frame; + + #ifdef LIBXML_XPTR_ENABLED + /* +@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + */ + exprOp = &ctxt->comp->steps[op->ch2]; + for (i = 0; i < set->nodeNr; i++) { ++ xmlXPathObjectPtr tmp; ++ + if (set->nodeTab[i] == NULL) + continue; + +@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathNodeSetAddUnique(contextObj->nodesetval, + contextNode); + ++ frame = xmlXPathSetFrame(ctxt); + valuePush(ctxt, contextObj); + res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); ++ tmp = valuePop(ctxt); ++ xmlXPathPopFrame(ctxt, frame); + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { +- xmlXPathObjectPtr tmp; +- /* pop the result if any */ +- tmp = valuePop(ctxt); +- if (tmp != contextObj) { ++ while (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); +- valuePop(ctxt); ++ tmp = valuePop(ctxt); + } + goto evaluation_error; + } ++ /* push the result back onto the stack */ ++ valuePush(ctxt, tmp); + + if (res) + pos++; +@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlXPathFunction func; + const xmlChar *oldFunc, *oldFuncURI; + int i; ++ int frame; + ++ frame = xmlXPathSetFrame(ctxt); + if (op->ch1 != -1) + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); +@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } +- for (i = 0; i < op->value; i++) ++ for (i = 0; i < op->value; i++) { + if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } ++ } + if (op->cache != NULL) + XML_CAST_FPTR(func) = op->cache; + else { +@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + func(ctxt, op->value); + ctxt->context->function = oldFunc; + ctxt->context->functionURI = oldFuncURI; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + case XPATH_OP_ARG: +@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + #ifdef XPATH_STREAMING + if (ctxt->comp->stream) { +diff --git a/xpointer.c b/xpointer.c +index 7a42d02..37afa3a 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + SKIP_BLANKS; + if (CUR == '/') { diff --git a/abs/core/libxml2/libxml2_fix_for_automake_1.12.patch b/abs/core/libxml2/libxml2_fix_for_automake_1.12.patch new file mode 100644 index 0000000..cdd4af2 --- /dev/null +++ b/abs/core/libxml2/libxml2_fix_for_automake_1.12.patch @@ -0,0 +1,11 @@ +--- libxml2-2.7.8.orig/configure.in ++++ libxml2-2.7.8/configure.in +@@ -63,8 +63,6 @@ AC_PATH_PROG(WGET, wget, /usr/bin/wget) + AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint) + AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) + +-dnl Make sure we have an ANSI compiler +-AM_C_PROTOTYPES + test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) + + AC_LIBTOOL_WIN32_DLL diff --git a/abs/core/libxmu/PKGBUILD b/abs/core/libxmu/PKGBUILD index b6c556c..6ff36c5 100644 --- a/abs/core/libxmu/PKGBUILD +++ b/abs/core/libxmu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97601 2010-10-31 16:17:53Z jgc $ +# $Id: PKGBUILD 152301 2012-03-06 15:00:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxmu -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 miscellaneous micro-utility library" arch=('i686' 'x86_64') @@ -11,14 +11,15 @@ depends=('libxext' 'libxt') makedepends=('xorg-util-macros') license=('custom') options=('!libtool') -source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2) -sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd') +source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2") +sha1sums=('3e280aa927d78c05f94db6c7ae606f7ad132b495') build() { cd "${srcdir}/libXmu-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXmu-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxpm/PKGBUILD b/abs/core/libxpm/PKGBUILD index a9b489a..9fe0bc1 100644 --- a/abs/core/libxpm/PKGBUILD +++ b/abs/core/libxpm/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 97596 2010-10-31 16:14:25Z jgc $ +# $Id: PKGBUILD 152783 2012-03-09 16:22:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libxpm -pkgver=3.5.9 +pkgver=3.5.10 pkgrel=1 pkgdesc="X11 pixmap library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxt' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2) -sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b') +source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2") +sha1sums=('eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c') build() { cd "${srcdir}/libXpm-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXpm-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD index 8839b6b..94a99d0 100644 --- a/abs/core/libxrandr/PKGBUILD +++ b/abs/core/libxrandr/PKGBUILD @@ -1,9 +1,11 @@ -# $Id$ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 143893 2011-11-30 19:05:26Z andrea $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxrandr pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') @@ -18,7 +20,12 @@ build() { cd "${srcdir}/libXrandr-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libXrandr-${pkgver}" make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxrender/PKGBUILD b/abs/core/libxrender/PKGBUILD index 3c53091..66025d5 100644 --- a/abs/core/libxrender/PKGBUILD +++ b/abs/core/libxrender/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 82164 2010-06-09 06:48:35Z jgc $ +# $Id: PKGBUILD 152786 2012-03-09 16:24:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxrender -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="X Rendering Extension client library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11>=1.3.4' 'renderproto') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc') +sha1sums=('6e4d75d8316d5217324258f555eba3a5d383feb2') build() { cd "${srcdir}/libXrender-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 + ./configure --prefix=/usr --disable-static + make } + package() { cd "${srcdir}/libXrender-${pkgver}" - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + make DESTDIR=${pkgdir} install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/libxres/PKGBUILD b/abs/core/libxres/PKGBUILD index 016f446..b2b1847 100644 --- a/abs/core/libxres/PKGBUILD +++ b/abs/core/libxres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97782 2010-11-01 22:08:57Z jgc $ +# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64') @@ -10,15 +10,16 @@ url="http://xorg.freedesktop.org" license=('custom') depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2) -sha1sums=('d3a36f9b6ae430da91f2cbae409916f605074195') +options=('!libtool') +source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") +sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') build() { cd "${srcdir}/libXres-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXres-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxslt/CVE-2011-1202.patch b/abs/core/libxslt/CVE-2011-1202.patch new file mode 100644 index 0000000..61ea213 --- /dev/null +++ b/abs/core/libxslt/CVE-2011-1202.patch @@ -0,0 +1,56 @@ +From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Tue, 22 Feb 2011 02:14:23 +0000 +Subject: Fix generate-id() to not expose object addresses + +As pointed out by Chris Evans <scarybeasts@gmail.com> it's better +security wise to not expose object addresses directly, use a diff +w.r.t. the document root own address to avoid this +* libxslt/functions.c: fix IDs generation code +--- +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 4720c7a..de962f4 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) + void + xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + xmlNodePtr cur = NULL; +- unsigned long val; +- xmlChar str[20]; ++ long val; ++ xmlChar str[30]; ++ xmlDocPtr doc; + + if (nargs == 0) { + cur = ctxt->context->node; +@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + * Okay this is ugly but should work, use the NodePtr address + * to forge the ID + */ +- val = (unsigned long)((char *)cur - (char *)0); +- val /= sizeof(xmlNode); +- sprintf((char *)str, "id%ld", val); ++ if (cur->type != XML_NAMESPACE_DECL) ++ doc = cur->doc; ++ else { ++ xmlNsPtr ns = (xmlNsPtr) cur; ++ ++ if (ns->context != NULL) ++ doc = ns->context; ++ else ++ doc = ctxt->context->doc; ++ ++ } ++ ++ val = (long)((char *)cur - (char *)doc); ++ if (val >= 0) { ++ sprintf((char *)str, "idp%ld", val); ++ } else { ++ sprintf((char *)str, "idm%ld", -val); ++ } + valuePush(ctxt, xmlXPathNewString(str)); + } + +-- +cgit v0.9.0.2 diff --git a/abs/core/libxslt/PKGBUILD b/abs/core/libxslt/PKGBUILD index 33c4cdd..7cdc5e9 100644 --- a/abs/core/libxslt/PKGBUILD +++ b/abs/core/libxslt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87866 2010-08-18 15:17:10Z ibiru $ +# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -9,23 +9,34 @@ pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" license=('custom') -depends=('libxml2>=2.7.7' 'libgcrypt>=1.4.6') +depends=('libxml2' 'libgcrypt') makedepends=('python2') +checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) -md5sums=('e61d0364a30146aaa3001296f853b2b9') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz + CVE-2011-1202.patch) +md5sums=('e61d0364a30146aaa3001296f853b2b9' + 'ce9744943575efaa6b5501668899b753') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-python=/usr/bin/python2.7 + patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" + sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py + ./configure --prefix=/usr --with-python=/usr/bin/python2 make - make DESTDIR="${pkgdir}" install +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} - for f in pyxsltproc.py extfunc.py exslt.py extelem.py basic.py; do - sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -i ${pkgdir}/usr/share/doc/libxslt-python-1.1.26/examples/${f} - done +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + rm -f "${pkgdir}"/usr/lib/python*/site-packages/*.a } diff --git a/abs/core/libxss/PKGBUILD b/abs/core/libxss/PKGBUILD index 5bf80a4..5fafc2d 100644 --- a/abs/core/libxss/PKGBUILD +++ b/abs/core/libxss/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 97566 2010-10-31 15:57:08Z jgc $ +# $Id: PKGBUILD 152791 2012-03-09 16:28:04Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxss -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="X11 Screen Saver extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxext' 'scrnsaverproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2) -sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19') +source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2") +sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88') build() { cd "${srcdir}/libXScrnSaver-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd "${srcdir}/libXScrnSaver-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxss/libxss-1.2.2-1.src.tar.gz b/abs/core/libxss/libxss-1.2.2-1.src.tar.gz new file mode 120000 index 0000000..040aa82 --- /dev/null +++ b/abs/core/libxss/libxss-1.2.2-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/src_packages/libxss-1.2.2-1.src.tar.gz
\ No newline at end of file diff --git a/abs/core/libxt/PKGBUILD b/abs/core/libxt/PKGBUILD index a8126f0..8fd5b91 100644 --- a/abs/core/libxt/PKGBUILD +++ b/abs/core/libxt/PKGBUILD @@ -1,23 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 toolkit intrinsics library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') +source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") +sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') build() { cd "${srcdir}/libXt-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXt-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/libxtst/PKGBUILD b/abs/core/libxtst/PKGBUILD index be55b65..810b6d1 100644 --- a/abs/core/libxtst/PKGBUILD +++ b/abs/core/libxtst/PKGBUILD @@ -1,18 +1,18 @@ -# $Id$ +# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'libxi' 'recordproto' 'inputproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2) -sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72') +source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") +sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/abs/core/libxv/PKGBUILD b/abs/core/libxv/PKGBUILD index 4ac69a9..4484ad5 100644 --- a/abs/core/libxv/PKGBUILD +++ b/abs/core/libxv/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97586 2010-10-31 16:08:34Z jgc $ +# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxv -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64') @@ -11,14 +11,15 @@ url="http://xorg.freedesktop.org/" depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') -source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2) -sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c') +source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") +sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') build() { cd "${srcdir}/libXv-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXv-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxxf86dga/PKGBUILD b/abs/core/libxxf86dga/PKGBUILD index 182a2a8..c5be1ac 100644 --- a/abs/core/libxxf86dga/PKGBUILD +++ b/abs/core/libxxf86dga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97581 2010-10-31 16:05:58Z jgc $ +# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxxf86dga -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64') @@ -13,17 +13,17 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('333a9f5c61eba896f420969561606551174645cd') +sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') build() { cd "${srcdir}/libXxf86dga-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXxf86dga-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxxf86vm/PKGBUILD b/abs/core/libxxf86vm/PKGBUILD index d652897..0be6a06 100644 --- a/abs/core/libxxf86vm/PKGBUILD +++ b/abs/core/libxxf86vm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') @@ -12,14 +12,18 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') +sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') build() { cd "${srcdir}/libXxf86vm-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() +{ + cd "${srcdir}/libXxf86vm-${pkgver}" make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/licenses/LICENSE.ralink-firmware.txt b/abs/core/licenses/LICENSE.ralink-firmware.txt deleted file mode 100644 index 39e3c52..0000000 --- a/abs/core/licenses/LICENSE.ralink-firmware.txt +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2007, Ralink Technology Corporation
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions must reproduce the above copyright notice and the
- following disclaimer in the documentation and/or other materials
- provided with the distribution.
-* Neither the name of Ralink Technology Corporation nor the names of its
- suppliers may be used to endorse or promote products derived from this
- software without specific prior written permission.
-* No reverse engineering, decompilation, or disassembly of this software
- is permitted.
-
-Limited patent license. Ralink Technology Corporation grants a world-wide,
-royalty-free, non-exclusive license under patents it now or hereafter
-owns or controls to make, have made, use, import, offer to sell and
-sell ("Utilize") this software, but solely to the extent that any
-such patent is necessary to Utilize the software alone, or in
-combination with an operating system licensed under an approved Open
-Source license as listed by the Open Source Initiative at
-http://opensource.org/licenses. The patent license shall not apply to
-any other combinations which include this software. No hardware per
-se is licensed hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/abs/core/licenses/PKGBUILD b/abs/core/licenses/PKGBUILD index 82f838a..03aff44 100644 --- a/abs/core/licenses/PKGBUILD +++ b/abs/core/licenses/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 1848 2008-05-22 00:45:32Z eric $ +# $Id: PKGBUILD 141262 2011-10-27 16:12:32Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=licenses -pkgver=2.4 -pkgrel=10 +pkgver=2.9 +pkgrel=1 pkgdesc="The standard licenses distribution package" -arch=('i686' 'x86_64') +arch=('any') license=('custom:none') -url="http://archlinux.org" +url="http://www.archlinux.org/" groups=('base') -source=(http://www.apache.org/licenses/LICENSE-2.0.txt +makedepends=(links) +source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt cc-by-3.0.txt cc-by-nc-3.0.txt cc-by-nc-nd-3.0.txt @@ -19,83 +20,99 @@ source=(http://www.apache.org/licenses/LICENSE-2.0.txt cc-readme.txt cddl-1.0.txt eclipse-1.0.txt - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + http://www.gnu.org/licenses/agpl-3.0.txt + http://www.gnu.org/licenses/gpl-2.0.txt http://www.gnu.org/licenses/gpl-3.0.txt - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt - http://www.gnu.org/licenses/lgpl.txt - http://www.gnu.org/licenses/fdl.txt + http://www.gnu.org/licenses/lgpl-2.1.txt + http://www.gnu.org/licenses/lgpl-3.0.txt + http://www.gnu.org/licenses/fdl-1.2.txt + http://www.gnu.org/licenses/fdl-1.3.txt http://www.latex-project.org/lppl.txt http://www.mozilla.org/MPL/MPL-1.1.txt perlartistic.txt - http://www.php.net/license/3_0.txt - http://www.ruby-lang.org/en/LICENSE.txt + http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt + php-3.0.txt::http://www.php.net/license/3_0.txt + ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt cpl-1.0.txt python-2.txt - LICENSE.ralink-firmware.txt + w3c.html::http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 ZopePublicLicense.txt) build() { - cd $startdir/pkg + cd $pkgdir mkdir -p usr/share/licenses/common cd usr/share/licenses/common - mkdir APACHE - cp $startdir/src/LICENSE-2.0.txt APACHE/license.txt + mkdir AGPL3 + cp $srcdir/agpl-3.0.txt AGPL3/license.txt + ln -s AGPL3 AGPL + + mkdir Apache + cp $srcdir/apache-2.0.txt Apache/license.txt + ln -s Apache APACHE + + mkdir Artistic2.0 + cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt mkdir CCPL - cp $startdir/src/cc-by-3.0.txt CCPL/ - cp $startdir/src/cc-by-nc-3.0.txt CCPL/ - cp $startdir/src/cc-by-nc-nd-3.0.txt CCPL/ - cp $startdir/src/cc-by-nc-sa-3.0.txt CCPL/ - cp $startdir/src/cc-by-nd-3.0.txt CCPL/ - cp $startdir/src/cc-by-sa-3.0.txt CCPL/ - cp $startdir/src/cc-readme.txt CCPL/ + cp $srcdir/cc-by-3.0.txt CCPL/ + cp $srcdir/cc-by-nc-3.0.txt CCPL/ + cp $srcdir/cc-by-nc-nd-3.0.txt CCPL/ + cp $srcdir/cc-by-nc-sa-3.0.txt CCPL/ + cp $srcdir/cc-by-nd-3.0.txt CCPL/ + cp $srcdir/cc-by-sa-3.0.txt CCPL/ + cp $srcdir/cc-readme.txt CCPL/ mkdir CDDL - cp $startdir/src/cddl-1.0.txt CDDL/license.txt + cp $srcdir/cddl-1.0.txt CDDL/license.txt mkdir CPL - cp $startdir/src/cpl-1.0.txt CPL/license.txt + cp $srcdir/cpl-1.0.txt CPL/license.txt mkdir EPL - cp $startdir/src/eclipse-1.0.txt EPL/license.txt + cp $srcdir/eclipse-1.0.txt EPL/license.txt - mkdir {GPL,GPL3} - cp $startdir/src/gpl-2.0.txt GPL/license.txt - cp $startdir/src/gpl-3.0.txt GPL3/license.txt - ln -s GPL GPL2 + mkdir {GPL2,GPL3} + cp $srcdir/gpl-2.0.txt GPL2/license.txt + cp $srcdir/gpl-3.0.txt GPL3/license.txt + ln -s GPL2 GPL - mkdir FDL - cp $startdir/src/fdl.txt FDL/license.txt + mkdir {FDL1.2,FDL1.3} + cp $srcdir/fdl-1.2.txt FDL1.2/license.txt + cp $srcdir/fdl-1.3.txt FDL1.3/license.txt + ln -s FDL1.2 FDL - mkdir {LGPL,LGPL3} - cp $startdir/src/lgpl-2.1.txt LGPL/license.txt - cp $startdir/src/lgpl.txt LGPL3/license.txt - ln -s LGPL LGPL2 + mkdir {LGPL2.1,LGPL3} + cp $srcdir/lgpl-2.1.txt LGPL2.1/license.txt + cp $srcdir/lgpl-3.0.txt LGPL3/license.txt + ln -s LGPL2.1 LGPL mkdir LPPL - cp $startdir/src/lppl.txt LPPL/license.txt + cp $srcdir/lppl.txt LPPL/license.txt mkdir MPL - cp $startdir/src/MPL-1.1.txt MPL/license.txt + cp $srcdir/MPL-1.1.txt MPL/license.txt mkdir PerlArtistic - cp $startdir/src/perlartistic.txt PerlArtistic/license.txt + cp $srcdir/perlartistic.txt PerlArtistic/license.txt mkdir PHP - cp $startdir/src/3_0.txt PHP/license.txt + cp $srcdir/php-3.0.txt PHP/license.txt mkdir PSF - cp $startdir/src/python-2.txt PSF/license.txt - - mkdir RALINK - cp $startdir/src/LICENSE.ralink-firmware.txt RALINK/license.txt + cp $srcdir/python-2.txt PSF/license.txt mkdir RUBY - cp $startdir/src/LICENSE.txt RUBY/license.txt + cp $srcdir/ruby-license.txt RUBY/license.txt + + mkdir W3C + # Text-ize the HTML version, prune the header and footer garbage + links -dump $srcdir/w3c.html |\ + sed -n -e '/^Footer Navigation/ q' \ + -e '/^ *W3C Software Notice and License/,$ p'> W3C/license.txt mkdir ZPL - cp $startdir/src/ZopePublicLicense.txt ZPL/license.txt + cp $srcdir/ZopePublicLicense.txt ZPL/license.txt } md5sums=('3b83ef96387f14655fc854ddc3c6bd57' 'ffb24d1bbf8b83d373f0b8edc3feb0c6' @@ -107,17 +124,20 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57' '019bc72509b18a804f0ea8fd2bab1932' '6cb35f3976cd093011967fa1abbce386' 'f300afd598546add034364cd0a533261' + '73f1eb20517c55bf9493b7dd6e480788' 'b234ee4d69f5fce4486a80fdaf4a4263' 'd32239bcb673463ab874e80d47fae504' '4fbd65380cdd255951079008b364516c' 'e6a600fd5e1d9cbde2d983680233ad02' + '24ea4c7092233849b4394699333b5c56' '10b9de612d532fdeeb7fe8fcd1435cc6' '9f4337828d782bdea41f03dd2ad1b808' 'bfe1f75d606912a4111c90743d6c7325' 'd09c120ca7db95ef2aeecec0cb08293b' + 'b4a94da2a1f918b217ef5156634fc9e0' 'a45bb1bbeed9e26b26c5763df1d3913d' - '68d59ff8306e3a9f5f1c01462c77a317' + 'f24b942d957112d759762054b6e7cf34' 'f083e41c43db25e18f36c91e57750b64' - '614f4f550910d90428a567cfaafe62a9' - '682eac07428a4e8f138bc082f090ecac' + 'a055911c32fb4ed6e96c453ceaeba857' + '43c1812e20ef83027007743df7a4c457' 'dc8502850eab9e1ff330a12d7ca18a19') diff --git a/abs/core/licenses/core-any.r82624/LICENSE.ralink-firmware.txt b/abs/core/licenses/core-any.r82624/LICENSE.ralink-firmware.txt deleted file mode 100644 index 39e3c52..0000000 --- a/abs/core/licenses/core-any.r82624/LICENSE.ralink-firmware.txt +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2007, Ralink Technology Corporation
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions must reproduce the above copyright notice and the
- following disclaimer in the documentation and/or other materials
- provided with the distribution.
-* Neither the name of Ralink Technology Corporation nor the names of its
- suppliers may be used to endorse or promote products derived from this
- software without specific prior written permission.
-* No reverse engineering, decompilation, or disassembly of this software
- is permitted.
-
-Limited patent license. Ralink Technology Corporation grants a world-wide,
-royalty-free, non-exclusive license under patents it now or hereafter
-owns or controls to make, have made, use, import, offer to sell and
-sell ("Utilize") this software, but solely to the extent that any
-such patent is necessary to Utilize the software alone, or in
-combination with an operating system licensed under an approved Open
-Source license as listed by the Open Source Initiative at
-http://opensource.org/licenses. The patent license shall not apply to
-any other combinations which include this software. No hardware per
-se is licensed hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/abs/core/licenses/core-any.r82624/PKGBUILD b/abs/core/licenses/core-any.r82624/PKGBUILD deleted file mode 100644 index ee65e92..0000000 --- a/abs/core/licenses/core-any.r82624/PKGBUILD +++ /dev/null @@ -1,127 +0,0 @@ -# $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=licenses -pkgver=2.6 -pkgrel=1 -pkgdesc="The standard licenses distribution package" -arch=('any') -license=('custom:none') -url="http://archlinux.org" -groups=('base') -source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt - cc-by-3.0.txt - cc-by-nc-3.0.txt - cc-by-nc-nd-3.0.txt - cc-by-nc-sa-3.0.txt - cc-by-nd-3.0.txt - cc-by-sa-3.0.txt - cc-readme.txt - cddl-1.0.txt - eclipse-1.0.txt - http://www.gnu.org/licenses/gpl-2.0.txt - http://www.gnu.org/licenses/gpl-3.0.txt - http://www.gnu.org/licenses/lgpl-2.1.txt - http://www.gnu.org/licenses/lgpl-3.0.txt - http://www.gnu.org/licenses/fdl-1.2.txt - http://www.gnu.org/licenses/fdl-1.3.txt - http://www.latex-project.org/lppl.txt - http://www.mozilla.org/MPL/MPL-1.1.txt - perlartistic.txt - php-3.0.txt::http://www.php.net/license/3_0.txt - ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt - cpl-1.0.txt - python-2.txt - LICENSE.ralink-firmware.txt - ZopePublicLicense.txt) -md5sums=('3b83ef96387f14655fc854ddc3c6bd57' - 'ffb24d1bbf8b83d373f0b8edc3feb0c6' - '682a5e3b03510ba46c4f566478c871bc' - '166b65b71e44630b436bfe937c4c0b73' - '89bca4a2dde8b7d39c27a1dc24078932' - '2502517d13d8136fffaf248489ad0870' - '5367190077e12a7f55403d531ef3998e' - '019bc72509b18a804f0ea8fd2bab1932' - '6cb35f3976cd093011967fa1abbce386' - 'f300afd598546add034364cd0a533261' - 'b234ee4d69f5fce4486a80fdaf4a4263' - 'd32239bcb673463ab874e80d47fae504' - '4fbd65380cdd255951079008b364516c' - 'e6a600fd5e1d9cbde2d983680233ad02' - '24ea4c7092233849b4394699333b5c56' - '10b9de612d532fdeeb7fe8fcd1435cc6' - '9f4337828d782bdea41f03dd2ad1b808' - 'bfe1f75d606912a4111c90743d6c7325' - 'd09c120ca7db95ef2aeecec0cb08293b' - 'a45bb1bbeed9e26b26c5763df1d3913d' - '68d59ff8306e3a9f5f1c01462c77a317' - 'f083e41c43db25e18f36c91e57750b64' - 'a055911c32fb4ed6e96c453ceaeba857' - '682eac07428a4e8f138bc082f090ecac' - 'dc8502850eab9e1ff330a12d7ca18a19') - -build() { - cd $pkgdir - mkdir -p usr/share/licenses/common - cd usr/share/licenses/common - - mkdir APACHE - cp $srcdir/apache-2.0.txt APACHE/license.txt - - mkdir CCPL - cp $srcdir/cc-by-3.0.txt CCPL/ - cp $srcdir/cc-by-nc-3.0.txt CCPL/ - cp $srcdir/cc-by-nc-nd-3.0.txt CCPL/ - cp $srcdir/cc-by-nc-sa-3.0.txt CCPL/ - cp $srcdir/cc-by-nd-3.0.txt CCPL/ - cp $srcdir/cc-by-sa-3.0.txt CCPL/ - cp $srcdir/cc-readme.txt CCPL/ - - mkdir CDDL - cp $srcdir/cddl-1.0.txt CDDL/license.txt - - mkdir CPL - cp $srcdir/cpl-1.0.txt CPL/license.txt - - mkdir EPL - cp $srcdir/eclipse-1.0.txt EPL/license.txt - - mkdir {GPL2,GPL3} - cp $srcdir/gpl-2.0.txt GPL2/license.txt - cp $srcdir/gpl-3.0.txt GPL3/license.txt - ln -s GPL2 GPL - - mkdir {FDL1.2,FDL1.3} - cp $srcdir/fdl-1.2.txt FDL1.2/license.txt - cp $srcdir/fdl-1.3.txt FDL1.3/license.txt - ln -s FDL1.2 FDL - - mkdir {LGPL2.1,LGPL3} - cp $srcdir/lgpl-2.1.txt LGPL2.1/license.txt - cp $srcdir/lgpl-3.0.txt LGPL3/license.txt - ln -s LGPL2.1 LGPL - - mkdir LPPL - cp $srcdir/lppl.txt LPPL/license.txt - - mkdir MPL - cp $srcdir/MPL-1.1.txt MPL/license.txt - - mkdir PerlArtistic - cp $srcdir/perlartistic.txt PerlArtistic/license.txt - - mkdir PHP - cp $srcdir/php-3.0.txt PHP/license.txt - - mkdir PSF - cp $srcdir/python-2.txt PSF/license.txt - - mkdir RALINK - cp $srcdir/LICENSE.ralink-firmware.txt RALINK/license.txt - - mkdir RUBY - cp $srcdir/ruby-license.txt RUBY/license.txt - - mkdir ZPL - cp $srcdir/ZopePublicLicense.txt ZPL/license.txt -} diff --git a/abs/core/licenses/core-any.r82624/ZopePublicLicense.txt b/abs/core/licenses/core-any.r82624/ZopePublicLicense.txt deleted file mode 100644 index 0f06d96..0000000 --- a/abs/core/licenses/core-any.r82624/ZopePublicLicense.txt +++ /dev/null @@ -1,54 +0,0 @@ -Zope Public License (ZPL) Version 2.1 -------------------------------------- - -A copyright notice accompanies this license document that -identifies the copyright holders. - -This license has been certified as open source. It has also -been designated as GPL compatible by the Free Software -Foundation (FSF). - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions in source code must retain the - accompanying copyright notice, this list of conditions, - and the following disclaimer. - -2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -3. Names of the copyright holders must not be used to - endorse or promote products derived from this software - without prior written permission from the copyright - holders. - -4. The right to distribute this software or to use it for - any purpose does not give you the right to use - Servicemarks (sm) or Trademarks (tm) of the copyright - holders. Use of them is covered by separate agreement - with the copyright holders. - -5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. - -Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' - AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT - NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - NO EVENT SHALL THE COPYRIGHT HOLDERS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. diff --git a/abs/core/licenses/core-any.r82624/cc-by-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-3.0.txt deleted file mode 100644 index 4c79aa8..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-3.0.txt +++ /dev/null @@ -1,60 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. - 2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-by-nc-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-nc-3.0.txt deleted file mode 100644 index 5727b7f..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-nc-3.0.txt +++ /dev/null @@ -1,61 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d). - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. - 2. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. - 3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 4. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, - 3. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). - 5. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-by-nc-nd-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-nc-nd-3.0.txt deleted file mode 100644 index 26ed016..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-nc-nd-3.0.txt +++ /dev/null @@ -1,58 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, - 2. to Distribute and Publicly Perform the Work including as incorporated in Collections. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d). - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. - 2. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. - 3. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 4. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, - 3. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b). - 5. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 4. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 5. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-by-nc-sa-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-nc-sa-3.0.txt deleted file mode 100644 index 7d1af0e..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-nc-sa-3.0.txt +++ /dev/null @@ -1,63 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(g) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 4. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike. - 5. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 6. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 7. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 8. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 9. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 10. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights described in Section 4(e). - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(d), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(d), as requested. - 2. You may Distribute or Publicly Perform an Adaptation only under: (i) the terms of this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). You must include a copy of, or the URI, for Applicable License with every copy of each Adaptation You Distribute or Publicly Perform. You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License. You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. - 3. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in con-nection with the exchange of copyrighted works. - 4. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(d) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, - 3. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). - 6. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-by-nd-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-nd-3.0.txt deleted file mode 100644 index 118019e..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-nd-3.0.txt +++ /dev/null @@ -1,57 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, - 2. to Distribute and Publicly Perform the Work including as incorporated in Collections. - 3. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. - 2. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(b) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 4. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 5. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-by-sa-3.0.txt b/abs/core/licenses/core-any.r82624/cc-by-sa-3.0.txt deleted file mode 100644 index 7252d9c..0000000 --- a/abs/core/licenses/core-any.r82624/cc-by-sa-3.0.txt +++ /dev/null @@ -1,63 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. - 3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. - 4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. - 6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. - 2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. - 3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/abs/core/licenses/core-any.r82624/cc-readme.txt b/abs/core/licenses/core-any.r82624/cc-readme.txt deleted file mode 100644 index 38ed7c8..0000000 --- a/abs/core/licenses/core-any.r82624/cc-readme.txt +++ /dev/null @@ -1,12 +0,0 @@ -There are 6 different Creative Commons Licenses, all of which are included -in this licenses directory: - -cc-by-3.0.txt - Attribution -cc-by-nc-3.0.txt - Attribution-NonCommercial -cc-by-nc-nd-3.0.txt - Attribution-NonCommercial-NoDerivs -cc-by-nc-sa-3.0.txt - Attribution-NonCommercial-ShareAlike -cc-by-nd-3.0.txt - Attribution-NoDerivs -cc-by-sa-3.0.txt - Attribution-ShareAlike - -If a package uses one of these licenses, it should be referenced as follows: -license=('CCPL:by-nc-sa') diff --git a/abs/core/licenses/core-any.r82624/cddl-1.0.txt b/abs/core/licenses/core-any.r82624/cddl-1.0.txt deleted file mode 100644 index d838932..0000000 --- a/abs/core/licenses/core-any.r82624/cddl-1.0.txt +++ /dev/null @@ -1,377 +0,0 @@ -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 - -1. Definitions. - - 1.1. "Contributor" means each individual or entity that creates - or contributes to the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Software, prior Modifications used by a Contributor (if any), - and the Modifications made by that particular Contributor. - - 1.3. "Covered Software" means (a) the Original Software, or (b) - Modifications, or (c) the combination of files containing - Original Software with files containing Modifications, in - each case including portions thereof. - - 1.4. "Executable" means the Covered Software in any form other - than Source Code. - - 1.5. "Initial Developer" means the individual or entity that first - makes Original Software available under this License. - - 1.6. "Larger Work" means a work which combines Covered Software or - portions thereof with code not governed by the terms of this - License. - - 1.7. "License" means this document. - - 1.8. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed - herein. - - 1.9. "Modifications" means the Source Code and Executable form of - any of the following: - - A. Any file that results from an addition to, deletion from or - modification of the contents of a file containing Original - Software or previous Modifications; - - B. Any new file that contains any part of the Original - Software or previous Modifications; or - - C. Any new file that is contributed or otherwise made - available under the terms of this License. - - 1.10. "Original Software" means the Source Code and Executable - form of computer software code that is originally released - under this License. - - 1.11. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, - process, and apparatus claims, in any patent Licensable by - grantor. - - 1.12. "Source Code" means (a) the common form of computer software - code in which modifications are made and (b) associated - documentation included in or with such code. - - 1.13. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms - of, this License. For legal entities, "You" includes any - entity which controls, is controlled by, or is under common - control with You. For purposes of this definition, - "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty - percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants. - - 2.1. The Initial Developer Grant. - - Conditioned upon Your compliance with Section 3.1 below and - subject to third party intellectual property claims, the Initial - Developer hereby grants You a world-wide, royalty-free, - non-exclusive license: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer, to use, - reproduce, modify, display, perform, sublicense and - distribute the Original Software (or portions thereof), - with or without Modifications, and/or as part of a Larger - Work; and - - (b) under Patent Claims infringed by the making, using or - selling of Original Software, to make, have made, use, - practice, sell, and offer for sale, and/or otherwise - dispose of the Original Software (or portions thereof). - - (c) The licenses granted in Sections 2.1(a) and (b) are - effective on the date Initial Developer first distributes - or otherwise makes the Original Software available to a - third party under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: (1) for code that You delete from the Original - Software, or (2) for infringements caused by: (i) the - modification of the Original Software, or (ii) the - combination of the Original Software with other software - or devices. - - 2.2. Contributor Grant. - - Conditioned upon Your compliance with Section 3.1 below and - subject to third party intellectual property claims, each - Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor to use, reproduce, - modify, display, perform, sublicense and distribute the - Modifications created by such Contributor (or portions - thereof), either on an unmodified basis, with other - Modifications, as Covered Software and/or as part of a - Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either - alone and/or in combination with its Contributor Version - (or portions of such combination), to make, use, sell, - offer for sale, have made, and/or otherwise dispose of: - (1) Modifications made by that Contributor (or portions - thereof); and (2) the combination of Modifications made by - that Contributor with its Contributor Version (or portions - of such combination). - - (c) The licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first distributes or - otherwise makes the Modifications available to a third - party. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: (1) for any code that Contributor has deleted - from the Contributor Version; (2) for infringements caused - by: (i) third party modifications of Contributor Version, - or (ii) the combination of Modifications made by that - Contributor with other software (except as part of the - Contributor Version) or other devices; or (3) under Patent - Claims infringed by Covered Software in the absence of - Modifications made by that Contributor. - -3. Distribution Obligations. - - 3.1. Availability of Source Code. - - Any Covered Software that You distribute or otherwise make - available in Executable form must also be made available in Source - Code form and that Source Code form must be distributed only under - the terms of this License. You must include a copy of this - License with every copy of the Source Code form of the Covered - Software You distribute or otherwise make available. You must - inform recipients of any such Covered Software in Executable form - as to how they can obtain such Covered Software in Source Code - form in a reasonable manner on or through a medium customarily - used for software exchange. - - 3.2. Modifications. - - The Modifications that You create or to which You contribute are - governed by the terms of this License. You represent that You - believe Your Modifications are Your original creation(s) and/or - You have sufficient rights to grant the rights conveyed by this - License. - - 3.3. Required Notices. - - You must include a notice in each of Your Modifications that - identifies You as the Contributor of the Modification. You may - not remove or alter any copyright, patent or trademark notices - contained within the Covered Software, or any notices of licensing - or any descriptive text giving attribution to any Contributor or - the Initial Developer. - - 3.4. Application of Additional Terms. - - You may not offer or impose any terms on any Covered Software in - Source Code form that alters or restricts the applicable version - of this License or the recipients' rights hereunder. You may - choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of - Covered Software. However, you may do so only on Your own behalf, - and not on behalf of the Initial Developer or any Contributor. - You must make it absolutely clear that any such warranty, support, - indemnity or liability obligation is offered by You alone, and You - hereby agree to indemnify the Initial Developer and every - Contributor for any liability incurred by the Initial Developer or - such Contributor as a result of warranty, support, indemnity or - liability terms You offer. - - 3.5. Distribution of Executable Versions. - - You may distribute the Executable form of the Covered Software - under the terms of this License or under the terms of a license of - Your choice, which may contain terms different from this License, - provided that You are in compliance with the terms of this License - and that the license for the Executable form does not attempt to - limit or alter the recipient's rights in the Source Code form from - the rights set forth in this License. If You distribute the - Covered Software in Executable form under a different license, You - must make it absolutely clear that any terms which differ from - this License are offered by You alone, not by the Initial - Developer or Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred - by the Initial Developer or such Contributor as a result of any - such terms You offer. - - 3.6. Larger Works. - - You may create a Larger Work by combining Covered Software with - other code not governed by the terms of this License and - distribute the Larger Work as a single product. In such a case, - You must make sure the requirements of this License are fulfilled - for the Covered Software. - -4. Versions of the License. - - 4.1. New Versions. - - Sun Microsystems, Inc. is the initial license steward and may - publish revised and/or new versions of this License from time to - time. Each version will be given a distinguishing version number. - Except as provided in Section 4.3, no one other than the license - steward has the right to modify this License. - - 4.2. Effect of New Versions. - - You may always continue to use, distribute or otherwise make the - Covered Software available under the terms of the version of the - License under which You originally received the Covered Software. - If the Initial Developer includes a notice in the Original - Software prohibiting it from being distributed or otherwise made - available under any subsequent version of the License, You must - distribute and make the Covered Software available under the terms - of the version of the License under which You originally received - the Covered Software. Otherwise, You may also choose to use, - distribute or otherwise make the Covered Software available under - the terms of any subsequent version of the License published by - the license steward. - - 4.3. Modified Versions. - - When You are an Initial Developer and You want to create a new - license for Your Original Software, You may create and use a - modified version of this License if You: (a) rename the license - and remove any references to the name of the license steward - (except to note that the license differs from this License); and - (b) otherwise make it clear that the license contains terms which - differ from this License. - -5. DISCLAIMER OF WARRANTY. - - COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" - BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, - INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED - SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR - PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND - PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY - COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE - INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY - NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF - WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS - DISCLAIMER. - -6. TERMINATION. - - 6.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to - cure such breach within 30 days of becoming aware of the breach. - Provisions which, by their nature, must remain in effect beyond - the termination of this License shall survive. - - 6.2. If You assert a patent infringement claim (excluding - declaratory judgment actions) against Initial Developer or a - Contributor (the Initial Developer or Contributor against whom You - assert such claim is referred to as "Participant") alleging that - the Participant Software (meaning the Contributor Version where - the Participant is a Contributor or the Original Software where - the Participant is the Initial Developer) directly or indirectly - infringes any patent, then any and all rights granted directly or - indirectly to You by such Participant, the Initial Developer (if - the Initial Developer is not the Participant) and all Contributors - under Sections 2.1 and/or 2.2 of this License shall, upon 60 days - notice from Participant terminate prospectively and automatically - at the expiration of such 60 day notice period, unless if within - such 60 day period You withdraw Your claim with respect to the - Participant Software against such Participant either unilaterally - or pursuant to a written agreement with Participant. - - 6.3. In the event of termination under Sections 6.1 or 6.2 above, - all end user licenses that have been validly granted by You or any - distributor hereunder prior to termination (excluding licenses - granted to You by any distributor) shall survive termination. - -7. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE - INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF - COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE - LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR - CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT - LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK - STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL - INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT - APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO - NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR - CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT - APPLY TO YOU. - -8. U.S. GOVERNMENT END USERS. - - The Covered Software is a "commercial item," as that term is - defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial - computer software" (as that term is defined at 48 - C.F.R. 252.227-7014(a)(1)) and "commercial computer software - documentation" as such terms are used in 48 C.F.R. 12.212 - (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 - C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all - U.S. Government End Users acquire Covered Software with only those - rights set forth herein. This U.S. Government Rights clause is in - lieu of, and supersedes, any other FAR, DFAR, or other clause or - provision that addresses Government rights in computer software - under this License. - -9. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed - by the law of the jurisdiction specified in a notice contained - within the Original Software (except to the extent applicable law, - if any, provides otherwise), excluding such jurisdiction's - conflict-of-law provisions. Any litigation relating to this - License shall be subject to the jurisdiction of the courts located - in the jurisdiction and venue specified in a notice contained - within the Original Software, with the losing party responsible - for costs, including, without limitation, court costs and - reasonable attorneys' fees and expenses. The application of the - United Nations Convention on Contracts for the International Sale - of Goods is expressly excluded. Any law or regulation which - provides that the language of a contract shall be construed - against the drafter shall not apply to this License. You agree - that You alone are responsible for compliance with the United - States export administration regulations (and the export control - laws and regulation of any other countries) when You use, - distribute or otherwise make available any Covered Software. - -10. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or - indirectly, out of its utilization of rights under this License - and You agree to work with Initial Developer and Contributors to - distribute such responsibility on an equitable basis. Nothing - herein is intended or shall be deemed to constitute any admission - of liability. - --------------------------------------------------------------------- - -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND -DISTRIBUTION LICENSE (CDDL) - -For Covered Software in this distribution, this License shall -be governed by the laws of the State of California (excluding -conflict-of-law provisions). - -Any litigation relating to this License shall be subject to the -jurisdiction of the Federal Courts of the Northern District of -California and the state courts of the State of California, with -venue lying in Santa Clara County, California. diff --git a/abs/core/licenses/core-any.r82624/cpl-1.0.txt b/abs/core/licenses/core-any.r82624/cpl-1.0.txt deleted file mode 100644 index c48081b..0000000 --- a/abs/core/licenses/core-any.r82624/cpl-1.0.txt +++ /dev/null @@ -1,217 +0,0 @@ -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' from a - Contributor if it was added to the Program by such Contributor itself or anyone - acting on such Contributor's behalf. Contributions do not include additions to - the Program which: (i) are separate modules of software distributed in - conjunction with the Program under their own license agreement, and (ii) are - not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free copyright license to - reproduce, prepare derivative works of, publicly display, publicly perform, - distribute and sublicense the Contribution of such Contributor, if any, and - such derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free patent license under - Licensed Patents to make, use, sell, offer to sell, import and otherwise - transfer the Contribution of such Contributor, if any, in source code and - object code form. This patent license shall apply to the combination of the - Contribution and the Program if, at the time the Contribution is added by the - Contributor, such addition of the Contribution causes such combination to be - covered by the Licensed Patents. The patent license shall not apply to any - other combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other intellectual - property rights of any other entity. Each Contributor disclaims any liability - to Recipient for claims brought by any other entity based on infringement of - intellectual property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby assumes sole - responsibility to secure any other intellectual property rights needed, if any. - For example, if a third party patent license is required to allow Recipient to - distribute the Program, it is Recipient's responsibility to acquire that - license before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright license - set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all warranties and - conditions, express and implied, including warranties or conditions of title - and non-infringement, and implied warranties or conditions of merchantability - and fitness for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and consequential - damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement are offered - by that Contributor alone and not by any other party; and - - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable manner on - or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within -the Program. - -Each Contributor must identify itself as the originator of its Contribution, -if any, in a manner that reasonably allows subsequent Recipients to identify -the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor -to control, and cooperate with the Commercial Contributor in, the defense and -any related settlement negotiations. The Indemnified Contributor may -participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its exercise -of rights under this Agreement, including but not limited to the risks and -costs of program errors, compliance with applicable laws, damage to or loss of -data, programs or equipment, and unavailability or interruption of operations. - - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY -WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of the -remainder of the terms of this Agreement, and without further action by the -parties hereto, such provision shall be reformed to the minimum extent -necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect -to a patent applicable to software (including a cross-claim or counterclaim in -a lawsuit), then any patent licenses granted by that Contributor to such -Recipient under this Agreement shall terminate as of the date such litigation -is filed. In addition, if Recipient institutes patent litigation against any -entity (including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other software or -hardware) infringes such Recipient's patent(s), then such Recipient's rights -granted under Section 2(b) shall terminate as of the date such litigation is -filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to -serve as the Agreement Steward to a suitable separate entity. Each new version -of the Agreement will be given a distinguishing version number. The Program -(including Contributions) may always be distributed subject to the version of -the Agreement under which it was received. In addition, after a new version of -the Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly stated -in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to -the intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial -in any resulting litigation. diff --git a/abs/core/licenses/core-any.r82624/eclipse-1.0.txt b/abs/core/licenses/core-any.r82624/eclipse-1.0.txt deleted file mode 100644 index f61d34d..0000000 --- a/abs/core/licenses/core-any.r82624/eclipse-1.0.txt +++ /dev/null @@ -1,88 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - - diff --git a/abs/core/licenses/core-any.r82624/perlartistic.txt b/abs/core/licenses/core-any.r82624/perlartistic.txt deleted file mode 100644 index aaf7c88..0000000 --- a/abs/core/licenses/core-any.r82624/perlartistic.txt +++ /dev/null @@ -1,151 +0,0 @@ -NAME - perlartistic - the Perl Artistic License - -SYNOPSIS - You can refer to this document in Pod via "L<perlartistic>" - Or you can see this document by entering "perldoc perlartistic" - -DESCRIPTION - This is "The Artistic License". It's here so that modules, programs, - etc., that want to declare this as their distribution license, can link - to it. - - It is also one of the two licenses Perl allows itself to be - redistributed and/or modified; for the other one, the GNU General Public - License, see the perlgpl. - -The "Artistic License" - Preamble - The intent of this document is to state the conditions under which a - Package may be copied, such that the Copyright Holder maintains some - semblance of artistic control over the development of the package, while - giving the users of the package the right to use and distribute the - Package in a more-or-less customary fashion, plus the right to make - reasonable modifications. - - Definitions - "Package" - refers to the collection of files distributed by the Copyright - Holder, and derivatives of that collection of files created through - textual modification. - - "Standard Version" - refers to such a Package if it has not been modified, or has been - modified in accordance with the wishes of the Copyright Holder as - specified below. - - "Copyright Holder" - is whoever is named in the copyright or copyrights for the package. - - "You" - is you, if you're thinking about copying or distributing this - Package. - - "Reasonable copying fee" - is whatever you can justify on the basis of media cost, duplication - charges, time of people involved, and so on. (You will not be - required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) - - "Freely Available" - means that no fee is charged for the item itself, though there may - be fees involved in handling the item. It also means that recipients - of the item may redistribute it under the same conditions they - received it. - - Conditions - 1. You may make and give away verbatim copies of the source form of the - Standard Version of this Package without restriction, provided that - you duplicate all of the original copyright notices and associated - disclaimers. - - 2. You may apply bug fixes, portability fixes and other modifications - derived from the Public Domain or from the Copyright Holder. A - Package modified in such a way shall still be considered the - Standard Version. - - 3. You may otherwise modify your copy of this Package in any way, - provided that you insert a prominent notice in each changed file - stating how and when you changed that file, and provided that you do - at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise make - them Freely Available, such as by posting said modifications to - Usenet or an equivalent medium, or placing the modifications on - a major archive site such as uunet.uu.net, or by allowing the - Copyright Holder to include your modifications in the Standard - Version of the Package. - - b) use the modified Package only within your corporation or - organization. - - c) rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided, and - provide a separate manual page for each non-standard executable - that clearly documents how it differs from the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - - 4. You may distribute the programs of this Package in object code or - executable form, provided that you do at least ONE of the following: - - a) distribute a Standard Version of the executables and library - files, together with instructions (in the manual page or - equivalent) on where to get the Standard Version. - - b) accompany the distribution with the machine-readable source of - the Package with your modifications. - - c) give non-standard executables non-standard names, and clearly - document the differences in manual pages (or equivalent), - together with instructions on where to get the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - - 5. You may charge a reasonable copying fee for any distribution of this - Package. You may charge any fee you choose for support of this - Package. You may not charge a fee for this Package itself. However, - you may distribute this Package in aggregate with other (possibly - commercial) programs as part of a larger (possibly commercial) - software distribution provided that you do not advertise this - Package as a product of your own. You may embed this Package's - interpreter within an executable of yours (by linking); this shall - be construed as a mere form of aggregation, provided that the - complete Standard Version of the interpreter is so embedded. - - 6. The scripts and library files supplied as input to or produced as - output from the programs of this Package do not automatically fall - under the copyright of this Package, but belong to whoever generated - them, and may be sold commercially, and may be aggregated with this - Package. If such scripts or library files are aggregated with this - Package via the so-called "undump" or "unexec" methods of producing - a binary executable image, then distribution of such an image shall - neither be construed as a distribution of this Package nor shall it - fall under the restrictions of Paragraphs 3 and 4, provided that you - do not represent such an executable image as a Standard Version of - this Package. - - 7. C subroutines (or comparably compiled subroutines in other - languages) supplied by you and linked into this Package in order to - emulate subroutines and variables of the language defined by this - Package shall not be considered part of this Package, but are the - equivalent of input as in Paragraph 6, provided these subroutines do - not change the language in any way that would cause it to fail the - regression tests for the language. - - 8. Aggregation of this Package with a commercial distribution is always - permitted provided that the use of this Package is embedded; that - is, when no overt attempt is made to make this Package's interfaces - visible to the end user of the commercial distribution. Such use - shall not be construed as a distribution of this Package. - - 9. The name of the Copyright Holder may not be used to endorse or - promote products derived from this software without specific prior - written permission. - - 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - The End - diff --git a/abs/core/licenses/core-any.r82624/python-2.txt b/abs/core/licenses/core-any.r82624/python-2.txt deleted file mode 100644 index 454f4ea..0000000 --- a/abs/core/licenses/core-any.r82624/python-2.txt +++ /dev/null @@ -1,193 +0,0 @@ -PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 --------------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using this software ("Python") in source or binary form and -its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python -alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; -All Rights Reserved" are retained in Python alone or in any derivative -version prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python. - -4. PSF is making Python available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - -2. Subject to the terms and conditions of this BeOpen Python License -Agreement, BeOpen hereby grants Licensee a non-exclusive, -royalty-free, world-wide license to reproduce, analyze, test, perform -and/or display publicly, prepare derivative works, distribute, and -otherwise use the Software alone or in any derivative version, -provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -6. This License Agreement shall be governed by and interpreted in all -respects by the law of the State of California, excluding conflict of -law provisions. Nothing in this License Agreement shall be deemed to -create any relationship of agency, partnership, or joint venture -between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade names in a trademark -sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - -7. By copying, installing or otherwise using the software, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- - -1. This LICENSE AGREEMENT is between the Corporation for National -Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 1.6.1 -alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 1.6.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/abs/core/licenses/python-2.txt b/abs/core/licenses/python-2.txt index d8e1f80..454f4ea 100644 --- a/abs/core/licenses/python-2.txt +++ b/abs/core/licenses/python-2.txt @@ -1,80 +1,3 @@ -A. HISTORY OF THE SOFTWARE -========================== - -Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands -as a successor of a language called ABC. Guido remains Python's -principal author, although it includes many contributions from others. - -In 1995, Guido continued his work on Python at the Corporation for -National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) -in Reston, Virginia where he released several versions of the -software. - -In May 2000, Guido and the Python core development team moved to -BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations (now Zope -Corporation, see http://www.zope.com). In 2001, the Python Software -Foundation (PSF, see http://www.python.org/psf/) was formed, a -non-profit organization created specifically to own Python-related -Intellectual Property. Zope Corporation is a sponsoring member of -the PSF. - -All Python releases are Open Source (see http://www.opensource.org for -the Open Source Definition). Historically, most, but not all, Python -releases have also been GPL-compatible; the table below summarizes -the various releases. - - Release Derived Year Owner GPL- - from compatible? (1) - - 0.9.0 thru 1.2 1991-1995 CWI yes - 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes - 1.6 1.5.2 2000 CNRI no - 2.0 1.6 2000 BeOpen.com no - 1.6.1 1.6 2001 CNRI yes (2) - 2.1 2.0+1.6.1 2001 PSF no - 2.0.1 2.0+1.6.1 2001 PSF yes - 2.1.1 2.1+2.0.1 2001 PSF yes - 2.2 2.1.1 2001 PSF yes - 2.1.2 2.1.1 2002 PSF yes - 2.1.3 2.1.2 2002 PSF yes - 2.2.1 2.2 2002 PSF yes - 2.2.2 2.2.1 2002 PSF yes - 2.2.3 2.2.2 2003 PSF yes - 2.3 2.2.2 2002-2003 PSF yes - 2.3.1 2.3 2002-2003 PSF yes - 2.3.2 2.3.1 2002-2003 PSF yes - 2.3.3 2.3.2 2002-2003 PSF yes - 2.3.4 2.3.3 2004 PSF yes - 2.3.5 2.3.4 2005 PSF yes - 2.4 2.3 2004 PSF yes - 2.4.1 2.4 2005 PSF yes - 2.4.2 2.4.1 2005 PSF yes - 2.4.3 2.4.2 2006 PSF yes - 2.5 2.4 2006 PSF yes - 2.5.1 2.5 2007 PSF yes - -Footnotes: - -(1) GPL-compatible doesn't mean that we're distributing Python under - the GPL. All Python licenses, unlike the GPL, let you distribute - a modified version without making your changes open source. The - GPL-compatible licenses make it possible to combine Python with - other software that is released under the GPL; the others don't. - -(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, - because its license has a choice of law clause. According to - CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 - is "not incompatible" with the GPL. - -Thanks to the many outside volunteers who have worked under Guido's -direction to make these releases possible. - - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- diff --git a/abs/core/linhes-sounds/PKGBUILD b/abs/core/linhes-sounds/PKGBUILD index 0e0de92..ca41e83 100644 --- a/abs/core/linhes-sounds/PKGBUILD +++ b/abs/core/linhes-sounds/PKGBUILD @@ -27,3 +27,14 @@ build() { mkdir -p $startdir/pkg/usr/share/sounds cp -aL *.wav $startdir/pkg/usr/share/sounds } +md5sums=('32acaa129f144c035369c7af66040133' + '17ca1fbe926cb1da925c58b3cca30431' + 'f95e00fd455d8fa475eb71f1aa3f41a3' + 'c4d2907aa483f882021a8ce322468285' + '29bc61fea6b6e86354da6ba6637e80e4' + 'f82e20176db110f378aced8b505ba373' + '40dffd4532a1730b4a1b57899c517dcd' + '2e6a6ad84df32723295ac762d53ec74d' + '7ac0cd7d616a46898cac749814428204' + '4a9e897c3cb062ba7d30f8c7f19c23eb' + 'ca141df9fcadf53d6882497c87ff6ee6') diff --git a/abs/core/links/PKGBUILD b/abs/core/links/PKGBUILD new file mode 100644 index 0000000..135074e --- /dev/null +++ b/abs/core/links/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 162886 2012-07-02 17:59:15Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=links +pkgver=2.7 +pkgrel=1 +pkgdesc="A text WWW browser, similar to Lynx" +arch=('i686' 'x86_64') +url="http://links.twibright.com/" +license=('GPL') +depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') +makedepends=('libtiff' 'libpng' 'libxt') +optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') +provides=('links-g') +conflicts=('links-g') +replaces=('links-g') +source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) +sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3' + 'f600e27c2a71184444f7dd07a10230aa44463a02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + (cd intl; ./gen-intl; ./synclang) + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --enable-graphics --with-x --with-fb + make + mv links xlinks + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --disable-graphics --without-x --without-fb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 xlinks "${pkgdir}/usr/bin/xlinks" + ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz" + + install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop" + install -d "${pkgdir}/usr/share/pixmaps" + install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/" + + install -d "${pkgdir}/usr/share/doc/links/calibration" + install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/" +} diff --git a/abs/core/links/links.desktop b/abs/core/links/links.desktop new file mode 100644 index 0000000..9d6338a --- /dev/null +++ b/abs/core/links/links.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Links +Exec=xlinks -g +Icon=links_32x32.xpm +Type=Application +Terminal=false +Categories=Network;WebBrowser; diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD index aa24f56..1e6558a 100644 --- a/abs/core/linux-api-headers/PKGBUILD +++ b/abs/core/linux-api-headers/PKGBUILD @@ -1,27 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 163832 2012-07-21 07:49:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=2.6.39.1 -_basever=2.6.39 +pkgver=3.4.6 +_basever=3.4 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL2') -provides=("kernel-headers=${pkgver}") -conflicts=('kernel-headers') -replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 - http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) -md5sums=('1aab7a741abe08d42e8eccf20de61e05' - '215f7ebaafe1175dbc5d1e439c9a96d5') +source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz + http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz) + # NOTE: signatures are not automatically verified by makepkg + #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign + #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign +md5sums=('967f72983655e2479f951195953e8480' + '14443e53d3ab88e6eac45d954d891e00') build() { cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} + [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} make mrproper make headers_check @@ -35,5 +35,5 @@ package() { rm -rf ${pkgdir}/usr/include/drm # clean-up unnecessary files generated during install - find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f + find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete } diff --git a/abs/core/linux-atm/PKGBUILD b/abs/core/linux-atm/PKGBUILD index f2c5a24..5b6e62d 100644 --- a/abs/core/linux-atm/PKGBUILD +++ b/abs/core/linux-atm/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 79085 2010-04-30 07:29:32Z tpowa $ +# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm -pkgver=2.5.1 -pkgrel=1 +pkgver=2.5.2 +pkgrel=2 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz) url="http://linux-atm.sourceforge.net/" license=(GPL) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + man-pages.patch) options=(!libtool !makeflags) -md5sums=('9560b0e1f410a05b849dfdab465dd758') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../man-pages.patch + + # install firmware in /usr/lib + sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in + + ./configure --prefix=/usr --sysconfdir=/etc + make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } - +md5sums=('d49499368c3cf15f73a05d9bce8824a8' + '181390736336cdb615ae32f1ae5acfa6') diff --git a/abs/core/linux-atm/man-pages.patch b/abs/core/linux-atm/man-pages.patch new file mode 100644 index 0000000..c504cfe --- /dev/null +++ b/abs/core/linux-atm/man-pages.patch @@ -0,0 +1,45 @@ +diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 +--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 ++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 +@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using + recommended. Token Ring support has received less testing than its + Ethernet counterpart. + .SH FILES +-.IP \fI/var/run/lec[interface number].pid\fP ++\fI/var/run/lec[interface number].pid\fP + The file containing the process id of zeppelin. + .SH BUGS + John Bonham died 1980 and Led Zeppelin broke. +diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 +--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 +@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A + .B ]] + .SH DESCRIPTION + MPOA client +-.SM(MPC) is responsible for creating and receiving ++.SM (MPC) is responsible for creating and receiving + internetwork layer shortcuts. Using these shortcuts MPCs forward + unicast internetwork layer packets effectively over ATM without need + for routing protocols. +@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o + shortcuts is done with the help of + .SM MPOA + server +-.SM(MPS). ++.SM (MPS). + .PP + Just as the Linux + .SM LAN +diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 +--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 +@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e + .P + If an option is specified in \fBatmsigd.conf\fP and on the command + line, the command line has priority. +-.COMPATIBILITY ++.SH COMPATIBILITY + Certain options used by past versions of \fBatmsigd\fP but no longer documented + on the man page are still recognized and supported, but they also yield a + warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD index 0772c4e..6148c95 100644 --- a/abs/core/linux-firmware/PKGBUILD +++ b/abs/core/linux-firmware/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 162535 2012-06-27 08:19:33Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # @@ -8,8 +8,8 @@ # pkgname=linux-firmware -pkgver=20120227 -pkgrel=2 +pkgver=20120625 +pkgrel=1 pkgdesc="Firmware files for Linux" arch=('any') url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" @@ -39,22 +39,16 @@ replaces=('kernel26-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') options=(!strip) -source=(v4l-cx23885-enc.fw - ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz) -#sha256sums=('bc1cbee23ab8be8478be66e5486008d81b91fbf6de50347fd1be58b5e56bc6b7') +source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz) +sha256sums=('2061a054155380721b7ccca6ff71b3f6832cc5a2992d8b1b9536f8365786d65b') package() { - #copy in correct firmware - install -D -m664 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/" - cd "${srcdir}/${pkgname}-${pkgver}" - install -d -m755 "${pkgdir}/lib/firmware" - cp -a * "${pkgdir}/lib/firmware/" + install -d -m755 "${pkgdir}/usr/lib/firmware" + cp -a * "${pkgdir}/usr/lib/firmware/" install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/" - rm -f "${pkgdir}/lib/firmware/GPL*" - mv "${pkgdir}/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/" + rm -f "${pkgdir}/usr/lib/firmware/"{configure,GPL*} + mv "${pkgdir}/usr/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/" } -md5sums=('1cb3c48a6684126f5e503a434f2d636b' - '80084f057b8942421dd132a7ac78c3e8') # vim:set ts=2 sw=2 et: diff --git a/abs/core/linux-firmware/__changelog b/abs/core/linux-firmware/__changelog deleted file mode 100644 index 0ac04b7..0000000 --- a/abs/core/linux-firmware/__changelog +++ /dev/null @@ -1 +0,0 @@ -- replace v4l-cx23885-enc.fw in linux firmware because it is the wrong file. diff --git a/abs/core/linux-firmware/v4l-cx23885-enc.fw b/abs/core/linux-firmware/v4l-cx23885-enc.fw Binary files differdeleted file mode 100644 index 25a2915..0000000 --- a/abs/core/linux-firmware/v4l-cx23885-enc.fw +++ /dev/null diff --git a/abs/core/linux/3.4.4-fix-backlight-regression.patch b/abs/core/linux/3.4.4-fix-backlight-regression.patch new file mode 100644 index 0000000..a0cf0b1 --- /dev/null +++ b/abs/core/linux/3.4.4-fix-backlight-regression.patch @@ -0,0 +1,38 @@ +Subject: Still use ACPI backlight control if _DOS doesn't exist + +This is a regression introduced by commit +ea9f8856bd6d4ed45885b06a338f7362cd6c60e5 + +https://bugzilla.kernel.org/show_bug.cgi?id=43168 + +Some platforms don't have _DOS control method, but the ACPI +backlight still works. +We do not want to lose the backlight control ability on these platforms. + +CC : Igor Murzov <intergalactic.anonymous@gmail.com> +Signed-off-by: Zhang Rui <rui.zhang@intel.com> +--- + drivers/acpi/video.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +Index: rtd3/drivers/acpi/video.c +=================================================================== +--- rtd3.orig/drivers/acpi/video.c ++++ rtd3/drivers/acpi/video.c +@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus + video->dos_setting = arg0.integer.value; + status = acpi_evaluate_object(video->device->handle, "_DOS", + &args, NULL); +- if (ACPI_FAILURE(status)) +- return -EIO; ++ if (ACPI_FAILURE(status)) { ++ /* ++ * some platforms don't have _DOS, but the ACPI ++ * backlight control still works ++ */ ++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n")); ++ return 0; ++ } + + return 0; + } diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD new file mode 100644 index 0000000..f0bf106 --- /dev/null +++ b/abs/core/linux/PKGBUILD @@ -0,0 +1,313 @@ +# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgbase=linux +pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -ARCH kernel +# pkgname=linux-custom # Build kernel with a different name +_kernelname=${pkgname#linux} +_basekernel=3.4 +pkgver=${_basekernel}.6 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.kernel.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl') +options=('!strip') +source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + # the main kernel config files + 'config' 'config.x86_64' + # standard config files for mkinitcpio ramdisk + "${pkgname}.preset" + 'fix-acerhdf-1810T-bios.patch' + 'change-default-console-loglevel.patch' + 'i915-fix-ghost-tv-output.patch' + '3.4.4-fix-backlight-regression.patch') +md5sums=('967f72983655e2479f951195953e8480' + '14443e53d3ab88e6eac45d954d891e00' + '3f2c307c8ffae67f60c13ef69af8364a' + '18d9d09152bafffaef78f2aac07e7145' + 'eb14dcfd80c00852ef81ded6e826826a' + '38c1fd4a1f303f1f6c38e7f082727e2f' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a') + +build() { + cd "${srcdir}/linux-${_basekernel}" + + # add upstream patch + patch -p1 -i "${srcdir}/patch-${pkgver}" + + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + + # Some chips detect a ghost TV output + # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html + # Arch Linux bug report: FS#19234 + # + # It is unclear why this patch wasn't merged upstream, it was accepted, + # then dropped because the reasoning was unclear. However, it is clearly + # needed. + patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + + # Fix backlight control on some laptops: + # https://bugzilla.kernel.org/show_bug.cgi?id=43168 + patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch" + + # Patch submitted upstream, waiting for inclusion: + # https://lkml.org/lkml/2012/2/19/51 + # add support for latest bios of Acer 1810T acerhdf module + patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch" + + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) + # remove this when a Kconfig knob is made available by upstream + # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + + if [ "${CARCH}" = "x86_64" ]; then + cat "${srcdir}/config.x86_64" > ./.config + else + cat "${srcdir}/config" > ./.config + fi + + if [ "${_kernelname}" != "" ]; then + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + fi + + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + + # get kernel version + make prepare + + # load configuration + # Configure the kernel. Replace the line below with one of your choice. + #make menuconfig # CLI menu for configuration + #make nconfig # new CLI menu for configuration + #make xconfig # X-based configuration + #make oldconfig # using old config from previous kernel version + # ... or manually edit .config + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build" + #return 1 + #################### + + yes "" | make config + + # build! + make ${MAKEFLAGS} bzImage modules +} + +package_linux() { + pkgdesc="The Linux Kernel and modules" + groups=('base') + depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + optdepends=('crda: to set the correct wireless channels of your country') + provides=('kernel26') + conflicts=('kernel26') + replaces=('kernel26') + backup=("etc/mkinitcpio.d/${pkgname}.preset") + install=${pkgname}.install + + cd "${srcdir}/linux-${_basekernel}" + + KARCH=x86 + + # get kernel version + _kernver="$(make kernelrelease)" + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}" + + # add vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + + # set correct depmod command for install + sed \ + -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ + -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ + -i "${startdir}/${pkgname}.install" + sed \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ + -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + + # remove build and source links + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} + # remove the firmware + rm -rf "${pkgdir}/lib/firmware" + # gzip -9 all modules to save 100MB of space + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building modules and running depmod from post_install/upgrade + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" +} + +package_linux-headers() { + pkgdesc="Header files and scripts for building modules for linux kernel" + provides=('kernel26-headers') + conflicts=('kernel26-headers') + replaces=('kernel26-headers') + + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build + + cd "${srcdir}/linux-${_basekernel}" + install -D -m644 Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" + install -D -m644 kernel/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" + install -D -m644 .config \ + "${pkgdir}/usr/src/linux-${_kernver}/.config" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media mtd net pcmcia scsi sound trace video xen; do + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" + done + + # copy arch includes for external modules + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" + cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + + # copy files necessary for later builds, like nvidia and vmware + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + + # fix permissions on scripts dir + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" + + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + if [ "${CARCH}" = "i686" ]; then + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + fi + + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" + + # add headers for lirc package + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" + + cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" + + for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + done + + # add docbook makefile + install -D -m644 Documentation/DocBook/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" + + # add dm headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + + # add inotify.h + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" + + # add wireless headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/9912 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" + cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + # and... + # http://bugs.archlinux.org/task/11194 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + # in reference to: + # http://bugs.archlinux.org/task/13146 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" + cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" + cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" + cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + + # add xfs and shmem for aufs building + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + + # copy in Kconfig files + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" + done + + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; + + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "${binary}")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip ${STRIP_SHARED} "${binary}";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip ${STRIP_STATIC} "${binary}";; + *application/x-executable*) # Binaries + /usr/bin/strip ${STRIP_BINARIES} "${binary}";; + esac + done + + # remove unneeded architectures + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} +} + +package_linux-docs() { + pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel." + provides=('kernel26-docs') + conflicts=('kernel26-docs') + replaces=('kernel26-docs') + + cd "${srcdir}/linux-${_basekernel}" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" + cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}" -type f -exec chmod 444 {} \; + find "${pkgdir}" -type d -exec chmod 755 {} \; + + # remove a file already in linux package + rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" +} diff --git a/abs/core/linux/change-default-console-loglevel.patch b/abs/core/linux/change-default-console-loglevel.patch new file mode 100644 index 0000000..63435d8 --- /dev/null +++ b/abs/core/linux/change-default-console-loglevel.patch @@ -0,0 +1,12 @@ +diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c +--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea + + /* We show everything that is MORE important than this.. */ + #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ +-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + diff --git a/abs/core/linux/config b/abs/core/linux/config new file mode 100644 index 0000000..24213ed --- /dev/null +++ b/abs/core/linux/config @@ -0,0 +1,5840 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/i386 3.4.0-1 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-ARCH" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +# CONFIG_KPROBES is not set +CONFIG_JUMP_LABEL=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_UNINLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_XEN_PRIVILEGED_GUEST is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CLEANCACHE=y +# CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y +CONFIG_X86_APM_BOOT=y +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +CONFIG_APM_DO_ENABLE=y +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_GX_SUSPMOD=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_OLPC=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +CONFIG_OLPC=y +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y +CONFIG_OLPC_XO15_SCI=y +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS is not set +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_DMA_SHARED_BUFFER=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_OF_PROMTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_MDIO=m +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_MTD=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +# CONFIG_PNPBIOS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=m +# CONFIG_PCH_PHUB is not set +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_WINBOND_VLB=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_LANCE=m +CONFIG_PCNET32=m +CONFIG_DEPCA=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NI65=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CIRRUS=y +CONFIG_CS89x0=m +# CONFIG_CS89x0_PLATFORM is not set +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_EWRK3=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_AT1700=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_ETH16I=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_APRICOT=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_LP486E=m +CONFIG_NI52=m +CONFIG_ZNET=m +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_EL2=m +CONFIG_AC3200=m +CONFIG_PCMCIA_AXNET=m +CONFIG_E2100=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_NE2000=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_ULTRA=m +CONFIG_WD80x3=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_PCH_PTP=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_SEEQ8005=m +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC9194=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_STMMAC_PCI=m +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_TR is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMDBG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_IWLWIFI_DEVICE_TESTMODE=y +# CONFIG_IWLWIFI_P2P is not set +# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_IWM_TRACING=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_0=y +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_AVM_A1=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_IX1MICROR2=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_ASUSCOM=y +CONFIG_HISAX_TELEINT=y +CONFIG_HISAX_HFCS=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_SPORTSTER=y +CONFIG_HISAX_MIC=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_ISURF=y +CONFIG_HISAX_HSTSAPHIR=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_DRV_ICN=m +CONFIG_ISDN_DRV_PCBIT=m +CONFIG_ISDN_DRV_SC=m +CONFIG_ISDN_DRV_ACT2000=m +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_OLPC=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +# CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AB8500_PONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_DW=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_OF_PLATFORM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_RAMOOPS=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_STUB is not set +CONFIG_SCx200_ACB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=y +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_SODAVILLE is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_SMB347 is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_ABX500_CORE=y +CONFIG_AB8500_CORE=y +# CONFIG_AB8500_DEBUG is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_S5K6AA=m + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_AS3645A=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=y +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_PCI_DRIVERS=y +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +# CONFIG_V4L_RADIO_ISA_DRIVERS is not set +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT1605=m +CONFIG_SND_AZT2316=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_TEA575X=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_RENESAS_USBHS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_FUSB300=m +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_CI13XXX_PCI=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_LANGWELL=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_NOP_USB_XCEIV=m +# CONFIG_AB8500_USB is not set +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB8500=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m +# CONFIG_FB_OLPC_DCON is not set +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_USB_SERIAL_QUATECH_USB2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +# CONFIG_VME_BUS is not set +CONFIG_DX_SEP=m +# CONFIG_IIO is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=y +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_INTEL_MEI=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_EASYCAP=m +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_SOLO6X10=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_PHONE is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO1_RFKILL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers (EXPERIMENTAL) +# + +# +# Rpmsg drivers (EXPERIMENTAL) +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=m +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_586=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_LGUEST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CORDIC=m diff --git a/abs/core/linux/config.x86_64 b/abs/core/linux/config.x86_64 new file mode 100644 index 0000000..5a80d93 --- /dev/null +++ b/abs/core/linux/config.x86_64 @@ -0,0 +1,5612 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 3.4.1-1 Kernel Configuration +# +CONFIG_64BIT=y +# CONFIG_X86_32 is not set +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +# CONFIG_KTIME_SCALAR is not set +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-ARCH" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_FANOUT=64 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +# CONFIG_KPROBES is not set +CONFIG_JUMP_LABEL=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_UNINLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_SMP=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CLEANCACHE=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=m +# CONFIG_X86_X32 is not set +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y +CONFIG_HAVE_BPF_JIT=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_DMA_SHARED_BUFFER=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=m +CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_ZNET=m +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_PCH_PTP=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_SEEQ8005=m +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_STMMAC_PCI=m +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_TR is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMDBG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_IWLWIFI_DEVICE_TESTMODE=y +# CONFIG_IWLWIFI_P2P is not set +# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_IWM_TRACING=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AB8500_PONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_RAMOOPS=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +CONFIG_GPIO_SCH=m +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_LANGWELL=y +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_SMB347 is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_ABX500_CORE=y +CONFIG_AB8500_CORE=y +# CONFIG_AB8500_DEBUG is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_S5K6AA=m + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_AS3645A=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=y +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_PCI_DRIVERS=y +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_TEA575X=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_RENESAS_USBHS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_CI13XXX_PCI=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_NOP_USB_XCEIV=m +# CONFIG_AB8500_USB is not set +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB8500=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_USB_SERIAL_QUATECH_USB2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +# CONFIG_VME_BUS is not set +CONFIG_DX_SEP=m +# CONFIG_IIO is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=y +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_INTEL_MEI=m +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_EASYCAP=m +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_SOLO6X10=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_PHONE is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers (EXPERIMENTAL) +# + +# +# Rpmsg drivers (EXPERIMENTAL) +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=m +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CORDIC=m diff --git a/abs/core/linux/fix-acerhdf-1810T-bios.patch b/abs/core/linux/fix-acerhdf-1810T-bios.patch new file mode 100644 index 0000000..18b4f5c --- /dev/null +++ b/abs/core/linux/fix-acerhdf-1810T-bios.patch @@ -0,0 +1,10 @@ +--- linux-3.3/drivers/platform/x86/acerhdf.c~ 2012-03-08 09:21:18.759446675 +0100 ++++ linux-3.3/drivers/platform/x86/acerhdf.c 2012-03-08 09:20:17.900452311 +0100 +@@ -182,6 +182,7 @@ + {"Acer", "Aspire 1810T", "v1.3308", 0x55, 0x58, {0x9e, 0x00} }, + {"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} }, + {"Acer", "Aspire 1810T", "v1.3310", 0x55, 0x58, {0x9e, 0x00} }, ++ {"Acer", "Aspire 1810T", "v1.3314", 0x55, 0x58, {0x9e, 0x00} }, + {"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} }, + /* Acer 531 */ + {"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} }, diff --git a/abs/core/linux/i915-fix-ghost-tv-output.patch b/abs/core/linux/i915-fix-ghost-tv-output.patch new file mode 100644 index 0000000..3b63136 --- /dev/null +++ b/abs/core/linux/i915-fix-ghost-tv-output.patch @@ -0,0 +1,26 @@ +Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); diff --git a/abs/core/linux/linux.install b/abs/core/linux/linux.install new file mode 100644 index 0000000..5297bf0 --- /dev/null +++ b/abs/core/linux/linux.install @@ -0,0 +1,65 @@ +# arg 1: the new package version +# arg 2: the old package version + +KERNEL_NAME= +KERNEL_VERSION=3.4.6-1-ARCH + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' + +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} + + # compat symlinks for the official kernels only + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then + loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" + [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" + if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then + # add compat symlinks for the initramfs images + ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img + ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} + fi + fi +} + +post_upgrade() { + pacman -Q grub &>/dev/null + hasgrub=$? + pacman -Q grub2-common &>/dev/null + hasgrub2=$? + pacman -Q lilo &>/dev/null + haslilo=$? + # reminder notices + if [ $haslilo -eq 0 ]; then + echo ">>>" + if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then + echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." + else + echo ">>> You appear to be using the LILO bootloader. You should run" + echo ">>> 'lilo' before rebooting." + fi + echo ">>>" + fi + + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + fi + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux${KERNEL_NAME} +} + +post_remove() { + # also remove the compat symlinks + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img + rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img +} diff --git a/abs/core/linux/linux.preset b/abs/core/linux/linux.preset new file mode 100644 index 0000000..b06292d --- /dev/null +++ b/abs/core/linux/linux.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-fallback.img" +fallback_options="-S autodetect" diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 0ce8b69..ad9ca4c 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,26 +1,38 @@ -# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $ +# $Id: PKGBUILD 163879 2012-07-21 12:01:55Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=10 -#epoch=1 -_kernver=2.6.39-LinHES +pkgrel=22 +epoch=1 +_extramodules=extramodules-3.4-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python' ) +### NOTICE don't forget to bump version in depends in package_lirc +makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch - lircd lircmd lirc.lr lircd.conf irexec.conf irexecd - lirc_imon.conf) + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb') build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" cd "${srcdir}/lirc-${pkgver}" patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" @@ -37,7 +49,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ - --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ --with-transmitter # Remove drivers already in kernel @@ -50,15 +62,15 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40' 'iguanair') + depends=('lirc-utils' 'linux>=3.4' 'linux<3.5') replaces=('lirc+pctv') install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install # set the kernel we've built for inside the install script - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" # gzip -9 modules find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; } @@ -78,7 +90,7 @@ package_lirc-utils() { chmod -R go-w "${pkgdir}/usr/share/lirc/" # install the logrotate config - install -Dm644 "${srcdir}/lirc.lr" "${pkgdir}/etc/logrotate.d/lirc" + install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" # install conf.d file install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" @@ -88,21 +100,6 @@ package_lirc-utils() { install -d "${pkgdir}/etc/lirc" - # install IMON VFD module options - install -Dm644 ${srcdir}/lirc_imon.conf ${pkgdir}/etc/modprobe.d/lirc_imon.conf - # remove built modules - rm -r "${pkgdir}/lib/" + rm -r "${pkgdir}/usr/lib/modules" } -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '33905430f163432d70e66e593dc4ca5a' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb' - '56f1d74bd20edd96c8e2f2687b124341') diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index adf3fd6..e9442d0 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1 +1 @@ -Add iguanair to the list of depends +iguanir diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index ba2c957..c35848a 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -1,31 +1,13 @@ -KERNEL_VERSION=2.6.39-LinHES +EXTRAMODULES=extramodules-3.4-ARCH post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION > /dev/null 2>&1 + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 } post_upgrade() { post_install - - . /etc/systemconfig - - # Fix LircSocket in mythtv database - SOCKET=`mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \ - "SELECT data FROM settings WHERE value = 'LircSocket' AND hostname = '${hostname}';"` - if [ "${SOCKET}" != "/var/run/lirc/lircd" ]; then - mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \ - "UPDATE settings SET data = '/var/run/lirc/lircd' WHERE value = 'LircSocket' AND hostname = '${hostname}';" - else - echo ">>>" - echo ">>> ATTENTION! ATTENTION! ATTENTION!" - echo ">>> Unable to connect the the MySQL database to make needed" - echo ">>> changes to the LIRC socket." - echo ">>> LIRC now uses /var/run/lirc/lircd and /dev/lirc is now" - echo ">>> obsolete. Update your MythTV settings to reflect this." - echo ">>>" - fi } # arg 1: the old package version diff --git a/abs/core/lirc/lirc.lr b/abs/core/lirc/lirc.lr deleted file mode 100644 index 44bbdbb..0000000 --- a/abs/core/lirc/lirc.lr +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/lircd { - missingok - notifempty - delaycompress -} - diff --git a/abs/core/lirc/lirc_imon.conf b/abs/core/lirc/lirc_imon.conf deleted file mode 100644 index d3e0b8f..0000000 --- a/abs/core/lirc/lirc_imon.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Module options for IMON VFD. usbid=15c2:ffdc Ref #596 -options lirc_imon display_type=1 diff --git a/abs/core/live-media/PKGBUILD b/abs/core/live-media/PKGBUILD index e7979f6..d183d6b 100644 --- a/abs/core/live-media/PKGBUILD +++ b/abs/core/live-media/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 92357 2010-09-29 11:47:34Z giovanni $ +# $Id: PKGBUILD 163810 2012-07-20 10:44:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2010.09.25 +pkgver=2012.07.26 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') -source=(ftp://ftp.archlinux.org/other/live-media/live.${pkgver}.tar.gz) -md5sums=('f55a9f60c7b6c9d37c44d5c841a2eac1') +source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -build() -{ +build() { cd ${srcdir}/live - sed \ - -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \ - -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \ - -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \ - -i config.linux + + sed \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ + -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \ + -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \ + -i config.linux ./genMakefiles linux - make || return 1 + make +} + +package() { + cd ${srcdir}/live - for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do - mkdir -p ${pkgdir}/usr/lib/live/${dir} - cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/live/${dir} + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do + install -dm755 ${pkgdir}/usr/{bin,lib,include/${dir}} + install -m644 ${dir}/*.a "${pkgdir}/usr/lib" + install -m644 ${dir}/include/*.h* "${pkgdir}/usr/include/${dir}" done - mkdir -p ${pkgdir}/usr/bin for testprog in `find testProgs -type f -perm 755`; do - install ${testprog} ${pkgdir}/usr/bin + install ${testprog} "${pkgdir}/usr/bin" done } +md5sums=('18374e9f6681f62ab7c987ca0029d494') diff --git a/abs/core/live-media/__changelog b/abs/core/live-media/__changelog new file mode 100644 index 0000000..e02c3b0 --- /dev/null +++ b/abs/core/live-media/__changelog @@ -0,0 +1 @@ +changed version from .17 to .26 diff --git a/abs/core/llvm/PKGBUILD b/abs/core/llvm/PKGBUILD deleted file mode 100644 index 2221832..0000000 --- a/abs/core/llvm/PKGBUILD +++ /dev/null @@ -1,231 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sebastian Nowicki <sebnow@gmail.com> -# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.5.1 -pkgrel=6 -arch=('i686' 'x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz - clang-plugin-loader-registry.patch - cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch - clang-pure64.patch - enable-lto.patch - bug-9869-operator-h-c++0x.patch) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '016d70145d52255c9a46fedde51634e2' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4' - '047cac563a557463d7ec6bd87d953f5e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # At the present, clang must reside inside the LLVM source code tree to build - # See http://llvm.org/bugs/show_bug.cgi?id=4840 - rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Add GCC 4.6.1 to GccVersions (FS#23631) - patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - - if [[ $CARCH == x86_64 ]]; then - # Adjust lib paths - patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" - fi - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix upstream bug #9869: - # Operator.h incompatibility with GCC 4.6 in C++0x mode - patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch" - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # TODO: Uncomment when clang works with GCC 4.6+ - #_cxx_headers="/usr/include/c++/$_gcc_ver" - #if [[ ! -d $_cxx_headers ]]; then - # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" - # return 1 - #fi - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm() { - pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') - - cd "$srcdir/$pkgname-$pkgver" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools - - # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-ocaml() { - pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') - - cd "$srcdir/llvm-$pkgver" - - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" -} - -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") - - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - cd "$srcdir/llvm-$pkgver/tools/clang" - make DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Revert the path change in case we want to do a repackage later - sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - # Install old libstdc++ headers. Contains combined headers from - # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 - install -d "$pkgdir/usr/include/c++" - cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" -} - -package_clang-analyzer() { - pkgdesc="A source code analysis framework" - url="http://clang-analyzer.llvm.org/" - depends=("clang=$pkgver-$pkgrel" 'python2') - - cd "$srcdir/llvm-$pkgver/tools/clang" - - install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for _tool in scan-{build,view}; do - cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" - ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" - done - - # Use Python 2 - sed -i 's/env python$/\02/' \ - "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ - "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" - - # Compile Python scripts - python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" - python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/llvm/bug-9869-operator-h-c++0x.patch b/abs/core/llvm/bug-9869-operator-h-c++0x.patch deleted file mode 100644 index b95d7d7..0000000 --- a/abs/core/llvm/bug-9869-operator-h-c++0x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006 -+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062 -@@ -186,28 +186,46 @@ - }; - - class AddOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { -+ ~AddOperator(); // DO NOT IMPLEMENT -+}; - class SubOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { -+ ~SubOperator(); // DO NOT IMPLEMENT -+}; - class MulOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { -+ ~MulOperator(); // DO NOT IMPLEMENT -+}; - class ShlOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { -+ ~ShlOperator(); // DO NOT IMPLEMENT -+}; - - - class SDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { -+ ~SDivOperator(); // DO NOT IMPLEMENT -+}; - class UDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { -+ ~UDivOperator(); // DO NOT IMPLEMENT -+}; - class AShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { -+ ~AShrOperator(); // DO NOT IMPLEMENT -+}; - class LShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { -+ ~LShrOperator(); // DO NOT IMPLEMENT -+}; - - - - class GEPOperator - : public ConcreteOperator<Operator, Instruction::GetElementPtr> { -+ ~GEPOperator(); // DO NOT IMPLEMENT -+ - enum { - IsInBounds = (1 << 0) - }; diff --git a/abs/core/llvm/cindexer-clang-path.patch b/abs/core/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab69..0000000 --- a/abs/core/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/abs/core/llvm/clang-plugin-loader-registry.patch b/abs/core/llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9f..0000000 --- a/abs/core/llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/abs/core/llvm/clang-pure64.patch b/abs/core/llvm/clang-pure64.patch deleted file mode 100644 index da61785..0000000 --- a/abs/core/llvm/clang-pure64.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::arm) - CmdArgs.push_back("/lib/ld-linux.so.3"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1317,18 +1317,10 @@ - if (Arch == llvm::Triple::x86) - Suffix64 = "/64"; - -- std::string Lib32 = "lib"; -- -- bool Exists; -- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) -- Lib32 = "lib32"; -- -+ std::string Lib32 = "lib32"; - std::string Lib64 = "lib"; -- bool Symlink; -- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && -- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) -- Lib64 = "lib64"; - -+ bool Exists; - std::string GccTriple = ""; - if (Arch == llvm::Triple::arm) { - if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/abs/core/llvm/clang-toolchains-gcc-versions.patch b/abs/core/llvm/clang-toolchains-gcc-versions.patch deleted file mode 100644 index 7e00837..0000000 --- a/abs/core/llvm/clang-toolchains-gcc-versions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp ---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 -+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 -@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const - GccTriple = "i586-suse-linux"; - } - -- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", -+ const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", - "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", - "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", - "4.2"}; diff --git a/abs/core/llvm/enable-lto.patch b/abs/core/llvm/enable-lto.patch deleted file mode 100644 index 40d9310..0000000 --- a/abs/core/llvm/enable-lto.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } - -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - } - } - -- if (Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); - } diff --git a/abs/core/lockdev/PKGBUILD b/abs/core/lockdev/PKGBUILD new file mode 100644 index 0000000..946f55d --- /dev/null +++ b/abs/core/lockdev/PKGBUILD @@ -0,0 +1,27 @@ +pkgname=lockdev +pkgver=1.0.3_1.5 +_pkgver=1.0.3 +pkgrel=3 +pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' +url='http://packages.qa.debian.org/l/lockdev.html' +license=("GPL") +arch=('i686' 'x86_64') +source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" + "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") + +build() { + cd "${pkgname}-${_pkgver}" + + patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" + sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile + + make shared + make static +} + +package() { + cd "${pkgname}-${_pkgver}" + make basedir="${pkgdir}/usr" install +} +md5sums=('64b9c1b87b125fc348e892e24625524a' + 'c4e8a5a2e46b76b48339c232b358f579') diff --git a/abs/core/logrotate/PKGBUILD b/abs/core/logrotate/PKGBUILD index 1cb10e4..2e38d80 100644 --- a/abs/core/logrotate/PKGBUILD +++ b/abs/core/logrotate/PKGBUILD @@ -1,39 +1,47 @@ -# $Id: PKGBUILD 92736 2010-09-30 15:38:29Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 162089 2012-06-19 15:44:03Z allan $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate -pkgver=3.7.9 -pkgrel=1 +pkgver=3.8.1 +pkgrel=2 pkgdesc="Rotates system logs automatically" -url='https://fedorahosted.org/logrotate/' arch=('i686' 'x86_64') +url="https://fedorahosted.org/logrotate/" license=('GPL') groups=('base') depends=('popt' 'cron' 'gzip') backup=('etc/logrotate.conf') -source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz - logrotate.conf - logrotate.cron.daily) -md5sums=('eeba9dbca62a9210236f4b83195e4ea5' +source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz" + 'logrotate-3.8.1-noasprintf.patch' + 'logrotate.conf' + 'logrotate.cron.daily') +md5sums=('bd2e20d8dc644291b08f9215397d28a5' + 'fc8e4e15211d8aefd431d0e2e96223c4' '462a5f364717461537eb2ae6394ad23e' - '8e23d5d4cc29b1e055b24df87e355cdc') + 'aa8ac8283908b6114483a293adcb650f') build() { - cd $srcdir/${pkgname}-${pkgver} - - sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ - config.h - sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile - sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' Makefile - - make + cd "$srcdir/${pkgname}-${pkgver}" + + patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch + + sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ + -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\ + -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\ + -i config.h + + make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS" +} + +check() { + cd "$srcdir/${pkgname}-${pkgver}" + make test } package() { - cd $srcdir/${pkgname}-${pkgver} - make PREFIX=$pkgdir install + cd "$srcdir/${pkgname}-${pkgver}" + make PREFIX="$pkgdir" MANDIR="usr/share/man" install - install -Dm644 $srcdir/logrotate.conf $pkgdir/etc/logrotate.conf - install -Dm744 $srcdir/logrotate.cron.daily $pkgdir/etc/cron.daily/logrotate + install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" + install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" } diff --git a/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch b/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch new file mode 100644 index 0000000..be0c080 --- /dev/null +++ b/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch @@ -0,0 +1,53 @@ +--- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400 +@@ -41,39 +41,6 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) +-#include <stdarg.h> +- +-int asprintf(char **string_ptr, const char *format, ...) +-{ +- va_list arg; +- char *str; +- int size; +- int rv; +- +- va_start(arg, format); +- size = vsnprintf(NULL, 0, format, arg); +- size++; +- va_start(arg, format); +- str = malloc(size); +- if (str == NULL) { +- va_end(arg); +- /* +- * Strictly speaking, GNU asprintf doesn't do this, +- * but the caller isn't checking the return value. +- */ +- fprintf(stderr, "failed to allocate memory\\n"); +- exit(1); +- } +- rv = vsnprintf(str, size, format, arg); +- va_end(arg); +- +- *string_ptr = str; +- return (rv); +-} +- +-#endif +- + #if !defined(strndup) + char *strndup(const char *s, size_t n) + { +--- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400 +@@ -66,8 +66,5 @@ extern int numLogs; + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/abs/core/logrotate/logrotate.cron.daily b/abs/core/logrotate/logrotate.cron.daily index e8ab921..ee0eeeb 100755 --- a/abs/core/logrotate/logrotate.cron.daily +++ b/abs/core/logrotate/logrotate.cron.daily @@ -1,3 +1,24 @@ #!/bin/sh -/usr/sbin/logrotate /etc/logrotate.conf +# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) +NICE=19 + +# 0 for none, 1 for real time, 2 for best-effort, 3 for idle +IONICE_CLASS=2 + +# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest +IONICE_PRIORITY=7 + +CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf" + +if [ -x /usr/bin/nice ]; then + CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}" +fi + +if [ -x /usr/bin/ionice ]; then + CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" +fi + +${CMD_LOGROTATE} + +exit 0 diff --git a/abs/core/lsof/PKGBUILD b/abs/core/lsof/PKGBUILD index 89c737b..2c7f384 100644 --- a/abs/core/lsof/PKGBUILD +++ b/abs/core/lsof/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 94246 2010-10-05 21:44:43Z dgriffiths $ +# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=lsof -pkgver=4.84 +pkgver=4.86 pkgrel=1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64') @@ -12,25 +14,31 @@ url="http://people.freebsd.org/~abe/" license=('custom') depends=('glibc') source=(ftp://sunsite.ualberta.ca/pub/Mirror/lsof/${pkgname}_${pkgver}.tar.bz2 license.txt) -md5sums=('a09326df500ef7e4550af546868338d6' - '1b63c76bd10437cabf890508c8e58d36') build() { cd ${srcdir}/${pkgname}_${pkgver} tar xf ${pkgname}_${pkgver}_src.tar cd ${pkgname}_${pkgver}_src sed -i 's|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|' dialects/linux/machine.h - ./Configure -n linux - make || return 1 + make } package() { cd ${srcdir}/${pkgname}_${pkgver}/${pkgname}_${pkgver}_src - install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof || return 1 - install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 || return 1 + FILES=("00CREDITS" "00DCACHE" "00DIALECTS" "00DIST" "00FAQ" "00LSOF-L" "00MANIFEST" "00PORTING" "00QUICKSTART" "00README" "00.README.FIRST" "00TEST" "00XCONFIG") + for file in "${FILES[@]}" + do + install -D -m0644 -o root -g root $file \ + $pkgdir/usr/share/doc/$pkgname/$file + done + + install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof + install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 install -D -m0644 -o root -g root ${srcdir}/license.txt \ - ${pkgdir}/usr/share/licenses/lsof/LICENSE || return 1 + ${pkgdir}/usr/share/licenses/lsof/LICENSE } +md5sums=('9f1cda41f35add068c7b81f873fa56b5' + '1b63c76bd10437cabf890508c8e58d36') diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD index b54e9f6..bda634b 100644 --- a/abs/core/lvm2/PKGBUILD +++ b/abs/core/lvm2/PKGBUILD @@ -1,37 +1,38 @@ -# $Id$ +# $Id: PKGBUILD 163019 2012-07-05 20:37:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.86 -_pkgverlvm=${pkgver} -pkgrel=1 +pkgver=2.02.96 +pkgrel=3 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook - 11-dm-initramfs.rules) -md5sums=('3b42dec4d15ad106302a35149082a20e' - 'dcb82506d732cc7b10159a89b579dba8' - '8d613b84a175cd85f752a75198e40e15' - '69e40679cd8b3658bfc619e48baae125') -sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c' - '7f108b2f2056eb050fc898bf5190ecf9145aed8a' - 'a0e0513c2efb183006e57e595d93ce18be297928' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') + 11-dm-initramfs.rules + lvm.service + lvm2.conf) +sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' + '12e9016485c415c344524e6e75e23dfa6ca097ac' + '3e1680f9b76ce9150d08865d99db90fd15532271' + 'cedc9948123c870f9c5aa3357d0075b41a9c8135' + 'f6a554eea9557c3c236df2943bb6e7e723945c41' + '17df8689630a77e46899a8bd56997d9db896d5af' + 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + + ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ + --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \ + --with-default-locking-dir=/run/lock/lvm make } @@ -40,10 +41,10 @@ package_device-mapper() { url="http://sourceware.org/dm/" depends=('glibc' 'udev') - cd "${srcdir}/LVM2.${_pkgverlvm}" + cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_device-mapper # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" } package_lvm2() { @@ -53,15 +54,16 @@ package_lvm2() { backup=('etc/lvm/lvm.conf') options=('!makeflags') - cd "${srcdir}/LVM2.${_pkgverlvm}" + cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_lvm2 # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. + make -C liblvm DESTDIR="${pkgdir}" install # /etc directories install -d "${pkgdir}"/etc/lvm/{archive,backup} # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" + # systemd support + install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" + install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" } diff --git a/abs/core/lvm2/lvm.service b/abs/core/lvm2/lvm.service new file mode 100644 index 0000000..277d5a7 --- /dev/null +++ b/abs/core/lvm2/lvm.service @@ -0,0 +1,16 @@ +[Unit] +Description=LVM activation +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/vgchange --sysinit --available y +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=basic.target diff --git a/abs/core/lvm2/lvm2.conf b/abs/core/lvm2/lvm2.conf new file mode 100644 index 0000000..1298245 --- /dev/null +++ b/abs/core/lvm2/lvm2.conf @@ -0,0 +1,2 @@ +d /run/lock/lvm 0755 root root - +d /run/lvm 0755 root root - diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook index 874b91d..e69b334 100644 --- a/abs/core/lvm2/lvm2_hook +++ b/abs/core/lvm2/lvm2_hook @@ -1,25 +1,24 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi +#!/usr/bin/ash - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi +run_hook() { + local pvdev - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + modprobe -q dm-mod >/dev/null 2>&1 - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && lvm vgscan + + if [ -n "$quiet" ]; then + lvm vgchange --sysinit -a y >/dev/null + else + lvm vgchange --sysinit -a y fi } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/lvm2/lvm2_install b/abs/core/lvm2/lvm2_install index 94175b5..145ce49 100644 --- a/abs/core/lvm2/lvm2_install +++ b/abs/core/lvm2/lvm2_install @@ -1,29 +1,31 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" +build() { + local mod + for mod in dm-mod dm-snapshot dm-mirror; do + add_module "$mod" + done add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for an LVM2 root device. +help() { + cat <<HELPEOF +This hook loads the necessary modules for an LVM2 root device. - The optional lvmwait= parameter followed by a comma-separated - list of device names can be given on the command line. - It will cause the hook to wait until all given devices exist - before trying to scan and activate any volume groups. +The optional lvmwait= parameter followed by a comma-separated +list of device names can be given on the command line. +It will cause the hook to wait until all given devices exist +before trying to scan and activate any volume groups. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/lzo2/PKGBUILD b/abs/core/lzo2/PKGBUILD index 8474e99..dd0c5e6 100644 --- a/abs/core/lzo2/PKGBUILD +++ b/abs/core/lzo2/PKGBUILD @@ -1,22 +1,36 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 136471 2011-08-30 06:25:43Z tpowa $ # Contributor: Low Kian Seong <fastmail_low@speedymail.org> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=lzo2 -pkgver=2.03 +pkgver=2.06 pkgrel=1 -pkgdesc="a portable lossless data compression library written in ANSI C" -arch=(i686 x86_64) +pkgdesc="Portable lossless data compression library" +arch=('i686' 'x86_64') url="http://www.oberhumer.com/opensource/lzo" license=('GPL') -groups=('base') depends=('glibc') source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) options=(!libtool) +md5sums=('95380bd4081f85ef08c5209f4107e9f8') build() { - cd ${startdir}/src/lzo-${pkgver} + cd "${srcdir}/lzo-${pkgver}" + ./configure --prefix=/usr --enable-shared - make || return 1 - make DESTDIR=${startdir}/pkg install + make + + # build minilzo + gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c + gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o +} + +package() { + cd "${srcdir}/lzo-${pkgver}" + make DESTDIR=${pkgdir} install + + # install minilzo + install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib + install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo + cd ${pkgdir}/usr/lib + ln -s libminilzo.so.0 libminilzo.so } -md5sums=('0c3d078c2e8ea5a88971089a2f02a726') diff --git a/abs/core/m4/PKGBUILD b/abs/core/m4/PKGBUILD index b0738c8..29f1c9c 100644 --- a/abs/core/m4/PKGBUILD +++ b/abs/core/m4/PKGBUILD @@ -1,24 +1,37 @@ -# $Id: PKGBUILD 17049 2008-10-24 17:18:43Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 -pkgver=1.4.12 -pkgrel=1 -pkgdesc="m4 macro processor" -arch=(i686 x86_64) -license=('GPL') +pkgver=1.4.16 +pkgrel=2 +pkgdesc="The GNU macro processor" +arch=('i686' 'x86_64') url="http://www.gnu.org/software/m4" -install=m4.install +license=('GPL3') groups=('base-devel') -depends=('glibc' 'bash' 'texinfo') -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz) -md5sums=('0499a958a561781b125c740f18061ea8') +depends=('glibc' 'bash') +install=m4.install +source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} + m4-1.4.16-readlink-einval.patch) +md5sums=('7548ec061a1ba993790159764f522d0e' + 'eebe5c94e74e7551e2e30c5844f1b653' + 'cea138fa9b568d06e46269611cec8dd0') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch + sed -i '/gets is a security hole/d' lib/stdio.in.h ./configure --prefix=/usr - make || return 1 - make prefix=${pkgdir}/usr install || return 1 + make +} - rm -f ${pkgdir}/usr/share/info/dir +check() { + cd ${srcdir}/$pkgname-$pkgver + make check +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make prefix=${pkgdir}/usr install } diff --git a/abs/core/m4/__changelog b/abs/core/m4/__changelog new file mode 100644 index 0000000..f7bfd9a --- /dev/null +++ b/abs/core/m4/__changelog @@ -0,0 +1 @@ +sed -i '/gets is a security hole/d' lib/stdio.in.h diff --git a/abs/core/m4/m4-1.4.16-readlink-einval.patch b/abs/core/m4/m4-1.4.16-readlink-einval.patch new file mode 100644 index 0000000..6a98751 --- /dev/null +++ b/abs/core/m4/m4-1.4.16-readlink-einval.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h +--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200 ++++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200 +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); diff --git a/abs/core/m4/m4.install b/abs/core/m4/m4.install index 7954ba9..be41381 100644 --- a/abs/core/m4/m4.install +++ b/abs/core/m4/m4.install @@ -1,9 +1,10 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(m4.info m4.info-1 m4.info-2) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,9 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/m4/m4/PKGBUILD b/abs/core/m4/m4/PKGBUILD deleted file mode 100644 index 9e0a802..0000000 --- a/abs/core/m4/m4/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 90203 2010-09-09 05:37:32Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=m4 -pkgver=1.4.15 -pkgrel=1 -pkgdesc="The GNU macro processor" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/m4" -license=('GPL3') -groups=('base-devel') -depends=('glibc' 'bash') -install=m4.install -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz) -md5sums=('1caf3410e6590f493834dc99ee04d027') - -build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make prefix=${pkgdir}/usr install -} diff --git a/abs/core/make/PKGBUILD b/abs/core/make/PKGBUILD new file mode 100644 index 0000000..3f38c53 --- /dev/null +++ b/abs/core/make/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=make +pkgver=3.82 +pkgrel=4 +pkgdesc="GNU make utility to maintain groups of programs" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$pkgname.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/abs/core/make/bug30612.patch b/abs/core/make/bug30612.patch new file mode 100644 index 0000000..fb843bc --- /dev/null +++ b/abs/core/make/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/abs/core/make/bug30723.patch b/abs/core/make/bug30723.patch new file mode 100644 index 0000000..84e7ebe --- /dev/null +++ b/abs/core/make/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/abs/core/make/make-3.82-makeflags.patch b/abs/core/make/make-3.82-makeflags.patch new file mode 100644 index 0000000..3cba3c4 --- /dev/null +++ b/abs/core/make/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/abs/core/make/make-3.82-sort-blank.patch b/abs/core/make/make-3.82-sort-blank.patch new file mode 100644 index 0000000..2e73f5b --- /dev/null +++ b/abs/core/make/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/abs/core/make/make.install b/abs/core/make/make.install new file mode 100644 index 0000000..6cf8b0d --- /dev/null +++ b/abs/core/make/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/man-db/PKGBUILD b/abs/core/man-db/PKGBUILD index 05265fd..a3e3caf 100644 --- a/abs/core/man-db/PKGBUILD +++ b/abs/core/man-db/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99794 2010-11-17 19:07:22Z andyrtr $ +# $Id: PKGBUILD 162129 2012-06-21 16:20:53Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db -pkgver=2.5.9 +pkgver=2.6.2 pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" license=('GPL' 'LGPL') groups=('base') -depends=( 'bash' 'gdbm' 'zlib' 'groff') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') optdepends=('less' 'gzip') backup=('etc/man_db.conf' 'etc/cron.daily/man-db') @@ -18,26 +18,31 @@ conflicts=('man') provides=('man') replaces=('man') install=${pkgname}.install -source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz - #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz +source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) -md5sums=('9841394f5c5fe7e2dd2e0c5fb4766d0f' +options=('!libtool') +md5sums=('647c48d46c464419185d031d04481ee5' + 'a9de1f9bbe620a5a9b9f5da8c58cd96c' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') -options=('!libtool') build() { cd ${srcdir}/${pkgname}-${pkgver} - + sed -i '/gets is a security hole/d' gnulib/lib/stdio.in.h ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # part of groff pkg rm -f ${pkgdir}/usr/bin/zsoelim diff --git a/abs/core/man-db/__changelog b/abs/core/man-db/__changelog new file mode 100644 index 0000000..f0ec7f9 --- /dev/null +++ b/abs/core/man-db/__changelog @@ -0,0 +1,3 @@ +glibc + sed -i '/gets is a security hole/d' gnulib/lib/stdio.in.h +http://www.mail-archive.com/lfs-dev@linuxfromscratch.org/msg17404.html diff --git a/abs/core/man-db/man-db.install b/abs/core/man-db/man-db.install index 6a0f36b..f6f0f27 100644 --- a/abs/core/man-db/man-db.install +++ b/abs/core/man-db/man-db.install @@ -10,9 +10,13 @@ post_upgrade() { echo "run \"userdel man\". please also" echo "chown root:root /var/cache/man" fi + # force database rebuild to get rid off badly imported pages + if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then + echo "(re)building database..." + mandb -c --quiet + fi } post_remove() { rm -rf /var/cache/man } - diff --git a/abs/core/man-pages/PKGBUILD b/abs/core/man-pages/PKGBUILD index b9df3f5..c4c6ab8 100644 --- a/abs/core/man-pages/PKGBUILD +++ b/abs/core/man-pages/PKGBUILD @@ -1,41 +1,48 @@ -# $Id: PKGBUILD 10358 2008-08-27 16:05:22Z andyrtr $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 158918 2012-05-13 07:19:23Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + pkgname=man-pages -pkgver=3.08 +pkgver=3.41 _posixver=2003-a -pkgrel=10 +pkgrel=1 pkgdesc="Linux man pages" -arch=(i686 x86_64) +arch=('any') license=('GPL') -url="http://www.kernel.org/doc/man-pages/" +url="http://man7.org/linux/man-pages/index.html" groups=('base') depends=() -source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.gz - http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2) -md5sums=('951bc4cc585b59164557763431151569' +source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.xz + http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2) +md5sums=('7395d284fa1b9e112006d736865781b0' '7c78aff03c0a6767ba483d34f19e4b09') build() { - cd $startdir/src/$pkgname-$pkgver - make prefix=$startdir/pkg/usr install || return 1 + cd ${srcdir}/$pkgname-$pkgver + + # move the posix pages + mkdir -p ${srcdir}/$pkgname-$pkgver/man0 + for sect in 0 1 3; do + sed -i "/^\.so /s/man${sect}p/man$sect/" "${srcdir}/$pkgname-posix-${_posixver}/man${sect}p"/* + mv -iv "${srcdir}/$pkgname-posix-${_posixver}/man${sect}p"/* "${srcdir}/$pkgname-$pkgver/man$sect/" + done +} + +package() { + cd ${srcdir}/$pkgname-$pkgver - cd $startdir/src/$pkgname-posix-${_posixver} - make prefix=$startdir/pkg/usr install || return 1 + make prefix=${pkgdir}/usr install - cd $startdir/pkg/usr/share/man + cd ${pkgdir}/usr/share/man # these are included in coreutils || return 1 - rm -f man1/{chgrp,chmod,chown,cp,dir,dd}.1 || return 1 - rm -f man1/{df,dircolors,du,install,ln,ls}.1 || return 1 - rm -f man1/{mkdir,mkfifo,mknod,mv,rm,rmdir}.1 || return 1 - rm -f man1/{touch,vdir}.1 || return 1 + rm -f man1/{chgrp,chmod,chown,cp,dir,dd}.1 + rm -f man1/{df,dircolors,du,install,ln,ls}.1 + rm -f man1/{mkdir,mkfifo,mknod,mv,rm,rmdir}.1 + rm -f man1/{touch,vdir}.1 # this is included in shadow - rm -f man5/passwd.5 || return 1 - rm -f man3/getspnam.3 || return 1 + rm -f man5/passwd.5 + rm -f man3/getspnam.3 # this is included in diffutils - rm -f man1/diff.1 || return 1 + rm -f man1/diff.1 # this is included in xf86-input-mouse - rm -f man4/mouse.4 || return 1 - # these are included in module-init-tools - rm -f man2/{create_module,delete_module,get_kernel_syms}.2 || return 1 - rm -f man2/{init_module,query_module}.2 || return 1 + rm -f man4/mouse.4 } diff --git a/abs/core/mdadm/PKGBUILD b/abs/core/mdadm/PKGBUILD index a491dce..3c905ac 100644 --- a/abs/core/mdadm/PKGBUILD +++ b/abs/core/mdadm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 89445 2010-09-01 06:46:31Z tpowa $ +# $Id: PKGBUILD 160025 2012-05-28 10:25:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm -pkgver=3.1.4 -pkgrel=1 +pkgver=3.2.5 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('GPL') -url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" +url="http://neil.brown.name/blog/mdadm" groups=('base') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 @@ -17,35 +17,42 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook - run - finish) -install=mdadm.install + mdadm_udev_install + mdadm.service + disable-werror.patch) replaces=('raidtools') +md5sums=('83ba4a6249ae24677e915e44c9cfcc58' + '8333d405f550317c2bacd5510bf1cb60' + '00cbed931db4f15b6ce49e3e7d433966' + '609d10888727710cb20db7ac3e096116' + 'fbb5542d9bdf87441a11dd7e7a0a17f8' + 'd1d8e9eb81ce9347de74f3c84a9db09e' + 'aafb5f9ac8437a284cbf948b9b13b179' + '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver - make || return 1 + patch -Np0 -i ../disable-werror.patch + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + } + package() { cd $srcdir/$pkgname-$pkgver - make INSTALL=/bin/install DESTDIR=$pkgdir install + make INSTALL=/usr/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm - install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm - install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm - install -d ${pkgdir}/etc/sv/mdadm/supervise - install -D -m755 ${srcdir}/run ${pkgdir}/etc/sv/mdadm/run - install -D -m755 ${srcdir}/finish ${pkgdir}/etc/sv/mdadm/finish + install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm + install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # symlink for backward compatibility - ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid - # build static mdassemble for Arch's initramfs - make MDASSEMBLE_AUTO=1 mdassemble - install -D -m755 mdassemble $pkgdir/sbin/mdassemble + ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid + # move /lib/* to /usr/lib/ + mv $pkgdir/lib/udev $pkgdir/usr/lib/ + rm -rf $pkgdir/lib + # systemd service file + install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service } -md5sums=('0e7dcb5cc4192ae3abd9956bac475576' - '6df172c8f77b280018cf87eb3d313f29' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb' - '0b12cc70819ec274f6eec0b8a4238970' - 'fbd58f9753db94e754bd8de71d465489') diff --git a/abs/core/mdadm/__changelog b/abs/core/mdadm/__changelog deleted file mode 100644 index aaebdd9..0000000 --- a/abs/core/mdadm/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -add and add logic to install run and finish scripts to PKGBUILD -add logic to mdadm.install to add and remove the mdadm monitoring service diff --git a/abs/core/mdadm/disable-werror.patch b/abs/core/mdadm/disable-werror.patch new file mode 100644 index 0000000..50a33f1 --- /dev/null +++ b/abs/core/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/abs/core/mdadm/finish b/abs/core/mdadm/finish deleted file mode 100644 index 5c94528..0000000 --- a/abs/core/mdadm/finish +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Stop Monitoring software raid arrays -exec 2>&1 -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /sbin/mdadm` - stat_runit "Stopping mdadm RAID Monitor" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mdadm - stat_done - fi diff --git a/abs/core/mdadm/linux-3.0.patch b/abs/core/mdadm/linux-3.0.patch new file mode 100644 index 0000000..cd9d547 --- /dev/null +++ b/abs/core/mdadm/linux-3.0.patch @@ -0,0 +1,45 @@ +From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Fri, 17 Jun 2011 22:49:24 +1000 +Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers. + +The next version of Linux might be 3.0. If it is, get_linux_version +will fail. +So make it more robust. + +Reported-by: Namhyung Kim <namhyung@gmail.com> +Reported-by: Milan Broz <mbroz@redhat.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + util.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/util.c b/util.c +index 10bbe56..55d171a 100644 +--- a/util.c ++++ b/util.c +@@ -146,16 +146,16 @@ int get_linux_version() + { + struct utsname name; + char *cp; +- int a,b,c; ++ int a = 0, b = 0,c = 0; + if (uname(&name) <0) + return -1; + + cp = name.release; + a = strtoul(cp, &cp, 10); +- if (*cp != '.') return -1; +- b = strtoul(cp+1, &cp, 10); +- if (*cp != '.') return -1; +- c = strtoul(cp+1, NULL, 10); ++ if (*cp == '.') ++ b = strtoul(cp+1, &cp, 10); ++ if (*cp == '.') ++ c = strtoul(cp+1, &cp, 10); + + return (a*1000000)+(b*1000)+c; + } +-- +1.7.2.3 + diff --git a/abs/core/mdadm/mdadm b/abs/core/mdadm/mdadm index e196f36..9bf468e 100755 --- a/abs/core/mdadm/mdadm +++ b/abs/core/mdadm/mdadm @@ -3,28 +3,33 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /sbin/mdadm` -case "$1" in +pidfile=/run/mdadm.pid +if [[ -r $pidfile ]]; then + read -r PID <"$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in start) stat_busy "Starting mdadm RAID Monitor" - if [ -z "$PID" ]; then - /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else + if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then add_daemon mdadm stat_done + else + stat_fail fi ;; stop) stat_busy "Stopping mdadm RAID Monitor" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else + if [[ $PID ]] && kill "$PID" &>/dev/null; then rm_daemon mdadm stat_done + else + stat_fail fi ;; restart) @@ -33,5 +38,5 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac diff --git a/abs/core/mdadm/mdadm.install b/abs/core/mdadm/mdadm.install deleted file mode 100644 index cfeed3c..0000000 --- a/abs/core/mdadm/mdadm.install +++ /dev/null @@ -1,19 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_install() { - # Add the mdadm monitoring service - /sbin/add_service.sh mdadm -} - -post_upgrade() { - if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then - echo "Attention mdadm update:" - echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." - echo "Please update your /etc/mkinitcpio.conf accordingly." - fi -} - -pre_remove() { - # Remove the mdadm monitoring service - /sbin/remove_service.sh mdadm -} diff --git a/abs/core/mdadm/mdadm.service b/abs/core/mdadm/mdadm.service new file mode 100644 index 0000000..8389715 --- /dev/null +++ b/abs/core/mdadm/mdadm.service @@ -0,0 +1,8 @@ +[Unit] +Description=MDADM Event Monitor + +[Service] +ExecStart=/sbin/mdadm --monitor --scan + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/mdadm/mdadm_hook b/abs/core/mdadm/mdadm_hook index 57799d3..787be5d 100755 --- a/abs/core/mdadm/mdadm_hook +++ b/abs/core/mdadm/mdadm_hook @@ -1,44 +1,49 @@ -# vim: set ft=sh: -run_hook () -{ - input="$(cat /proc/cmdline)" - mdconfig="/etc/mdadm.conf" +#!/usr/bin/ash + +run_hook() { + local i= mdconfig=/etc/mdadm.conf + # for partitionable raid, we need to load md_mod first! modprobe md_mod 2>/dev/null - # If md is specified on commandline, create config file from those parameters. - if [ "$(echo $input | grep "md=")" ]; then - #Create initial mdadm.conf - # scan all devices in /proc/partitions - echo DEVICE partitions > $mdconfig - for i in $input; do + + if [ -n "$md" ]; then + echo 'DEVICE partitions' >"$mdconfig" + for i in $(cat /proc/cmdline); do case $i in - # raid + # raid md=[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; # partitionable raid md=d[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; - # raid UUID - md=[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + # raid UUID + md=[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; # partitionable raid UUID - md=d[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + md=d[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; - esac - done + esac + done >>"$mdconfig" fi + # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble -}
\ No newline at end of file + [ -s "$mdconfig" ] && /sbin/mdassemble +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/mdadm/mdadm_install b/abs/core/mdadm/mdadm_install index b7a57ea..cf6159e 100644 --- a/abs/core/mdadm/mdadm_install +++ b/abs/core/mdadm/mdadm_install @@ -1,46 +1,45 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" +#!/bin/bash + +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + # check if a custom mdadm.conf exists if grep -q ^ARRAY /etc/mdadm.conf; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi add_binary "/sbin/mdassemble" - add_file "/lib/udev/rules.d/64-md-raid.rules" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for any raid root device, - and assembles the raid device when run. - - If arrays are defined in /etc/mdadm.conf, the file will be used instead - of command line assembling. - - Command Line Setup: - - for raid arrays with persistent superblocks: - md=<md device no.>,dev0,dev1,...,devn - md=<md device no.>,uuid - - for partitionable raid arrays with persistent superblocks: - md=d<md device no.>,dev0,dev1,...,devn - md=d<md device no.>,uuid - - Parameters: - - <md device no.> = the number of the md device: - 0 means md0, 1 means md1, ... - - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. +help() { + cat <<HELPEOF +This hook loads the necessary modules for any raid root device, +and assembles the raid device when run. + +If arrays are defined in /etc/mdadm.conf, the file will be used instead +of command line assembling. + +Command Line Setup: +- for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid +- for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + +Parameters: +- <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... +- <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a +Examples: +- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. +- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/mdadm/mdadm_udev_install b/abs/core/mdadm/mdadm_udev_install new file mode 100644 index 0000000..f6f5de4 --- /dev/null +++ b/abs/core/mdadm/mdadm_udev_install @@ -0,0 +1,24 @@ +#!/bin/bash + +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + + # check if a custom mdadm.conf exists + if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + + add_binary "mdadm" + add_file "/usr/lib/udev/rules.d/64-md-raid.rules" +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for a RAID array and uses incremental +assembly via udev at runtime to create the devices. This hook with NOT work +without the udev hook included on the image. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/mdadm/run b/abs/core/mdadm/run deleted file mode 100644 index 567332e..0000000 --- a/abs/core/mdadm/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# Start Monitoring software raid arrays -exec 2>&1 -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions - - stat_runit "Starting mdadm RAID Monitor" - exec /sbin/mdadm -F -s diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD index d1cc3e7..4903f12 100644 --- a/abs/core/mesa/PKGBUILD +++ b/abs/core/mesa/PKGBUILD @@ -1,135 +1,155 @@ -# $Id$ +# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') +pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri') #_git=true +_gitdate=20111031 _git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110612 + pkgver=7.10.99.git20110709 + #pkgver=7.11 else - pkgver=7.10.3 + pkgver=8.0.4 fi pkgrel=1 arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') +makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' + 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) +source=(LICENSE + mesa-8.0.3-llvm-3.1-fixes.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" + #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" + #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - '614d063ecd170940d9ae7b355d365d59') + 'c452ed3392468170726c004c2f4e02ca' + 'd546f988adfdf986cff45b1efa2d8a46') build() { -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* -if [ "${_git}" != "true" ]; then -#backport from master to fix gnome-shell shader -#https://bugs.freedesktop.org/show_bug.cgi?id=35714 -patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" -patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" -fi + patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" if [ "${_git}" = "true" ]; then + autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-gallium-swrast \ + --enable-gallium-egl \ + --enable-shared-glapi \ + --enable-gbm \ --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx,egl \ - --disable-glut \ + --enable-dri \ + --enable-glx \ + --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --enable-texture-float + --enable-texture-float \ + --enable-xa \ + --enable-shared-dricore + #--enable-gbm \ # --enable-gallium-svga \ - - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. - - #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 else + autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ + --with-gallium-drivers=r300,r600,svga,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,swrast \ + --enable-gallium-llvm \ + --enable-gallium-egl \ + --enable-shared-glapi \ + --enable-gbm \ --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ + --enable-dri \ + --enable-glx \ + --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl + --enable-texture-float \ + --enable-xa \ + --enable-shared-dricore fi make } package_libgl() { - depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') + depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" + #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" cd src/mesa/drivers/dri - #make -C swrast DESTDIR="${pkgdir}" install -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install -fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" install -m755 -d "${pkgdir}/usr/share/licenses/libgl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" } +package_osmesa() { + depends=('mesa') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + pkgdesc="Mesa 3D off-screen rendering library" + + make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa +} + +package_libglapi() { + depends=('glibc') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib" + bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" +} + +package_libgbm() { + depends=('glibc') + pkgdesc="Mesa gbm library" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib" + bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" +} + package_libgles() { - depends=('libgl') + depends=('libglapi' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" @@ -147,55 +167,58 @@ fi } package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') + pkgdesc="Mesa EGL libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" install -m755 -d "${pkgdir}/usr/include/" install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" install -m755 -d "${pkgdir}/usr/share" install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" -if [ "${_git}" != "true" ]; then install -m755 -d "${pkgdir}/usr/lib/egl" bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" -fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" } +package_khrplatform-devel() { + #depends=('') + pkgdesc="Khronos platform development package" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/include/KHR" + bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" + + install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" +} + package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib/libGL.so"* + rm -f "${pkgdir}/usr/lib/libglapi.so"* + rm -f "${pkgdir}/usr/lib/libgbm.so"* rm -f "${pkgdir}/usr/lib/libGLESv"* rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} + rm -f "${pkgdir}/usr/lib/libOSMesa"* + rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" @@ -212,166 +235,35 @@ package_ati-dri() { pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # classic mesa driver for R300 r300_dri.so - #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated - # gallium3D driver for R300 r300_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -fi - #make -C r600 DESTDIR="${pkgdir}" install + # classic mesa drivers for radeon,r200 + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install + # gallium3D driver for r300,r600 + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install } package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install -} - -package_unichrome-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C unichrome DESTDIR="${pkgdir}" install -} - -package_mach64-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64" - conflicts=('xf86-video-mach64<6.8.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mach64 DESTDIR="${pkgdir}" install -} - -package_mga-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox" - conflicts=('xf86-video-mga<1.4.11') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mga DESTDIR="${pkgdir}" install -} - -package_r128-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128" - conflicts=('xf86-video-r128<6.8.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C r128 DESTDIR="${pkgdir}" install -} - -package_savage-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" - conflicts=('xf86-video-savage<2.3.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C savage DESTDIR="${pkgdir}" install -} - -package_sis-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS" - conflicts=('xf86-video-sis<0.10.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install -} - -package_tdfx-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx" - conflicts=('xf86-video-tdfx<1.4.3') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C tdfx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install } package_nouveau-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } -#package_llvm-dri() { -# depends=("libgl=${pkgver}") -# pkgdesc="Mesa common LLVM support" - -#if [ "${_git}" = "true" ]; then -# cd ${srcdir}/mesa-*/src/gallium -# else -# cd "${srcdir}/Mesa-${pkgver}/src/gallium" -#fi - - # gallium llvmpipe -#if [ "${_git}" = "true" ]; then -# make -C drivers/llvmpipe DESTDIR="${pkgdir}" install -# #make -C targets/dri-swrast DESTDIR="${pkgdir}" install -# else -# make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -#fi -#} +package_svga-dri() { + depends=("mesa=${pkgver}") + pkgdesc="Gallium3D VMware guest GL driver" + + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install +} diff --git a/abs/core/mesa/gnome-shell-shader-fix.patch b/abs/core/mesa/gnome-shell-shader-fix.patch deleted file mode 100644 index 3b3f375..0000000 --- a/abs/core/mesa/gnome-shell-shader-fix.patch +++ /dev/null @@ -1,535 +0,0 @@ -From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001 -From: Christoph Bumiller <e0425955@student.tuwien.ac.at> -Date: Thu, 31 Mar 2011 13:49:33 +0000 -Subject: nv50: copy regalloc fixes from nvc0 - -Should fix gnome-shell's fade shader. - -Unification of the shader backend which is supposed to remove the -code duplication is still WIP. ---- -diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h -index e6f3815..a9a3248 100644 ---- a/src/gallium/drivers/nv50/nv50_pc.h -+++ b/src/gallium/drivers/nv50/nv50_pc.h -@@ -228,6 +228,8 @@ struct nv_ref { - ubyte flags; /* not used yet */ - }; - -+#define NV_REF_FLAG_REGALLOC_PRIV (1 << 0) -+ - struct nv_basic_block; - - struct nv_instruction { -@@ -263,6 +265,15 @@ struct nv_instruction { - ubyte quadop; - }; - -+static INLINE int -+nvi_vector_size(struct nv_instruction *nvi) -+{ -+ int i; -+ assert(nvi); -+ for (i = 0; i < 4 && nvi->def[i]; ++i); -+ return i; -+} -+ - #define CFG_EDGE_FORWARD 0 - #define CFG_EDGE_BACK 1 - #define CFG_EDGE_LOOP_ENTER 2 -diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -index 39ae366..657df2c 100644 ---- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c -+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -@@ -32,14 +32,39 @@ - #include "util/u_simple_list.h" - - #define NUM_REGISTER_FILES 4 -+#define MAX_REGISTER_COUNT 256 - - struct register_set { - struct nv_pc *pc; - - uint32_t last[NUM_REGISTER_FILES]; -- uint32_t bits[NUM_REGISTER_FILES][8]; -+ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32]; - }; - -+/* using OR because a set bit means occupied/unavailable, aliasing is allowed */ -+static void -+intersect_register_sets(struct register_set *dst, -+ struct register_set *src1, struct register_set *src2) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ dst->bits[i][j] = src1->bits[i][j] | src2->bits[i][j]; -+ } -+} -+ -+static void -+mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ set->bits[i][j] = (set->bits[i][j] | mask) & umask; -+ } -+} -+ - struct nv_pc_pass { - struct nv_pc *pc; - -@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range) - } - } - -+/* @return: TRUE if @new_range can be freed (i.e. was not reused) */ - static boolean - add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range *new_range) - { - struct nv_range *range, **nextp = &val->livei; - -+ if (bgn == end) /* [a, a) is invalid / empty */ -+ return TRUE; -+ - for (range = val->livei; range; range = range->next) { - if (end < range->bgn) - break; /* insert before */ -@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val) - id <<= s; - m = (1 << (1 << s)) - 1; - -+ assert(s >= 0); /* XXX: remove me */ -+ - set->bits[f][id / 32] |= m << (id % 32); - - if (set->pc->max_reg[f] < id) -@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - if (a->join->reg.id == b->join->reg.id) - return TRUE; - --#if 1 - /* either a or b or both have been assigned */ - - if (a->join->reg.id >= 0 && b->join->reg.id >= 0) - return FALSE; - else - if (b->join->reg.id >= 0) { -- if (a->join->reg.id >= 0) -- return FALSE; - val = a; - a = b; - b = val; -@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - return FALSE; - } - return TRUE; --#endif -- return FALSE; - } - - static INLINE void -@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - assert(b->join == a->join); - } - --static INLINE void -+static INLINE boolean - try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - { - if (!join_allowed(ctx, a, b)) { - #ifdef NV50_RA_DEBUG_JOIN - debug_printf("cannot join %i to %i: not allowed\n", b->n, a->n); - #endif -- return; -+ return FALSE; - } - if (livei_have_overlap(a->join, b->join)) { - #ifdef NV50_RA_DEBUG_JOIN -@@ -351,10 +377,27 @@ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - livei_print(a); - livei_print(b); - #endif -- return; -+ return FALSE; - } - - do_join_values(ctx, a, b); -+ -+ return TRUE; -+} -+ -+static void -+join_values_nofail(struct nv_pc_pass *ctx, -+ struct nv_value *a, struct nv_value *b, boolean type_only) -+{ -+ if (type_only) { -+ assert(join_allowed(ctx, a, b)); -+ do_join_values(ctx, a, b); -+ } else { -+ boolean ok = try_join_values(ctx, a, b); -+ if (!ok) { -+ NOUVEAU_ERR("failed to coalesce values\n"); -+ } -+ } - } - - static INLINE boolean -@@ -369,20 +412,32 @@ need_new_else_block(struct nv_basic_block *b, struct nv_basic_block *p) - return (b->num_in > 1) && (n == 2); - } - -+/* Look for the @phi's operand whose definition reaches @b. */ - static int - phi_opnd_for_bb(struct nv_instruction *phi, struct nv_basic_block *b, - struct nv_basic_block *tb) - { -+ struct nv_ref *srci, *srcj; - int i, j; - -- for (j = -1, i = 0; i < 4 && phi->src[i]; ++i) { -- if (!nvbb_reachable_by(b, phi->src[i]->value->insn->bb, tb)) -+ for (j = -1, i = 0; i < 6 && phi->src[i]; ++i) { -+ srci = phi->src[i]; -+ /* if already replaced, check with original source first */ -+ if (srci->flags & NV_REF_FLAG_REGALLOC_PRIV) -+ srci = srci->value->insn->src[0]; -+ if (!nvbb_reachable_by(b, srci->value->insn->bb, NULL)) - continue; - /* NOTE: back-edges are ignored by the reachable-by check */ -- if (j < 0 || !nvbb_reachable_by(phi->src[j]->value->insn->bb, -- phi->src[i]->value->insn->bb, tb)) -+ if (j < 0 || !nvbb_reachable_by(srcj->value->insn->bb, -+ srci->value->insn->bb, NULL)) { - j = i; -+ srcj = srci; -+ } - } -+ if (j >= 0 && nvbb_reachable_by(b, phi->def[0]->insn->bb, NULL)) -+ if (!nvbb_reachable_by(srcj->value->insn->bb, -+ phi->def[0]->insn->bb, NULL)) -+ j = -1; - return j; - } - -@@ -429,16 +484,21 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - ctx->pc->current_block = pn; - - for (i = b->phi; i && i->opcode == NV_OP_PHI; i = i->next) { -- if ((j = phi_opnd_for_bb(i, p, b)) < 0) -- continue; -- val = i->src[j]->value; -- -- if (i->src[j]->flags) { -- val = val->insn->src[0]->value; -- while (j < 4 && i->src[j]) -- ++j; -- assert(j < 4); -+ j = phi_opnd_for_bb(i, p, b); -+ -+ if (j < 0) { -+ val = i->def[0]; -+ } else { -+ val = i->src[j]->value; -+ if (i->src[j]->flags & NV_REF_FLAG_REGALLOC_PRIV) { -+ j = -1; -+ /* use original value, we already encountered & replaced it */ -+ val = val->insn->src[0]->value; -+ } - } -+ if (j < 0) /* need an additional source ? */ -+ for (j = 0; j < 5 && i->src[j] && i->src[j]->value != val; ++j); -+ assert(j < 5); - - ni = new_instruction(ctx->pc, NV_OP_MOV); - -@@ -452,7 +512,7 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - - nv_reference(ctx->pc, &i->src[j], ni->def[0]); - -- i->src[j]->flags = 1; -+ i->src[j]->flags |= NV_REF_FLAG_REGALLOC_PRIV; - } - - if (pn != p && pn->exit) { -@@ -470,45 +530,50 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - return 0; - } - -+#define JOIN_MASK_PHI (1 << 0) -+#define JOIN_MASK_SELECT (1 << 1) -+#define JOIN_MASK_MOV (1 << 2) -+#define JOIN_MASK_TEX (1 << 3) -+ - static int --pass_join_values(struct nv_pc_pass *ctx, int iter) -+pass_join_values(struct nv_pc_pass *ctx, unsigned mask) - { - int c, n; - - for (n = 0; n < ctx->num_insns; ++n) { -- struct nv_instruction *i = ctx->insns[n]; -+ struct nv_instruction *nvi, *i = ctx->insns[n]; - - switch (i->opcode) { - case NV_OP_PHI: -- if (iter != 2) -+ if (!(mask & JOIN_MASK_PHI)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) -- try_join_values(ctx, i->def[0], i->src[c]->value); -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, FALSE); - break; - case NV_OP_MOV: -- if ((iter == 2) && i->src[0]->value->insn && -- !nv_is_vector_op(i->src[0]->value->join->insn->opcode)) -+ if (!(mask & JOIN_MASK_MOV)) -+ break; -+ nvi = i->src[0]->value->join->insn; -+ if (nvi && !nv_is_vector_op(nvi->opcode)) - try_join_values(ctx, i->def[0], i->src[0]->value); - break; - case NV_OP_SELECT: -- if (iter != 1) -+ if (!(mask & JOIN_MASK_SELECT)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) { -- assert(join_allowed(ctx, i->def[0], i->src[c]->value)); -- do_join_values(ctx, i->def[0], i->src[c]->value); -- } -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, TRUE); - break; - case NV_OP_TEX: - case NV_OP_TXB: - case NV_OP_TXL: - case NV_OP_TXQ: -- if (iter) -+ if (!(mask & JOIN_MASK_TEX)) - break; -- for (c = 0; c < 4; ++c) { -- if (!i->src[c]) -- break; -- do_join_values(ctx, i->def[c], i->src[c]->value); -- } -+ /* This should work without conflicts because we always generate -+ * extra MOVs for the sources of a TEX. -+ */ -+ for (c = 0; c < 4 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[c], i->src[c]->value, TRUE); - break; - default: - break; -@@ -643,15 +708,15 @@ static void collect_live_values(struct nv_basic_block *b, const int n) - { - int i; - -- if (b->out[0]) { -- if (b->out[1]) { /* what to do about back-edges ? */ -+ if (b->out[0] && b->out_kind[0] != CFG_EDGE_FAKE) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - for (i = 0; i < n; ++i) - b->live_set[i] = b->out[0]->live_set[i] | b->out[1]->live_set[i]; - } else { - memcpy(b->live_set, b->out[0]->live_set, n * sizeof(uint32_t)); - } - } else -- if (b->out[1]) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - memcpy(b->live_set, b->out[1]->live_set, n * sizeof(uint32_t)); - } else { - memset(b->live_set, 0, n * sizeof(uint32_t)); -@@ -770,8 +835,8 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - struct nv_value *elem; - - for (elem = list->prev; -- elem != list && elem->livei->bgn > nval->livei->bgn; -- elem = elem->prev); -+ elem != list && elem->livei->bgn > nval->livei->bgn; -+ elem = elem->prev); - /* now elem begins before or at the same time as val */ - - nval->prev = elem; -@@ -780,44 +845,49 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - elem->next = nval; - } - --static int --pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+static void -+collect_register_values(struct nv_pc_pass *ctx, struct nv_value *head, -+ boolean assigned_only) - { -- struct nv_instruction *i; -- struct register_set f, free; -+ struct nv_value *val; - int k, n; -- struct nv_value *cur, *val, *tmp[2]; -- struct nv_value active, inactive, handled, unhandled; - -- make_empty_list(&active); -- make_empty_list(&inactive); -- make_empty_list(&handled); -- make_empty_list(&unhandled); -- -- nv50_ctor_register_set(ctx->pc, &free); -+ make_empty_list(head); - -- /* joined values should have range = NULL and thus not be added; -- * also, fixed memory values won't be added because they're not -- * def'd, just used -- */ - for (n = 0; n < ctx->num_insns; ++n) { -- i = ctx->insns[n]; -+ struct nv_instruction *i = ctx->insns[n]; - -+ /* for joined values, only the representative will have livei != NULL */ - for (k = 0; k < 4; ++k) { - if (i->def[k] && i->def[k]->livei) -- insert_ordered_tail(&unhandled, i->def[k]); -- else -- if (0 && i->def[k]) -- debug_printf("skipping def'd value %i: no livei\n", i->def[k]->n); -+ if (!assigned_only || i->def[k]->reg.id >= 0) -+ insert_ordered_tail(head, i->def[k]); - } - if (i->flags_def && i->flags_def->livei) -- insert_ordered_tail(&unhandled, i->flags_def); -+ if (!assigned_only || i->flags_def->reg.id >= 0) -+ insert_ordered_tail(head, i->flags_def); - } - -- for (val = unhandled.next; val != unhandled.prev; val = val->next) { -+ for (val = head->next; val != head->prev; val = val->next) { - assert(val->join == val); - assert(val->livei->bgn <= val->next->livei->bgn); - } -+} -+ -+static int -+pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+{ -+ struct register_set f, free; -+ struct nv_value *cur, *val, *tmp[2]; -+ struct nv_value active, inactive, handled, unhandled; -+ -+ make_empty_list(&active); -+ make_empty_list(&inactive); -+ make_empty_list(&handled); -+ -+ nv50_ctor_register_set(ctx->pc, &free); -+ -+ collect_register_values(ctx, &unhandled, FALSE); - - foreach_s(cur, tmp[0], &unhandled) { - remove_from_list(cur); -@@ -854,13 +924,7 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - reg_occupy(&f, val); - - if (cur->reg.id < 0) { -- boolean mem = FALSE; -- -- if (nv_is_vector_op(cur->insn->opcode)) -- mem = !reg_assign(&f, &cur->insn->def[0], 4); -- else -- if (iter) -- mem = !reg_assign(&f, &cur, 1); -+ boolean mem = !reg_assign(&f, &cur, 1); - - if (mem) { - NOUVEAU_ERR("out of registers\n"); -@@ -874,6 +938,67 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - return 0; - } - -+/* Allocate values defined by instructions such as TEX, which have to be -+ * assigned to consecutive registers. -+ * Linear scan doesn't really work here since the values can have different -+ * live intervals. -+ */ -+static int -+pass_allocate_constrained_values(struct nv_pc_pass *ctx) -+{ -+ struct nv_value regvals, *val; -+ struct nv_instruction *i; -+ struct nv_value *defs[4]; -+ struct register_set regs[4]; -+ int n, vsize, c; -+ uint32_t mask; -+ boolean mem; -+ -+ collect_register_values(ctx, ®vals, TRUE); -+ -+ for (n = 0; n < ctx->num_insns; ++n) { -+ i = ctx->insns[n]; -+ vsize = nvi_vector_size(i); -+ if (!(vsize > 1)) -+ continue; -+ assert(vsize <= 4); -+ for (c = 0; c < vsize; ++c) -+ defs[c] = i->def[c]->join; -+ -+ if (defs[0]->reg.id >= 0) { -+ for (c = 1; c < vsize; ++c) -+ assert(defs[c]->reg.id >= 0); -+ continue; -+ } -+ -+ for (c = 0; c < vsize; ++c) { -+ nv50_ctor_register_set(ctx->pc, ®s[c]); -+ -+ foreach(val, ®vals) { -+ if (val->reg.id >= 0 && livei_have_overlap(val, defs[c])) -+ reg_occupy(®s[c], val); -+ } -+ mask = 0x11111111; -+ if (vsize == 2) /* granularity is 2 and not 4 */ -+ mask |= 0x11111111 << 2; -+ mask_register_set(®s[c], 0, mask << c); -+ -+ if (defs[c]->livei) -+ insert_ordered_tail(®vals, defs[c]); -+ } -+ for (c = 1; c < vsize; ++c) -+ intersect_register_sets(®s[0], ®s[0], ®s[c]); -+ -+ mem = !reg_assign(®s[0], &defs[0], vsize); -+ -+ if (mem) { -+ NOUVEAU_ERR("out of registers\n"); -+ abort(); -+ } -+ } -+ return 0; -+} -+ - static int - nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - { -@@ -923,16 +1048,16 @@ nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - livei_print(&pc->values[i]); - #endif - -- ret = pass_join_values(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_PHI); - if (ret) - goto out; -- ret = pass_linear_scan(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_SELECT | JOIN_MASK_TEX); - if (ret) - goto out; -- ret = pass_join_values(ctx, 1); -+ ret = pass_join_values(ctx, JOIN_MASK_MOV); - if (ret) - goto out; -- ret = pass_join_values(ctx, 2); -+ ret = pass_allocate_constrained_values(ctx); - if (ret) - goto out; - ret = pass_linear_scan(ctx, 1); --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 0000000..a567b59 --- /dev/null +++ b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,46 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } + + diff --git a/abs/core/mesa/nouveau-fix-header.patch b/abs/core/mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996..0000000 --- a/abs/core/mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core/mkinitcpio-busybox/PKGBUILD b/abs/core/mkinitcpio-busybox/PKGBUILD index da2702c..55071e0 100644 --- a/abs/core/mkinitcpio-busybox/PKGBUILD +++ b/abs/core/mkinitcpio-busybox/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ +# $Id: PKGBUILD 160678 2012-06-03 16:32:18Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=mkinitcpio-busybox -pkgver=1.18.4 -pkgrel=2 +pkgver=1.20.1 +pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') url="http://www.busybox.net/" license=('GPL') depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') +options=('!buildflags') +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config' 'sys_resource.patch') build() { - cd "${srcdir}/busybox-${pkgver}" + cd "$srcdir/busybox-$pkgver" + patch -Np1 < $srcdir/sys_resource.patch + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config - unset CFLAGS CXXFLAGS - if [ ${CARCH} = "x86_64" ]; then - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - else - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - fi make } package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" } + # vim:set ts=2 sw=2 et: +md5sums=('af2fededb6dca804544c05684636e574' + 'dd4c0fefe9bb9e65945a5b5525543fd7' + '47e725861776dbaad351e021c9a4df5a') diff --git a/abs/core/mkinitcpio-busybox/__changelog b/abs/core/mkinitcpio-busybox/__changelog new file mode 100644 index 0000000..25dffa3 --- /dev/null +++ b/abs/core/mkinitcpio-busybox/__changelog @@ -0,0 +1 @@ +sys_resource.patch, needed for glibc 1.15 diff --git a/abs/core/mkinitcpio-busybox/config b/abs/core/mkinitcpio-busybox/config index 1aa333f..ed84c53 100644 --- a/abs/core/mkinitcpio-busybox/config +++ b/abs/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 +# Busybox version: 1.20.0 +# Sun May 13 11:33:40 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -49,7 +49,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -62,7 +62,10 @@ CONFIG_FEATURE_HAVE_RPC=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" # # Debugging Options @@ -89,8 +92,10 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 +CONFIG_MD5_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -99,6 +104,8 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y @@ -106,6 +113,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y CONFIG_FEATURE_NON_POSIX_CP=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_HWIB is not set @@ -120,7 +128,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set +CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set @@ -136,6 +144,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_GUNZIP is not set # CONFIG_GZIP is not set # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM2CPIO is not set @@ -169,12 +178,19 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +# CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set # CONFIG_CAL is not set # CONFIG_CATV is not set CONFIG_CHGRP=y @@ -211,11 +227,8 @@ CONFIG_FALSE=y # CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y @@ -227,7 +240,7 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y # CONFIG_FEATURE_LS_COLOR is not set # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set +CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y @@ -247,9 +260,9 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -262,12 +275,11 @@ CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set # CONFIG_SYNC is not set -# CONFIG_TAC is not set +CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y @@ -279,7 +291,6 @@ CONFIG_UNIQ=y # CONFIG_UUENCODE is not set CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set # CONFIG_WHOAMI is not set CONFIG_YES=y @@ -297,14 +308,18 @@ CONFIG_FEATURE_AUTOWIDTH=y # Common options for df, du, ls # CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities # # CONFIG_CHVT is not set # CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set CONFIG_KBD_MODE=y @@ -346,20 +361,13 @@ CONFIG_MKTEMP=y # Editors # # CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -368,6 +376,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -415,7 +431,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set +CONFIG_INIT=y # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -426,6 +442,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # # Login/Password Management Utilities @@ -450,6 +467,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set # CONFIG_GETTY is not set # CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set @@ -458,6 +476,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set @@ -475,14 +494,14 @@ CONFIG_LAST_SYSTEM_ID=0 # # Linux Module Utilities # -CONFIG_MODINFO=y +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set @@ -497,7 +516,7 @@ CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set CONFIG_DEFAULT_MODULES_DIR="" @@ -507,10 +526,17 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Linux System Utilities # # CONFIG_BLOCKDEV is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FBSET is not set @@ -519,7 +545,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set # CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -549,24 +575,18 @@ CONFIG_HEXDUMP=y CONFIG_LOSETUP=y # CONFIG_LSPCI is not set # CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -577,7 +597,7 @@ CONFIG_FEATURE_MOUNT_FSTAB=y # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y +# CONFIG_SWITCH_ROOT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -587,11 +607,7 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# +# CONFIG_VOLUMEID is not set # CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set @@ -614,10 +630,25 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -658,15 +689,6 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -700,11 +722,17 @@ CONFIG_STRINGS=y # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -777,17 +805,12 @@ CONFIG_IPRULE=y # CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -816,16 +839,19 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPC6 is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" @@ -860,16 +886,21 @@ CONFIG_FEATURE_MIME_CHARSET="" # Process Utilities # # CONFIG_IOSTAT is not set +# CONFIG_LSOF is not set # CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set # CONFIG_PMAP is not set # CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set CONFIG_PGREP=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y @@ -877,6 +908,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set @@ -890,7 +922,6 @@ CONFIG_FEATURE_PS_WIDE=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y # CONFIG_WATCH is not set # @@ -928,6 +959,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_GETOPTS=y @@ -968,6 +1000,7 @@ CONFIG_SH_MATH_SUPPORT=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities @@ -976,6 +1009,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/abs/core/mkinitcpio-busybox/sys_resource.patch b/abs/core/mkinitcpio-busybox/sys_resource.patch new file mode 100644 index 0000000..bd55961 --- /dev/null +++ b/abs/core/mkinitcpio-busybox/sys_resource.patch @@ -0,0 +1,99 @@ +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending + +From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Fri, 06 Jul 2012 03:19:09 +0000 +Subject: include sys/resource.h where needed + +We use functions from sys/resource.h in misc applets, but don't include +the header. This breaks building with newer glibc versions, so add the +include where needed. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- +Index: busybox-1.19.4/loginutils/passwd.c +=================================================================== +--- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800 ++++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700 +@@ -15,6 +15,7 @@ + + #include "libbb.h" + #include <syslog.h> ++#include <sys/resource.h> /* setrlimit */ + + static void nuke_str(char *str) + { +Index: busybox-1.19.4/miscutils/time.c +=================================================================== +--- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800 ++++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700 +@@ -16,6 +16,7 @@ + //usage: "\n -v Verbose" + + #include "libbb.h" ++#include <sys/resource.h> /* getrusage */ + + /* Information on the resources used by a child process. */ + typedef struct { +Index: busybox-1.19.4/networking/inetd.c +=================================================================== +--- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800 ++++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700 +@@ -165,6 +165,7 @@ + //usage: "\n (default: 0 - disabled)" + + #include <syslog.h> ++#include <sys/resource.h> /* setrlimit */ + #include <sys/un.h> + + #include "libbb.h" +Index: busybox-1.19.4/networking/ntpd.c +=================================================================== +--- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800 ++++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700 +@@ -46,6 +46,7 @@ + #include "libbb.h" + #include <math.h> + #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */ ++#include <sys/resource.h> /* setpriority */ + #include <sys/timex.h> + #ifndef IPTOS_LOWDELAY + # define IPTOS_LOWDELAY 0x10 +Index: busybox-1.19.4/networking/ntpd_simple.c +=================================================================== +--- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800 ++++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700 +@@ -7,6 +7,7 @@ + */ + #include "libbb.h" + #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */ ++#include <sys/resource.h> /* setpriority */ + #ifndef IPTOS_LOWDELAY + # define IPTOS_LOWDELAY 0x10 + #endif +Index: busybox-1.19.4/runit/chpst.c +=================================================================== +--- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800 ++++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700 +@@ -91,6 +91,7 @@ + //usage: "\n a SIGXCPU after N seconds" + + #include "libbb.h" ++#include <sys/resource.h> /* getrlimit */ + + /* + Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. +Index: busybox-1.19.4/shell/shell_common.c +=================================================================== +--- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800 ++++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700 +@@ -18,6 +18,7 @@ + */ + #include "libbb.h" + #include "shell_common.h" ++#include <sys/resource.h> /* getrlimit */ + + const char defifsvar[] ALIGN1 = "IFS= \t\n"; + diff --git a/abs/core/mkinitcpio-nfs-utils/PKGBUILD b/abs/core/mkinitcpio-nfs-utils/PKGBUILD index 962bb33..70166e1 100644 --- a/abs/core/mkinitcpio-nfs-utils/PKGBUILD +++ b/abs/core/mkinitcpio-nfs-utils/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 68748 2010-02-14 10:45:02Z thomas $ +# $Id: PKGBUILD 160392 2012-06-01 13:21:36Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-nfs-utils -pkgver=0.2 -pkgrel=1 +pkgver=0.3 +pkgrel=3 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64') url="http://www.archlinux.org/" license=('GPL2') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz) -sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') +source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz" + 'initcpio-install-net' + 'initcpio-hook-net') +sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939' + '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861' + '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 + make -C "$pkgname-$pkgver" } package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + # override hooks, they need updates + install -m644 "$srcdir/initcpio-install-net" "$pkgdir/usr/lib/initcpio/install/net" + install -m644 "$srcdir/initcpio-hook-net" "$pkgdir/usr/lib/initcpio/hooks/net" } diff --git a/abs/core/mkinitcpio-nfs-utils/initcpio-hook-net b/abs/core/mkinitcpio-nfs-utils/initcpio-hook-net new file mode 100644 index 0000000..4d1ebb9 --- /dev/null +++ b/abs/core/mkinitcpio-nfs-utils/initcpio-hook-net @@ -0,0 +1,90 @@ +# vim: set ft=sh: +run_hook() { + local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver + # These variables will be parsed from /tmp/net-*.conf generated by ipconfig + local DEVICE + local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 + local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH + local filename + # /tmp/net-*.conf + + if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then + ip="${nfsaddrs}" + fi + + if [ -n "${ip}" ]; then + if [ -n "${BOOTIF}" ]; then + bootif_mac=${BOOTIF#01-} + bootif_mac=${bootif_mac//-/:} + for i in /sys/class/net/*/address; do + read net_mac < ${i} + if [ "${bootif_mac}" == "${net_mac}" ]; then + bootif_dev=${i#/sys/class/net/} + bootif_dev=${bootif_dev%/address} + break + fi + done + ip="${ip}::${bootif_dev}" + fi + + # setup network and save some values + ipconfig "ip=${ip}" + + for conf in /tmp/net-*.conf; do + [ -f "$conf" ] && . "$conf" + done + + # calculate nfs_server, nfs_path and nfs_option for later nfs mount + if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then + # parse ROOTPATH if defined by dhcp server + if [ -n "${ROOTPATH}" ]; then + line="${ROOTPATH}" + nfs_server="${line%%:*}" + [ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}" + defaultserver="${nfs_server}" + line="${line#*:}" + nfs_path="${line}" + defaultrootpath="${nfs_path}" + else + # define a default ROOTPATH + if [ "${ROOTPATH}" = "" ]; then + defaultrootpath="/tftpboot/${IPV4ADDR}" + fi + fi + + # parse nfsroot if present (overrides ROOTPATH) + if [ -n "${nfsroot}" ]; then + line="${nfsroot}" + nfs_server="${line%%:*}" + [ -z "${nfs_server}" ] && nfs_server="${defaultserver}" + line="${line#*:}" + nfs_path="${line%%,*}" + line="${line#"${nfs_path}"}" + [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}" + nfs_option="${line#","}" + fi + + # ensure root and filesystem type are set proper for nfs boot + root="/dev/nfs" + rootfstype="nfs" + + echo "NFS-Mount: ${nfs_server}:${nfs_path}" + + # set mount handler for NFS + mount_handler="nfs_mount_handler" + fi + fi +} + +nfs_mount_handler() { + if [ -z "$nfs_server" -o -z "$nfs_path" ]; then + err "Unable to mount root filesystem over NFS: wrong parameters." + echo "You are being dropped to a recovery shell" + echo " Type 'exit' to try and continue booting" + launch_interactive_shell + msg "Trying to continue (this will most likely fail) ..." + fi + nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/mkinitcpio-nfs-utils/initcpio-install-net b/abs/core/mkinitcpio-nfs-utils/initcpio-install-net new file mode 100644 index 0000000..7030e2d --- /dev/null +++ b/abs/core/mkinitcpio-nfs-utils/initcpio-install-net @@ -0,0 +1,107 @@ +#!/bin/bash + +build() { + add_checked_modules '/drivers/net/' + + add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig" + add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount" + + add_runscript +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for a network device. +Detection will take place at runtime. To minimize the modules +in the image, add the autodetect hook too. +For pcmcia net devices please use pcmcia hook too. + +Kernel Parameters: +An interface spec can be either short form, which is just the name of +an interface (eth0 or whatever), or long form. The long form consists +of up to seven elements, separated by colons: + +ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> +nfsaddrs= is an alias to ip= and can be used too. + +<client-ip> IP address of the client. If empty, the address will + either be determined by RARP/BOOTP/DHCP. What protocol + is used de- pends on the <autoconf> parameter. If this + parameter is not empty, autoconf will be used. + +<server-ip> IP address of the NFS server. If RARP is used to + determine the client address and this parameter is NOT + empty only replies from the specified server are + accepted. To use different RARP and NFS server, + specify your RARP server here (or leave it blank), and + specify your NFS server in the 'nfsroot' parameter + (see above). If this entry is blank the address of the + server is used which answered the RARP/BOOTP/DHCP + request. + +<gw-ip> IP address of a gateway if the server is on a different + subnet. If this entry is empty no gateway is used and the + server is assumed to be on the local network, unless a + value has been received by BOOTP/DHCP. + +<netmask> Netmask for local network interface. If this is empty, + the netmask is derived from the client IP address assuming + classful addressing, unless overridden in BOOTP/DHCP reply. + +<hostname> Name of the client. If empty, the client IP address is + used in ASCII notation, or the value received by + BOOTP/DHCP. + +<device> Name of network device to use. If this is empty, all + devices are used for RARP/BOOTP/DHCP requests, and the + first one we receive a reply on is configured. If you + have only one device, you can safely leave this blank. + +<autoconf> Method to use for autoconfiguration. If this is either + 'rarp', 'bootp', or 'dhcp' the specified protocol is + used. If the value is 'both', 'all' or empty, all + protocols are used. 'off', 'static' or 'none' means + no autoconfiguration. +Examples: +ip=127.0.0.1:::::lo:none --> Enable the loopback interface. +ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface. +ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration. + +nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>] + +If the 'nfsroot' parameter is NOT given on the command line, the default +"/tftpboot/%s" will be used. + +<server-ip> Specifies the IP address of the NFS server. If this field + is not given, the default address as determined by the + 'ip' variable (see below) is used. One use of this + parameter is for example to allow using different servers + for RARP and NFS. Usually you can leave this blank. + +<root-dir> Name of the directory on the server to mount as root. If + there is a "%s" token in the string, the token will be + replaced by the ASCII-representation of the client's IP + address. + +<nfs-options> Standard NFS options. All options are separated by commas. + If the options field is not given, the following defaults + will be used: + port = as given by server portmap daemon + rsize = 1024 + wsize = 1024 + timeo = 7 + retrans = 3 + acregmin = 3 + acregmax = 60 + acdirmin = 30 + acdirmax = 60 + flags = hard, nointr, noposix, cto, ac + +root=/dev/nfs + +If you don't use nfsroot= parameter you need to set root=/dev/nfs +to boot from a nfs root by autoconfiguration. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch b/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch new file mode 100644 index 0000000..042a0b9 --- /dev/null +++ b/abs/core/mkinitcpio/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch @@ -0,0 +1,29 @@ +From 7cf7ac4eb2c29a2b1aa748dae7658da5fbbc3a18 Mon Sep 17 00:00:00 2001 +From: Brian Parsons <brian@pmex.com> +Date: Mon, 11 Jun 2012 17:30:10 -0400 +Subject: [PATCH 1/2] Update module filter to be aware of hyphens in the + MODULES array + +[dave: fix whitespace and re-add needed quoting] + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +--- + functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/functions b/functions +index 4a62d8e..e9fb81a 100644 +--- a/functions ++++ b/functions +@@ -590,7 +590,7 @@ write_image_config() { + . "$CONFIG" + + # sanitize of any extra whitespace +- read -ra modules <<< "$MODULES" ++ read -ra modules <<<"${MODULES//-/_}" + for mod in "${modules[@]}"; do + in_array "${mod%\?}" "${ADDED_MODULES[@]}" || continue + add+=("${mod%\?}") +-- +1.7.10.4 + diff --git a/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch b/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch new file mode 100644 index 0000000..7a1aba9 --- /dev/null +++ b/abs/core/mkinitcpio/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch @@ -0,0 +1,28 @@ +From c257b0d7b4dd1c3f9b63c6a27b68a27bc246acea Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Tue, 12 Jun 2012 19:18:18 -0400 +Subject: [PATCH 2/2] shutdown: don't alert udev on disable VGs + +Fixes FS#30271. + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +--- + shutdown | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shutdown b/shutdown +index ce7de23..fd88105 100644 +--- a/shutdown ++++ b/shutdown +@@ -25,7 +25,7 @@ stop_device() { + read devname <"$1/dm/name" + lvm lvdisplay -c "/dev/mapper/$devname" | { + IFS=: read _ vgname _ +- lvm vgchange -an "$vgname" ++ lvm vgchange --noudevsync -an "$vgname" + } + ;; + raid*) +-- +1.7.10.4 + diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index 0631650..282b2bb 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -1,29 +1,39 @@ +# $Id: PKGBUILD 161860 2012-06-15 22:35:26Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> - pkgname=mkinitcpio -pkgver=0.7.2 -pkgrel=11 +pkgver=0.9.2 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" -arch=(any) +arch=('any') url="http://www.archlinux.org/" license=('GPL') -depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils=>0.2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' - 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip' - 'which') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod>=3' 'util-linux>=2.21' 'libarchive' 'coreutils' + 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'file' 'gzip' 'systemd-tools') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') -replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' - 'klibc-module-init-tools' 'klibc-udev') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz mkinitcpio.conf.patch) -backup=(etc/mkinitcpio.conf) +backup=('etc/mkinitcpio.conf') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + 0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch + 0002-shutdown-don-t-alert-udev-on-disable-VGs.patch) +install=mkinitcpio.install +sha256sums=('1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28' + '5e5f83a2f9805ce1b09602f31fd4aca93fa7085a40c74bc559cf25c29506b057' + 'e32a7955b94e378698268f9cfd07fb0285a4efbdc4b26ea40714e7f1a54705a1') package() { - cd $srcdir/${pkgname}-${pkgver} - patch -p0 < $srcdir/mkinitcpio.conf.patch - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir"/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch + patch -Np1 <"$srcdir"/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch + + make DESTDIR="$pkgdir" install + + # compat symlink + install -dm755 "$pkgdir/sbin" + ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio" } -md5sums=('e11670a7d4802b2ef20cab4b3815168a' - '36da3320c907bf3b41b74fc824cbd1d8') + diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog deleted file mode 100644 index c8dbb63..0000000 --- a/abs/core/mkinitcpio/__changelog +++ /dev/null @@ -1,6 +0,0 @@ -added "usb" and net to the modules line in mkinitcpio.conf -+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput" - -MODULES="nfs" - -added depends: mkinitcpio-nfs-utils diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch deleted file mode 100644 index 800b347..0000000 --- a/abs/core/mkinitcpio/mkinitcpio.conf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mkinitcpio.conf.orig 2011-08-06 00:04:15.991131194 +0000 -+++ mkinitcpio.conf 2011-08-06 00:04:02.791130644 +0000 -@@ -4,7 +4,7 @@ - # run. Advanced users may wish to specify all system modules - # in this array. For instance: - # MODULES="piix ide_disk reiserfs" --MODULES="" -+MODULES="nfs" - - # BINARIES - # This setting includes any additional binaries a given user may -@@ -54,7 +54,7 @@ - # - ## This setup loads an lvm2 volume group on a usb device. - # HOOKS="base udev usb lvm2 filesystems" --HOOKS="base udev autodetect pata scsi sata filesystems usbinput" -+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash" - - # COMPRESSION - # Use this to compress the initramfs image. With kernels earlier than diff --git a/abs/core/mkinitcpio/mkinitcpio.install b/abs/core/mkinitcpio/mkinitcpio.install new file mode 100644 index 0000000..d8bbfdb --- /dev/null +++ b/abs/core/mkinitcpio/mkinitcpio.install @@ -0,0 +1,8 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then + printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n' + printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' + fi +} diff --git a/abs/core/module-init-tools/PKGBUILD b/abs/core/module-init-tools/PKGBUILD deleted file mode 100644 index e65f419..0000000 --- a/abs/core/module-init-tools/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=module-init-tools -pkgver=3.16 -pkgrel=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" -arch=('i686' 'x86_64') -url="http://kerneltools.org" -license=('GPL') -depends=('glibc') -makedepends=('docbook2x') -backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 - modprobe.conf - docfix.patch) -md5sums=('bc44832c6e41707b8447e2847d2019f5' - '316f1bda4c21af02b30252eb014a0a55' - '4320d19902ded43bed55c804b065cdc7') - -build() { - cd $srcdir/$pkgname-$pkgver - - # fix headers in SGML manpage sources and an XML typo - patch -Np0 < "$srcdir/docfix.patch" - - ./configure --prefix=/usr --exec-prefix=/ --enable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf -} diff --git a/abs/core/module-init-tools/docfix.patch b/abs/core/module-init-tools/docfix.patch deleted file mode 100644 index 0151ca3..0000000 --- a/abs/core/module-init-tools/docfix.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400 -+++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400 -+++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> -@@ -52,7 +52,7 @@ - <arg><option>-n</option></arg> - <arg><option>-v</option></arg> - <arg><option>-P <replaceable>prefix</replaceable></option></arg> -- <arg><option>-w</option><arg> -+ <arg><option>-w</option></arg> - <arg><option><replaceable>version</replaceable></option></arg> - <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg> - </cmdsynopsis> ---- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 -+++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 -+++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400 -+++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400 -+++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400 -+++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400 -+++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400 -+++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> diff --git a/abs/core/module-init-tools/modprobe.conf b/abs/core/module-init-tools/modprobe.conf deleted file mode 100644 index 83865a3..0000000 --- a/abs/core/module-init-tools/modprobe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) -# diff --git a/abs/core/module-init-tools/module-init-tools-3.16-1.src.tar.gz b/abs/core/module-init-tools/module-init-tools-3.16-1.src.tar.gz Binary files differdeleted file mode 100644 index b75ae8b..0000000 --- a/abs/core/module-init-tools/module-init-tools-3.16-1.src.tar.gz +++ /dev/null diff --git a/abs/core/mpfr/PKGBUILD b/abs/core/mpfr/PKGBUILD index 9630fd3..4912c45 100644 --- a/abs/core/mpfr/PKGBUILD +++ b/abs/core/mpfr/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 140251 2011-10-11 00:43:42Z allan $ +# $Id: PKGBUILD 163011 2012-07-05 13:48:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr -_pkgver=3.1.0 -_patchlevel=p1 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 +_pkgver=3.1.1 +#_patchlevel=p1 +#pkgver=${_pkgver}.${_patchlevel} +pkgver=${_pkgver} +pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') url="http://www.mpfr.org/" @@ -14,14 +15,12 @@ license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz - mpfr-${_pkgver}.${_patchlevel}.patch) -md5sums=('6e495841bb026481567006cec0f821c3' - 'ec988293368d4988c76f50d6a3460166') +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) +md5sums=('91d51c41fcf2799e4ee7a7126fc95c17' + '91b187a2229211e543ba6fb82a079b2c') build() { cd "${srcdir}/${pkgname}-${_pkgver}" - patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/abs/core/mpfr/mpfr-3.1.0.p1.patch b/abs/core/mpfr/mpfr-3.1.0.p1.patch deleted file mode 100644 index 437b1a2..0000000 --- a/abs/core/mpfr/mpfr-3.1.0.p1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_unlikely -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 -@@ -1 +1 @@ --3.1.0 -+3.1.0-p1 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -@@ -988,10 +988,11 @@ - ******************************************************/ - - /* Theses macros help the compiler to determine if a test is -- * likely or unlikely. */ -+ likely or unlikely. The !! is necessary in case x is larger -+ than a long. */ - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) - #else - # define MPFR_LIKELY(x) (x) - # define MPFR_UNLIKELY(x) (x) -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0" -+#define MPFR_VERSION_STRING "3.1.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0"; -+ return "3.1.0-p1"; - } diff --git a/abs/core/mpfr/mpfr-3.1.0.p10.patch b/abs/core/mpfr/mpfr-3.1.0.p10.patch new file mode 100644 index 0000000..0073be7 --- /dev/null +++ b/abs/core/mpfr/mpfr-3.1.0.p10.patch @@ -0,0 +1,1896 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 +@@ -0,0 +1 @@ ++gmp41compat +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p3 ++3.1.0-p4 +diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info +--- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 +@@ -2994,11 +2994,12 @@ + + * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their + behavior no longer depends on the platform (assuming this is also +- true for GMP's random generator). As a consequence, the returned +- values can be different between MPFR 3.1 and previous MPFR +- versions. Note: as the reproducibility of these functions was not +- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded +- as backward incompatible with previous versions. ++ true for GMP's random generator, which is not the case between GMP ++ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, ++ the returned values can be different between MPFR 3.1 and previous ++ MPFR versions. Note: as the reproducibility of these functions ++ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ ++ regarded as backward incompatible with previous versions. + + + +@@ -4239,13 +4240,13 @@ + Node: Type and Macro Changes129308 + Node: Added Functions132029 + Node: Changed Functions134972 +-Node: Removed Functions139167 +-Node: Other Changes139579 +-Node: Contributors141108 +-Node: References143574 +-Node: GNU Free Documentation License145315 +-Node: Concept Index167758 +-Node: Function and Type Index173677 ++Node: Removed Functions139253 ++Node: Other Changes139665 ++Node: Contributors141194 ++Node: References143660 ++Node: GNU Free Documentation License145401 ++Node: Concept Index167844 ++Node: Function and Type Index173763 + + End Tag Table + +diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi +--- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 +@@ -3466,8 +3466,9 @@ + a lack of specification. + + @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. +-Their behavior no longer depends on the platform (assuming this is also +-true for GMP's random generator). As a consequence, the returned values ++Their behavior no longer depends on the platform (assuming this is also true ++for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if ++@code{gmp_randinit_default} is used). As a consequence, the returned values + can be different between MPFR 3.1 and previous MPFR versions. + Note: as the reproducibility of these functions was not specified + before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p3" ++#define MPFR_VERSION_STRING "3.1.0-p4" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p3"; ++ return "3.1.0-p4"; + } +diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c +--- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -114,21 +114,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.895943" ++# define C2 "0.848824" ++#else ++# define C1 "0.479652" ++# define C2 "0.648529" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.895943") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.895943, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.848824") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.848824, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c +--- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -160,23 +160,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.8488312" ++# define C2 "0.8156509" ++#else ++# define C1 "0.6485367" ++# define C2 "0.9362717" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandom (x, s, MPFR_RNDN); +- /* the following values are obtained on a 32-bit computer, we should get +- the same values on a 64-bit computer */ +- if (mpfr_cmp_str1 (x, "0.8488312") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.8488312, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandom (x, s, MPFR_RNDN); +- if (mpfr_cmp_str1 (x, "0.8156509") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.8156509, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 +@@ -0,0 +1 @@ ++logging-freeze +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p4 ++3.1.0-p5 +diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c +--- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c +--- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 +@@ -29,7 +29,7 @@ + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg u=%d rnd=%d", + mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), +- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); ++ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); + + if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ + { +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p4" ++#define MPFR_VERSION_STRING "3.1.0-p5" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c +--- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p4"; ++ return "3.1.0-p5"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 +@@ -0,0 +1 @@ ++logging-varfmt +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p5 ++3.1.0-p6 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 +@@ -1592,7 +1592,7 @@ + do \ + if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ + (mpfr_log_current <= mpfr_log_level)) \ +- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ ++ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ + #x, mpfr_get_prec (x), mpfr_log_prec, x); \ + while (0) + +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p5" ++#define MPFR_VERSION_STRING "3.1.0-p6" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p5"; ++ return "3.1.0-p6"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 +@@ -0,0 +1 @@ ++large-prec +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p6 ++3.1.0-p7 +diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c +--- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 +@@ -44,12 +44,12 @@ + bq = MPFR_PREC(b); + cq = MPFR_PREC(c); + +- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ ++ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ + aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; + sh = aq2 - aq; /* non-significant bits in low limb */ + +- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ +- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + + ap = MPFR_MANT(a); + bp = MPFR_MANT(b); +@@ -124,7 +124,7 @@ + dif = aq2 - diff_exp; + /* dif is the number of bits of c which overlap with a' */ + +- difn = (dif-1)/GMP_NUMB_BITS + 1; ++ difn = MPFR_PREC2LIMBS (dif); + /* only the highest difn limbs from c have to be considered */ + if (MPFR_UNLIKELY(difn > cn)) + { +diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c +--- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -107,7 +107,7 @@ + + /* Read prec and num of limbs */ + p = MPFR_PREC(b); +- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; ++ n = MPFR_PREC2LIMBS (p); + MPFR_UNSIGNED_MINUS_MODULO(sh, p); + bx = MPFR_GET_EXP(b); + d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); +diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c +--- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 +@@ -91,7 +91,7 @@ + q = MPFR_PREC(r); + p = q + MPFR_INT_CEIL_LOG2(q) + 15; + MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ +- s = (p - 1) / GMP_NUMB_BITS + 1; ++ s = MPFR_PREC2LIMBS (p); + + /* b (op2) and a (op1) are the 2 operands but we want b >= a */ + compare = mpfr_cmp (op1, op2); +@@ -285,7 +285,7 @@ + + /* Next iteration */ + MPFR_ZIV_NEXT (loop, p); +- s = (p - 1) / GMP_NUMB_BITS + 1; ++ s = MPFR_PREC2LIMBS (p); + } + MPFR_ZIV_FREE (loop); + +diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c +--- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 +@@ -56,8 +56,8 @@ + if (uexp != vexp) + return 0; /* no bit agree */ + +- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; +- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; ++ usize = MPFR_LIMB_SIZE (u); ++ vsize = MPFR_LIMB_SIZE (v); + + if (vsize > usize) /* exchange u and v */ + { +diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c +--- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -133,7 +133,7 @@ + mp_size_t yn; + int sh; + +- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; ++ yn = MPFR_LIMB_SIZE (y); + sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); + MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; + inexact = 1; +diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c +--- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 +@@ -100,7 +100,7 @@ + nbits += (1021 + e); + MPFR_ASSERTD (nbits >= 1); + } +- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ np = MPFR_PREC2LIMBS (nbits); + MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); + carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, + nbits, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c +--- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 +@@ -92,7 +92,7 @@ + nbits += (125 + e); + MPFR_ASSERTD (nbits >= 1); + } +- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ np = MPFR_PREC2LIMBS (nbits); + MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); + carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, + nbits, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c +--- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 +@@ -2351,7 +2351,7 @@ + + /* the first digit will contain only r bits */ + prec = (m - 1) * pow2 + r; /* total number of bits */ +- n = (prec - 1) / GMP_NUMB_BITS + 1; ++ n = MPFR_PREC2LIMBS (prec); + + MPFR_TMP_MARK (marker); + x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); +@@ -2417,12 +2417,12 @@ + exact = 1; + + /* number of limbs */ +- n = 1 + (prec - 1) / GMP_NUMB_BITS; ++ n = MPFR_PREC2LIMBS (prec); + + /* a will contain the approximation of the mantissa */ + a = MPFR_TMP_LIMBS_ALLOC (n); + +- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; ++ nx = MPFR_LIMB_SIZE (x); + + if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or + division to perform */ +diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c +--- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 +@@ -51,7 +51,7 @@ + which both have an odd mantissa */ + MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); + +- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; ++ xsize = MPFR_PREC2LIMBS (p); + tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); + + MPFR_PREC(x) = p; /* Set prec */ +diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c +--- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 +@@ -67,7 +67,7 @@ + + /* Now, the unit bit is represented. */ + +- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; ++ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; + /* number of represented fractional bits (including the trailing 0's) */ + + x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-09 12:06:26.000000000 +0000 +@@ -646,10 +646,24 @@ + **************** mpfr_t properties ******************* + ******************************************************/ + ++/* In the following macro, p is usually a mpfr_prec_t, but this macro ++ works with other integer types (without integer overflow). Checking ++ that p >= 1 in debug mode is useful here because this macro can be ++ used on a computed precision (in particular, this formula does not ++ work for a degenerate case p = 0, and could give different results ++ on different platforms). But let us not use an assertion checking ++ in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid ++ too much expansion for assertions (in practice, this should be a ++ problem just when testing MPFR with the --enable-assert configure ++ option and the -ansi -pedantic-errors gcc compiler flags). */ ++#define MPFR_PREC2LIMBS(p) \ ++ (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) ++ + #define MPFR_PREC(x) ((x)->_mpfr_prec) + #define MPFR_EXP(x) ((x)->_mpfr_exp) + #define MPFR_MANT(x) ((x)->_mpfr_d) +-#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) ++#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS) ++#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1) + + + /****************************************************** +@@ -749,7 +763,8 @@ + #define MPFR_IS_FP(x) (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x)) + #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF) + #define MPFR_IS_PURE_FP(x) (!MPFR_IS_SINGULAR(x) && \ +- (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1)) ++ (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)] \ ++ & MPFR_LIMB_HIGHBIT) != 0), 1)) + + #define MPFR_ARE_SINGULAR(x,y) \ + (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y))) +@@ -1061,7 +1076,7 @@ + /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */ + #define MPFR_SET_ONE(x) \ + do { \ +- mp_size_t _size = MPFR_LIMB_SIZE(x) - 1; \ ++ mp_size_t _size = MPFR_LAST_LIMB(x); \ + MPFR_SET_POS(x); \ + MPFR_EXP(x) = 1; \ + MPN_ZERO ( MPFR_MANT(x), _size); \ +@@ -1213,8 +1228,8 @@ + _destp = MPFR_MANT (dest); \ + if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ + { \ +- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ +- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ ++ _srcs = MPFR_PREC2LIMBS (_srcprec); \ ++ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ + MPN_COPY (_destp + _dests, srcp, _srcs); \ + MPN_ZERO (_destp, _dests); \ + inexact = 0; \ +@@ -1227,8 +1242,8 @@ + mp_limb_t _rb, _sb, _ulp; \ + \ + /* Compute Position and shift */ \ +- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ +- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ ++ _srcs = MPFR_PREC2LIMBS (_srcprec); \ ++ _dests = MPFR_PREC2LIMBS (_destprec); \ + MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ + _sp = (srcp) + _srcs - _dests; \ + \ +@@ -1372,7 +1387,7 @@ + if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ + { \ + MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ +- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ ++ MPFR_LIMB_SIZE (src)); \ + inexact = 0; \ + } \ + else \ +@@ -1682,7 +1697,7 @@ + MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ + if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ + mpfr_abort_prec_max (); \ +- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ ++ _size = MPFR_PREC2LIMBS (_prec); \ + if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ + { \ + (g).alloc = (num) * _size * sizeof (mp_limb_t); \ +@@ -1733,7 +1748,7 @@ + MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ + if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ + mpfr_abort_prec_max (); \ +- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ ++ _size = MPFR_PREC2LIMBS (_prec); \ + (g).alloc = (num) * _size * sizeof (mp_limb_t); \ + if (MPFR_LIKELY (_oalloc == 0)) \ + (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ +@@ -1886,7 +1901,7 @@ + MPFR_NORETURN_ATTR; + + __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, +- unsigned long)); ++ mpfr_prec_t)); + + __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, + unsigned long)); +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p6" ++#define MPFR_VERSION_STRING "3.1.0-p7" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c +--- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 +@@ -93,15 +93,15 @@ + + ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); + +- bq = MPFR_PREC(b); +- cq = MPFR_PREC(c); ++ bq = MPFR_PREC (b); ++ cq = MPFR_PREC (c); + +- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); + +- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ +- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ +- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ tn = MPFR_PREC2LIMBS (bq + cq); + /* <= k, thus no int overflow */ + MPFR_ASSERTD(tn <= k); + +@@ -292,12 +292,12 @@ + bq = MPFR_PREC (b); + cq = MPFR_PREC (c); + +- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); + +- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ +- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ +- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ tn = MPFR_PREC2LIMBS (bq + cq); + MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ + + /* Check for no size_t overflow*/ +diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c +--- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 +@@ -136,7 +136,7 @@ + (b) all the 'z' bits are zero + */ + +- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; ++ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; + /* number of z+0 bits */ + + yn = prec / GMP_NUMB_BITS; +diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c +--- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 +@@ -84,7 +84,7 @@ + int i; + mpfr_prec_t count = 0; + char c; +- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; ++ mp_size_t n = MPFR_PREC2LIMBS (r); + + printf("%s ", str); + for(n-- ; n>=0 ; n--) +@@ -109,7 +109,7 @@ + int i; + mpfr_prec_t count = 0; + char c; +- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; ++ mp_size_t n = MPFR_PREC2LIMBS (r); + + for(n-- ; n>=0 ; n--) + { +diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c +--- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 +@@ -55,12 +55,12 @@ + + MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); + +- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ ++ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ + + /* check if x has enough allocated space for the significand */ + /* Get the number of limbs from the precision. + (Compatible with all allocation methods) */ +- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ ow = MPFR_LIMB_SIZE (x); + if (nw > ow) + { + /* FIXME: Variable can't be created using custom allocation, +diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c +--- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 +@@ -80,7 +80,7 @@ + (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) + return 0; + +- xsize = (xprec-1)/GMP_NUMB_BITS + 1; ++ xsize = MPFR_PREC2LIMBS (xprec); + nw = yprec / GMP_NUMB_BITS; + rw = yprec & (GMP_NUMB_BITS - 1); + +diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c +--- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 +@@ -48,8 +48,7 @@ + /* Same precision and b is not singular: + * just copy the mantissa, and set the exponent and the sign + * The result is exact. */ +- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), +- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); ++ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); + MPFR_RET (0); + } + else +diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c +--- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 +@@ -43,7 +43,7 @@ + if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) + MPFR_CHANGE_SIGN (y); + +- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; ++ sy = MPFR_LIMB_SIZE (y); + my = MPFR_MANT(y); + mx = PTR(x); + +diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c +--- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 +@@ -32,7 +32,7 @@ + MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); + + /* Calculate the new number of limbs */ +- xsize = (p - 1) / GMP_NUMB_BITS + 1; ++ xsize = MPFR_PREC2LIMBS (p); + + /* Realloc only if the new size is greater than the old */ + xoldsize = MPFR_GET_ALLOC_SIZE (x); +diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c +--- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 +@@ -32,7 +32,7 @@ + mp_limb_t *xp; + + MPFR_SET_EXP (x, e); +- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; ++ xn = MPFR_LIMB_SIZE (x); + sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); + xp = MPFR_MANT(x); + xp[0] = MP_LIMB_T_MAX << sh; +diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c +--- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 +@@ -56,11 +56,11 @@ + ax = 2 * MPFR_GET_EXP (b); + bq = MPFR_PREC(b); + +- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); + +- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ +- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, +- 2*bn or 2*bn-1 */ ++ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ ++ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, ++ 2*bn or 2*bn-1 */ + + if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) + return mpfr_mul (a, b, b, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c +--- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 +@@ -26,7 +26,7 @@ + size_t + mpfr_custom_get_size (mpfr_prec_t prec) + { +- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; ++ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; + } + + #undef mpfr_custom_init +diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c +--- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 +@@ -467,7 +467,7 @@ + /* Set y to the value of the ~prec most significant bits of pstr->mant + (as long as we guarantee correct rounding, we don't need to get + exactly prec bits). */ +- ysize = (prec - 1) / GMP_NUMB_BITS + 1; ++ ysize = MPFR_PREC2LIMBS (prec); + /* prec bits corresponds to ysize limbs */ + ysize_bits = ysize * GMP_NUMB_BITS; + /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ +diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c +--- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -155,8 +155,8 @@ + MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); + + /* Read prec and num of limbs */ +- p = MPFR_PREC(b); +- n = (p-1)/GMP_NUMB_BITS+1; ++ p = MPFR_PREC (b); ++ n = MPFR_PREC2LIMBS (p); + + /* Fast cmp of |b| and |c|*/ + bx = MPFR_GET_EXP (b); +diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c +--- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 +@@ -31,13 +31,20 @@ + a sufficient number of limbs */ + void + mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, +- unsigned long int nbits) ++ mpfr_prec_t nbits) + { + mpz_t z; + ++ MPFR_ASSERTN (nbits >= 1); + /* To be sure to avoid the potential allocation of mpz_urandomb */ +- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; ++ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); + PTR(z) = mp; ++#if __MPFR_GMP(5,0,0) ++ /* Check for integer overflow (unless mp_bitcnt_t is signed, ++ but according to the GMP manual, this shouldn't happen). ++ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ ++ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); ++#endif + mpz_urandomb (z, rstate, nbits); + } + +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p6"; ++ return "3.1.0-p7"; + } +diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c +--- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. ++/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. + + Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Contributed by the Arenaire and Caramel projects, INRIA. +@@ -20,18 +20,43 @@ + http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++#include <stdlib.h> ++ + #include "mpfr-test.h" + + int + main (void) + { + mpfr_t a, b, c; ++ long large_prec; + + tests_start_mpfr (); ++ + mpfr_inits (a, b, c, (mpfr_ptr) 0); + mpfr_clears (a, b, c, (mpfr_ptr) 0); + mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); + mpfr_clears (a, b, c, (mpfr_ptr) 0); ++ ++ /* test for precision 2^31-1, see ++ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ ++ large_prec = 2147483647; ++ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) ++ { ++ /* We assume that the precision won't be increased internally. */ ++ if (large_prec > MPFR_PREC_MAX) ++ large_prec = MPFR_PREC_MAX; ++ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); ++ mpfr_set_ui (a, 17, MPFR_RNDN); ++ mpfr_set (b, a, MPFR_RNDN); ++ if (mpfr_get_ui (a, MPFR_RNDN) != 17) ++ { ++ printf ("Error in mpfr_init2 with precision 2^31-1\n"); ++ exit (1); ++ } ++ mpfr_clears (a, b, (mpfr_ptr) 0); ++ } ++ + tests_end_mpfr (); ++ + return 0; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-03-12 11:59:47.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-03-12 11:59:47.000000000 +0000 +@@ -0,0 +1 @@ ++__gmp_const +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-03-12 11:59:47.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p7 ++3.1.0-p8 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-03-12 11:59:47.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p7" ++#define MPFR_VERSION_STRING "3.1.0-p8" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +@@ -39,6 +39,18 @@ + # include <gmp.h> + #endif + ++/* GMP's internal __gmp_const macro has been removed on 2012-03-04: ++ http://gmplib.org:8000/gmp/rev/d287cfaf6732 ++ const is standard and now assumed to be available. If the __gmp_const ++ definition is no longer present in GMP, this probably means that GMP ++ assumes that const is available; thus let's define it to const. ++ Note: this is a temporary fix that can be backported to previous MPFR ++ versions. In the future, __gmp_const should be replaced by const like ++ in GMP. */ ++#ifndef __gmp_const ++# define __gmp_const const ++#endif ++ + /* Avoid some problems with macro expansion if the user defines macros + with the same name as keywords. By convention, identifiers and macro + names starting with mpfr_ are reserved by MPFR. */ +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-03-12 11:59:47.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p7"; ++ return "3.1.0-p8"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-04-27 01:13:15.000000000 +0000 +@@ -0,0 +1 @@ ++gamma-underflow +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-03-12 11:59:47.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-04-27 01:13:15.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p8 ++3.1.0-p9 +diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c +--- mpfr-3.1.0-a/src/gamma.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 +@@ -296,7 +296,7 @@ + /* we want an upper bound for x * [log(2-x)-1]. + since x < 0, we need a lower bound on log(2-x) */ + mpfr_ui_sub (xp, 2, x, MPFR_RNDD); +- mpfr_log2 (xp, xp, MPFR_RNDD); ++ mpfr_log (xp, xp, MPFR_RNDD); + mpfr_sub_ui (xp, xp, 1, MPFR_RNDD); + mpfr_mul (xp, xp, x, MPFR_RNDU); + +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-03-12 11:59:47.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-04-27 01:13:15.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p8" ++#define MPFR_VERSION_STRING "3.1.0-p9" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-03-12 11:59:47.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-04-27 01:13:15.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p8"; ++ return "3.1.0-p9"; + } +diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c +--- mpfr-3.1.0-a/tests/tgamma.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 +@@ -478,6 +478,36 @@ + mpfr_clear (x); + } + ++/* bug found by Giridhar Tammana */ ++static void ++test20120426 (void) ++{ ++ mpfr_t xa, xb; ++ int i; ++ mpfr_exp_t emin; ++ ++ mpfr_init2 (xa, 53); ++ mpfr_init2 (xb, 53); ++ mpfr_set_d (xb, -168.5, MPFR_RNDN); ++ emin = mpfr_get_emin (); ++ mpfr_set_emin (-1073); ++ i = mpfr_gamma (xa, xb, MPFR_RNDN); ++ i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */ ++ mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN); ++ if (!((i > 0) && (mpfr_cmp (xa, xb) == 0))) ++ { ++ printf ("Error in test20120426, i=%d\n", i); ++ printf ("expected "); ++ mpfr_print_binary (xb); putchar ('\n'); ++ printf ("got "); ++ mpfr_print_binary (xa); putchar ('\n'); ++ exit (1); ++ } ++ mpfr_set_emin (emin); ++ mpfr_clear (xa); ++ mpfr_clear (xb); ++} ++ + static void + exprange (void) + { +@@ -821,6 +851,7 @@ + gamma_integer (); + test20071231 (); + test20100709 (); ++ test20120426 (); + + data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); + +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-05-07 18:52:45.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-05-07 18:52:45.000000000 +0000 +@@ -0,0 +1 @@ ++gamma-overunderflow +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-05-07 18:52:45.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p9 ++3.1.0-p10 +diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c +--- mpfr-3.1.0-a/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/src/gamma.c 2012-05-07 18:52:45.000000000 +0000 +@@ -100,7 +100,8 @@ + mpfr_t xp, GammaTrial, tmp, tmp2; + mpz_t fact; + mpfr_prec_t realprec; +- int compared, inex, is_integer; ++ int compared, is_integer; ++ int inex = 0; /* 0 means: result gamma not set yet */ + MPFR_GROUP_DECL (group); + MPFR_SAVE_EXPO_DECL (expo); + MPFR_ZIV_DECL (loop); +@@ -377,6 +378,15 @@ + mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */ + err_g = MPFR_GET_EXP(GammaTrial); + mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */ ++ /* If tmp is +Inf, we compute exp(lngamma(x)). */ ++ if (mpfr_inf_p (tmp)) ++ { ++ inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode); ++ if (inex) ++ goto end; ++ else ++ goto ziv_next; ++ } + err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial); + /* let g0 the true value of Pi*(2-x), g the computed value. + We have g = g0 + h with |h| <= |(1+u^2)-1|*g. +@@ -411,11 +421,16 @@ + if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g, + MPFR_PREC(gamma), rnd_mode))) + break; ++ ++ ziv_next: + MPFR_ZIV_NEXT (loop, realprec); + } ++ ++ end: + MPFR_ZIV_FREE (loop); + +- inex = mpfr_set (gamma, GammaTrial, rnd_mode); ++ if (inex == 0) ++ inex = mpfr_set (gamma, GammaTrial, rnd_mode); + MPFR_GROUP_CLEAR (group); + mpz_clear (fact); + +diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c +--- mpfr-3.1.0-a/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/src/lngamma.c 2012-05-07 18:52:45.000000000 +0000 +@@ -49,9 +49,72 @@ + mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */ + } + +-#ifndef IS_GAMMA ++#ifdef IS_GAMMA ++ ++/* This function is called in case of intermediate overflow/underflow. ++ The s1 and s2 arguments are temporary MPFR numbers, having the ++ working precision. If the result could be determined, then the ++ flags are updated via pexpo, y is set to the result, and the ++ (non-zero) ternary value is returned. Otherwise 0 is returned ++ in order to perform the next Ziv iteration. */ + static int +-unit_bit (mpfr_srcptr (x)) ++mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo, ++ mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd) ++{ ++ mpfr_t t1, t2; ++ int inex1, inex2, sign; ++ MPFR_BLOCK_DECL (flags1); ++ MPFR_BLOCK_DECL (flags2); ++ MPFR_GROUP_DECL (group); ++ ++ MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD)); ++ MPFR_ASSERTN (inex1 != 0); ++ /* s1 = RNDD(lngamma(x)), inexact */ ++ if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1))) ++ { ++ if (MPFR_SIGN (s1) > 0) ++ { ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW); ++ return mpfr_overflow (y, rnd, sign); ++ } ++ else ++ { ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW); ++ return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign); ++ } ++ } ++ ++ mpfr_set (s2, s1, MPFR_RNDN); /* exact */ ++ mpfr_nextabove (s2); /* v = RNDU(lngamma(z0)) */ ++ ++ if (sign < 0) ++ rnd = MPFR_INVERT_RND (rnd); /* since the result with be negated */ ++ MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2); ++ MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd)); ++ MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd)); ++ /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|, ++ t2 is the rounding with mode 'rnd' of an upper bound, thus if both ++ are equal, so is the wanted result. If t1 and t2 differ or the flags ++ differ, at some point of Ziv's loop they should agree. */ ++ if (mpfr_equal_p (t1, t2) && flags1 == flags2) ++ { ++ MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0)); ++ mpfr_set4 (y, t1, MPFR_RNDN, sign); /* exact */ ++ if (sign < 0) ++ inex1 = - inex1; ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1); ++ } ++ else ++ inex1 = 0; /* couldn't determine the result */ ++ MPFR_GROUP_CLEAR (group); ++ ++ return inex1; ++} ++ ++#else ++ ++static int ++unit_bit (mpfr_srcptr x) + { + mpfr_exp_t expo; + mpfr_prec_t prec; +@@ -75,6 +138,7 @@ + + return (x0 >> (prec % GMP_NUMB_BITS)) & 1; + } ++ + #endif + + /* lngamma(x) = log(gamma(x)). +@@ -99,12 +163,14 @@ + mpfr_t s, t, u, v, z; + unsigned long m, k, maxm; + mpz_t *INITIALIZED(B); /* variable B declared as initialized */ +- int inexact, compared; ++ int compared; ++ int inexact = 0; /* 0 means: result y not set yet */ + mpfr_exp_t err_s, err_t; + unsigned long Bm = 0; /* number of allocated B[] */ + unsigned long oldBm; + double d; + MPFR_SAVE_EXPO_DECL (expo); ++ MPFR_ZIV_DECL (loop); + + compared = mpfr_cmp_ui (z0, 1); + +@@ -122,7 +188,7 @@ + if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y)) + { + mpfr_t l, h, g; +- int ok, inex2; ++ int ok, inex1, inex2; + mpfr_prec_t prec = MPFR_PREC(y) + 14; + MPFR_ZIV_DECL (loop); + +@@ -157,14 +223,14 @@ + mpfr_sub (h, h, g, MPFR_RNDD); + mpfr_mul (g, z0, z0, MPFR_RNDU); + mpfr_add (h, h, g, MPFR_RNDU); +- inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd); ++ inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd); + inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd); + /* Caution: we not only need l = h, but both inexact flags should + agree. Indeed, one of the inexact flags might be zero. In that + case if we assume lngamma(z0) cannot be exact, the other flag + should be correct. We are conservative here and request that both + inexact flags agree. */ +- ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0; ++ ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0; + if (ok) + mpfr_set (y, h, rnd); /* exact */ + mpfr_clear (l); +@@ -172,8 +238,9 @@ + mpfr_clear (g); + if (ok) + { ++ MPFR_ZIV_FREE (loop); + MPFR_SAVE_EXPO_FREE (expo); +- return mpfr_check_range (y, inexact, rnd); ++ return mpfr_check_range (y, inex1, rnd); + } + /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2), + if x ~ 2^(-n), then we have a n-bit approximation, thus +@@ -205,9 +272,10 @@ + thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */ + + w = precy + MPFR_INT_CEIL_LOG2 (precy); ++ w += MPFR_INT_CEIL_LOG2 (w) + 14; ++ MPFR_ZIV_INIT (loop, w); + while (1) + { +- w += MPFR_INT_CEIL_LOG2 (w) + 14; + MPFR_ASSERTD(w >= 3); + mpfr_set_prec (s, w); + mpfr_set_prec (t, w); +@@ -288,7 +356,9 @@ + + (rnd == MPFR_RNDN))) + goto end; + } ++ MPFR_ZIV_NEXT (loop, w); + } ++ MPFR_ZIV_FREE (loop); + } + + /* now z0 > 1 */ +@@ -298,10 +368,10 @@ + /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w), + so there is a cancellation of ~log(w) in the argument reconstruction */ + w = precy + MPFR_INT_CEIL_LOG2 (precy); +- +- do ++ w += MPFR_INT_CEIL_LOG2 (w) + 13; ++ MPFR_ZIV_INIT (loop, w); ++ while (1) + { +- w += MPFR_INT_CEIL_LOG2 (w) + 13; + MPFR_ASSERTD (w >= 3); + + /* argument reduction: we compute gamma(z0 + k), where the series +@@ -441,6 +511,15 @@ + #ifdef IS_GAMMA + err_s = MPFR_GET_EXP(s); + mpfr_exp (s, s, MPFR_RNDN); ++ /* If s is +Inf, we compute exp(lngamma(z0)). */ ++ if (mpfr_inf_p (s)) ++ { ++ inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd); ++ if (inexact) ++ goto end0; ++ else ++ goto ziv_next; ++ } + /* before the exponential, we have s = s0 + h where + |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h). + For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus +@@ -480,16 +559,26 @@ + err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s); + err_s += 1 - MPFR_GET_EXP(s); + #endif ++ if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd))) ++ break; ++#ifdef IS_GAMMA ++ ziv_next: ++#endif ++ MPFR_ZIV_NEXT (loop, w); + } +- while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd))); + ++#ifdef IS_GAMMA ++ end0: ++#endif + oldBm = Bm; + while (Bm--) + mpz_clear (B[Bm]); + (*__gmp_free_func) (B, oldBm * sizeof (mpz_t)); + + end: +- inexact = mpfr_set (y, s, rnd); ++ if (inexact == 0) ++ inexact = mpfr_set (y, s, rnd); ++ MPFR_ZIV_FREE (loop); + + mpfr_clear (s); + mpfr_clear (t); +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-05-07 18:52:45.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p9" ++#define MPFR_VERSION_STRING "3.1.0-p10" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-05-07 18:52:45.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p9"; ++ return "3.1.0-p10"; + } +diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c +--- mpfr-3.1.0-a/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tgamma.c 2012-05-07 18:52:45.000000000 +0000 +@@ -838,6 +838,175 @@ + exit (1); + } + ++/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x)) ++ computing with a working precision p2. Assume that x is not an ++ integer <= 2. */ ++static void ++exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2) ++{ ++ mpfr_t yd, yu, zd, zu; ++ int inexd, inexu, sign; ++ int underflow = -1, overflow = -1; /* -1: we don't know */ ++ int got_underflow, got_overflow; ++ ++ if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0) ++ { ++ printf ("Warning! x is an integer <= 2 in exp_lgamma: "); ++ mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n'); ++ return; ++ } ++ mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0); ++ inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD); ++ mpfr_set (yu, yd, MPFR_RNDN); /* exact */ ++ if (inexd) ++ mpfr_nextabove (yu); ++ mpfr_clear_flags (); ++ mpfr_exp (yd, yd, MPFR_RNDD); ++ if (! mpfr_underflow_p ()) ++ underflow = 0; ++ if (mpfr_overflow_p ()) ++ overflow = 1; ++ mpfr_clear_flags (); ++ mpfr_exp (yu, yu, MPFR_RNDU); ++ if (mpfr_underflow_p ()) ++ underflow = 1; ++ if (! mpfr_overflow_p ()) ++ overflow = 0; ++ if (sign < 0) ++ { ++ mpfr_neg (yd, yd, MPFR_RNDN); /* exact */ ++ mpfr_neg (yu, yu, MPFR_RNDN); /* exact */ ++ mpfr_swap (yd, yu); ++ } ++ /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */ ++ mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0); ++ mpfr_clear_flags (); ++ inexd = mpfr_gamma (zd, x, MPFR_RNDD); /* zd <= Gamma(x) < yu */ ++ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); ++ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); ++ if (! mpfr_less_p (zd, yu) || inexd > 0 || ++ got_underflow != underflow || ++ got_overflow != overflow) ++ { ++ printf ("Error in exp_lgamma on x = "); ++ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); ++ printf ("yu = "); ++ mpfr_dump (yu); ++ printf ("zd = "); ++ mpfr_dump (zd); ++ printf ("got inexd = %d, expected <= 0\n", inexd); ++ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); ++ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); ++ exit (1); ++ } ++ mpfr_clear_flags (); ++ inexu = mpfr_gamma (zu, x, MPFR_RNDU); /* zu >= Gamma(x) > yd */ ++ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); ++ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); ++ if (! mpfr_greater_p (zu, yd) || inexu < 0 || ++ got_underflow != underflow || ++ got_overflow != overflow) ++ { ++ printf ("Error in exp_lgamma on x = "); ++ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); ++ printf ("yd = "); ++ mpfr_dump (yd); ++ printf ("zu = "); ++ mpfr_dump (zu); ++ printf ("got inexu = %d, expected >= 0\n", inexu); ++ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); ++ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); ++ exit (1); ++ } ++ if (mpfr_equal_p (zd, zu)) ++ { ++ if (inexd != 0 || inexu != 0) ++ { ++ printf ("Error in exp_lgamma on x = "); ++ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); ++ printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n", ++ inexd, inexu); ++ exit (1); ++ } ++ MPFR_ASSERTN (got_underflow == 0); ++ MPFR_ASSERTN (got_overflow == 0); ++ } ++ else if (inexd == 0 || inexu == 0) ++ { ++ printf ("Error in exp_lgamma on x = "); ++ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); ++ printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n", ++ inexd, inexu); ++ exit (1); ++ } ++ mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0); ++} ++ ++static void ++exp_lgamma_tests (void) ++{ ++ mpfr_t x; ++ mpfr_exp_t emin, emax; ++ int i; ++ ++ emin = mpfr_get_emin (); ++ emax = mpfr_get_emax (); ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ ++ mpfr_init2 (x, 96); ++ for (i = 3; i <= 8; i++) ++ { ++ mpfr_set_ui (x, i, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ mpfr_nextbelow (x); ++ exp_lgamma (x, 53, 64); ++ mpfr_nextabove (x); ++ mpfr_nextabove (x); ++ exp_lgamma (x, 53, 64); ++ } ++ mpfr_set_str (x, "1.7", 10, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ /* The following test gives a large positive result < +Inf */ ++ mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ /* Idem for a large negative result > -Inf */ ++ mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ /* The following two tests trigger an endless loop in r8186 ++ on 64-bit machines (64-bit exponent). The second one (due ++ to undetected overflow) is a direct consequence of the ++ first one, due to the call of Gamma(2-x) if x < 1. */ ++ mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ /* Similar tests (overflow threshold) for 32-bit machines. */ ++ mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN); ++ exp_lgamma (x, 12, 64); ++ mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN); ++ exp_lgamma (x, 12, 64); ++ /* The following test is an overflow on 32-bit and 64-bit machines. ++ Revision r8189 fails on 64-bit machines as the flag is unset. */ ++ mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN); ++ exp_lgamma (x, 53, 64); ++ /* On the following tests, with r8196, one gets an underflow on ++ 32-bit machines, while a normal result is expected (see FIXME ++ in gamma.c:382). */ ++ mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN); ++ exp_lgamma (x, 12, 64); /* failure on 32-bit machines */ ++ mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN); ++ exp_lgamma (x, 12, 64); /* failure on 64-bit machines */ ++ mpfr_clear (x); ++ ++ set_emin (emin); ++ set_emax (emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -852,6 +1021,7 @@ + test20071231 (); + test20100709 (); + test20120426 (); ++ exp_lgamma_tests (); + + data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); + diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index 05ef462..c725fc3 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -1,24 +1,24 @@ -# $Id$ +# $Id: PKGBUILD 163158 2012-07-08 09:32:14Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgbase=mplayer pkgname=('mplayer' 'mencoder') -pkgver=33805 -pkgrel=4 +pkgver=35014 +pkgrel=1 arch=('i686' 'x86_64') -makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' -'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' + 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop) -md5sums=('512a0309ba5979a41ae93b740f4592f4' +source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop) +md5sums=('d0785560e5e8eb02e089728ef4412eae' 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { - cd ${srcdir}/${pkgbase} + cd "$srcdir/$pkgbase" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -32,10 +32,10 @@ build() { --disable-esd \ --disable-mga \ --disable-ass-internal \ - --disable-pulse \ - --enable-xvmc \ + --disable-cdparanoia \ + --enable-radio \ --language=all \ - --confdir=/etc/mplayer + --confdir=/etc/mplayer [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak make @@ -46,27 +46,28 @@ package_mplayer() { install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libbluray') + 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') - cd ${srcdir}/${pkgbase} + cd "$srcdir/$pkgbase" - make DESTDIR=${pkgdir} install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ - install -dm755 ${pkgdir}/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf - rm -rf ${pkgdir}/usr/share/mplayer/font + make DESTDIR="$pkgdir" install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" + install -dm755 "$pkgdir/usr/share/mplayer/" + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" + rm -rf "$pkgdir/usr/share/mplayer/font" #desktop file FS#14770 - install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop - install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png + install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop" + install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" } package_mencoder() { pkgdesc="Free command line video decoding, encoding and filtering tool" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass') + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio') - cd ${srcdir}/${pkgbase} - make DESTDIR=${pkgdir} install-mencoder -# find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + cd "$srcdir/$pkgbase" + make DESTDIR="$pkgdir" install-mencoder install-mencoder-man + #find "$pkgdir/usr/share/man" -name 'mplayer.1.gz' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + rm -rf $pkgdir/usr/share/man } diff --git a/abs/core/mplayer/__changelog b/abs/core/mplayer/__changelog new file mode 100644 index 0000000..07977e4 --- /dev/null +++ b/abs/core/mplayer/__changelog @@ -0,0 +1,2 @@ +removed pulse +remove man pages from mencoder diff --git a/abs/core/mplayer/__changlog b/abs/core/mplayer/__changlog deleted file mode 100644 index fdf7dab..0000000 --- a/abs/core/mplayer/__changlog +++ /dev/null @@ -1 +0,0 @@ --disable pulse and remove libpulse deps in PKGBUILD diff --git a/abs/core/mtools/PKGBUILD b/abs/core/mtools/PKGBUILD index bba5d1d..ade751f 100644 --- a/abs/core/mtools/PKGBUILD +++ b/abs/core/mtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95239 2010-10-17 16:13:26Z giovanni $ +# $Id: PKGBUILD 143915 2011-11-30 20:36:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=mtools -pkgver=4.0.14 -pkgrel=1 +pkgver=4.0.17 +pkgrel=2 pkgdesc="A collection of utilities to access MS-DOS disks" arch=('i686' 'x86_64') url="http://www.gnu.org/software/mtools/" @@ -15,8 +15,8 @@ optdepends=('libx11: required by floppyd' 'libsm: required by floppyd') backup=('etc/mtools.conf') install=mtools.install -source=(http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2682a2db57b0144fa2ad6f8794320fb8') +source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2") +md5sums=('15571c615d8f75f5f6d294272f80c7fa') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,12 +26,12 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --sysconfdir=/etc - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j 1 DESTDIR="${pkgdir}" install || return 1 - install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" || return 1 + make -j 1 DESTDIR="${pkgdir}" install + install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" } diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD index 981a8f0..1740276 100755 --- a/abs/core/mythdb-initial/PKGBUILD +++ b/abs/core/mythdb-initial/PKGBUILD @@ -11,7 +11,7 @@ replaces=() backup=() install=mythdb.install source=(mc.sql permissions.sql custom.sql ) -arch=('i686') +arch=('i686' 'x86_64') build() { cd $startdir/src mkdir -p $startdir/pkg/data/database diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 21a084b..5f662d3 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mythinstall pkgver=3 pkgrel=26 pkgdesc="LinHES installer/systemconfig GUI." -arch=i686 +arch=('i686' 'x86_64') depends=('mythtv>=0.25') makedepends=('mythtv>=0.25') source=('install-ui.xml') diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD index f8b7cbb..bd4a40c 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -101,7 +101,7 @@ package_mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' 'python-lxml' ) + depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' 'python2-lxml' ) # replaces=('mythnetvision') cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision" make INSTALL_ROOT="${pkgdir}" install || return 1 diff --git a/abs/core/mythtv/stable-0.25/mythplugins/__changelog b/abs/core/mythtv/stable-0.25/mythplugins/__changelog new file mode 100644 index 0000000..48cdce8 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythplugins/__changelog @@ -0,0 +1 @@ +placeholder diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 53288a6..8d77484 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -14,9 +14,10 @@ url="http://www.mythtv.org/" license=('GPL') depends=('mysql-clients' 'qt' + 'qtwebkit' 'lame' 'lirc-utils' - 'ffmpeg-svn' + 'ffmpeg' 'fribidi' 'perl-soap-lite' 'perl-date-manip' @@ -29,7 +30,7 @@ depends=('mysql-clients' 'wget' 'libiec61883' 'mysql-python' - 'python-lxml' + 'python2-lxml' 'mesa' 'libxinerama' 'libxrandr' @@ -44,8 +45,9 @@ depends=('mysql-clients' 'glew' 'openssl' 'libxml2' - 'lsdvd' - 'dvdbackup') + 'lsdvd' + 'libass' + 'dvdbackup') #glew for gpu commerical flagging #openssl for roap diff --git a/abs/core/nano/PKGBUILD b/abs/core/nano/PKGBUILD index c58f7d1..29daecb 100644 --- a/abs/core/nano/PKGBUILD +++ b/abs/core/nano/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 142207 2011-11-06 08:47:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd <judd@archlinux.org> pkgname=nano pkgver=2.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') license=('GPL') diff --git a/abs/core/ncurses/ChangeLog b/abs/core/ncurses/ChangeLog deleted file mode 100644 index f52c19c..0000000 --- a/abs/core/ncurses/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2008-11-15 Allan McRae <allan@archlinux.org> - * ncurses-5.7-2 - * fix installation of non-wide charater libraries (FS#12124) - -2008-11-03 Allan McRae <allan@archlinux.org> - * ncurses-5.7-1 - * upstream update - * remove coverity patch (included upstream) - * enable makeflags diff --git a/abs/core/ncurses/PKGBUILD b/abs/core/ncurses/PKGBUILD index 017e900..b55c210 100644 --- a/abs/core/ncurses/PKGBUILD +++ b/abs/core/ncurses/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 77821 2010-04-18 09:29:42Z allan $ +# $Id: PKGBUILD 150103 2012-02-12 13:47:59Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses -pkgver=5.7 +pkgver=5.9 pkgrel=3 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ncurses/" license=('MIT') depends=('glibc') -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cce05daf61a64501ef6cd8da1f727ec6') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1' + '014ffdbbfec6d41a9a89d6cbe6434638') build() { cd ${srcdir}/ mkdir ncurses{,w}-build - + cd ${srcdir}/ncursesw-build ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} --enable-widec - make || return 1 + --with-install-prefix=${pkgdir} --enable-widec \ + --enable-pc-files + # add --enable-ext-colors with next soname bump + make # libncurses.so.5 for external binary support cd ${srcdir}/ncurses-build @@ -29,41 +32,34 @@ build() { ../${pkgname}-${pkgver}/configure --prefix=/usr \ --with-shared --with-normal --without-debug --without-ada \ --with-install-prefix=${pkgdir} $CONFIGFLAG - make || return 1 + make } package() { cd ${srcdir}/ncursesw-build make install - # move libraries needed for boot to /lib (we call tput in initscripts) - install -dm755 ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libncursesw.so.5* ${pkgdir}/lib - ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so - # Fool packages looking to link to non-wide-character ncurses libraries - for lib in curses ncurses form panel menu ; do \ - rm -f ${pkgdir}/usr/lib/lib${lib}.so ; \ - echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so ; \ - ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a ; \ + for lib in ncurses form panel menu; do + echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so + ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a done - ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a + ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a - # install tput to /bin - install -dm755 ${pkgdir}/bin/ - mv ${pkgdir}/usr/bin/tput ${pkgdir}/bin/tput + for lib in ncurses ncurses++ form panel menu; do + ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc + done # Some packages look for -lcurses during build - rm -f ${pkgdir}/usr/lib/libcursesw.so echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so - ln -sf libncurses.so ${pkgdir}/usr/lib/libcurses.so - ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a - ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a + ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so + ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a + ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a # non-widec compatibility library cd ${srcdir}/ncurses-build install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver} - ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 + ln -s libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 # install license, rip it from the readme cd ${srcdir}/${pkgname}-${pkgver} diff --git a/abs/core/ncurses/ncurses.install b/abs/core/ncurses/ncurses.install deleted file mode 100644 index 6b5a1dc..0000000 --- a/abs/core/ncurses/ncurses.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - echo ">> You can safely ignore any \"cannot open shared object\" errors you see above" -} - -op=$1 -shift -$op $* diff --git a/abs/core/net-tools/PKGBUILD b/abs/core/net-tools/PKGBUILD index da2a710..605620a 100644 --- a/abs/core/net-tools/PKGBUILD +++ b/abs/core/net-tools/PKGBUILD @@ -1,36 +1,43 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + pkgname=net-tools -pkgver=1.60 -pkgrel=22 +pkgver=1.60.20110819cvs +pkgrel=3 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) -license=('GPL') +license=('GPL2') url="http://www.tazenda.demon.co.uk/phil/net-tools" -groups=('base') depends=('glibc') -backup=('etc/conf.d/nisdomainname') -source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 - net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch - net-tools-1.60-miiioctl.patch nisdomainname.conf.d - net-tools-1.60-nameif.patch + +# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 +# use cvs checkout instead +source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 + net-tools-1.60-miiioctl.patch net-tools-1.60-nameif_strncpy.patch) -md5sums=('888774accab40217dde927e21979c165' '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' 'af3eef5d4837939f7858eec692aa4671' - '29a32617382fab1735acba4d920f1fcd' 'e66466b9304dac85eb42b32f1ec3b284') +options=(!makeflags) +install=net-tools.install +sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' + '654a96bc6575efb4a2e04b49de45d448d240eb6e' + '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') build() { - cd $startdir/src/$pkgname-$pkgver - export MAKEFLAGS="-j1" - patch -Np1 -i ../net-tools.patch || return 1 - patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch || return 1 - patch -Np1 -i ../net-tools-1.60-miiioctl.patch || return 1 - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np1 -i ${startdir}/src/net-tools-1.60-nameif.patch || return 1 - patch -Np1 -i ${startdir}/src/net-tools-1.60-nameif_strncpy.patch || return 1 - yes "" | make || return 1 - make BASEDIR=$startdir/pkg update - install -D -m644 ../nisdomainname.conf.d \ - $startdir/pkg/etc/conf.d/nisdomainname + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../net-tools-1.60-miiioctl.patch + patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + yes "" | make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make BASEDIR=$pkgdir update + + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 + + # hostname is provided by inetutils + rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm -rf "${pkgdir}"/usr/share/man/man1 } diff --git a/abs/core/net-tools/net-tools-1.60-miiioctl.patch b/abs/core/net-tools/net-tools-1.60-miiioctl.patch index 4859273..6c7f069 100644 --- a/abs/core/net-tools/net-tools-1.60-miiioctl.patch +++ b/abs/core/net-tools/net-tools-1.60-miiioctl.patch @@ -1,17 +1,17 @@ ---- net-tools-1.60/include/mii.h.bar Tue Jul 31 11:49:39 2001 -+++ net-tools-1.60/include/mii.h Tue Jul 31 11:49:33 2001 -@@ -11,11 +11,9 @@ - +--- net-tools-1.60.20110819cvs/include/mii.h 2011-08-19 10:14:00.743873299 +0200 ++++ net-tools-1.60.20110819cvs/include/mii.h.new 2011-08-19 10:28:26.500524160 +0200 +@@ -14,11 +14,9 @@ /* network interface ioctl's for MII commands */ #ifndef SIOCGMIIPHY + #warning "SIOCGMIIPHY is not defined by your kernel source" -#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ -#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ -#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ -+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ -+#define SIOCGMIIREG 0x8948 /* Read any PHY register */ -+#define SIOCSMIIREG 0x8949 /* Write any PHY register */ ++#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ ++#define SIOCGMIIREG 0x8948 /* Read any PHY register */ ++#define SIOCSMIIREG 0x8949 /* Write any PHY register */ #endif #include <linux/types.h> diff --git a/abs/core/net-tools/net-tools.install b/abs/core/net-tools/net-tools.install new file mode 100644 index 0000000..9eee9e5 --- /dev/null +++ b/abs/core/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} diff --git a/abs/core/net-tools/net-tools.patch b/abs/core/net-tools/net-tools.patch index 87e062e..8af2d21 100644 --- a/abs/core/net-tools/net-tools.patch +++ b/abs/core/net-tools/net-tools.patch @@ -1,25 +1,3 @@ -diff -Naur net-tools-1.60-orig/config.in net-tools-1.60/config.in ---- net-tools-1.60-orig/config.in 2000-05-21 07:32:12.000000000 -0700 -+++ net-tools-1.60/config.in 2004-05-31 12:36:00.000000000 -0700 -@@ -49,7 +49,7 @@ - * - bool 'UNIX protocol family' HAVE_AFUNIX y - bool 'INET (TCP/IP) protocol family' HAVE_AFINET y --bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n -+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y - bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y - bool 'Appletalk DDP protocol family' HAVE_AFATALK y - bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y -@@ -86,6 +86,6 @@ - * - * Other Features. - * --bool 'IP Masquerading support' HAVE_FW_MASQUERADE n --bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n --bool 'Build mii-tool' HAVE_MII n -+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y -+bool 'Build mii-tool' HAVE_MII y diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c --- net-tools-1.60-orig/mii-tool.c 2000-05-21 07:31:17.000000000 -0700 +++ net-tools-1.60/mii-tool.c 2004-05-31 12:35:21.000000000 -0700 diff --git a/abs/core/net-tools/nisdomainname.conf.d b/abs/core/net-tools/nisdomainname.conf.d deleted file mode 100644 index 6033ecf..0000000 --- a/abs/core/net-tools/nisdomainname.conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Set your NIS domain name here -NISDOMAINNAME="" - diff --git a/abs/core/nettle/PKGBUILD b/abs/core/nettle/PKGBUILD new file mode 100644 index 0000000..2e9f8c0 --- /dev/null +++ b/abs/core/nettle/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: bender02 at gmx dot com + +pkgname=nettle +pkgver=2.5 +pkgrel=1 +pkgdesc="A low-level cryptographic library" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +install=$pkgname.install +depends=('gmp') +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) +md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # remove static libs + rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a +} diff --git a/abs/core/m4/m4/m4.install b/abs/core/nettle/nettle.install index 88a9606..3d19b5f 100644 --- a/abs/core/m4/m4/m4.install +++ b/abs/core/nettle/nettle.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(m4.info m4.info-1 m4.info-2) +filelist=(nettle.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD index edc688b..a6ac7ff 100644 --- a/abs/core/nfs-utils/PKGBUILD +++ b/abs/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97759 2010-11-01 20:06:42Z tpowa $ +# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,14 +6,14 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.2 -pkgrel=6 +pkgver=1.2.6 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') -backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=1.3e' 'libgssglue') +backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common @@ -23,42 +23,65 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn exports idmapd.conf start-statd.patch - nfs-utils-1.1.2-kerberos-ac.patch - nfs-utils-1.1.6-no_libgssapi.patch - nfs-utils-1.1.6-heimdal_functions.patch + nfs nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch) + nfs-utils-1.1.4-no-exec.patch + rpc-gssd.service + rpc-mountd.service + rpc-svcgssd.service + rpc-idmapd.service + rpc-statd.service + nfsd.service + var-lib-nfs-rpc_pipefs.mount + proc-fs-nfsd.mount + blkmapd.service + nfs-utils.conf) install=nfs-utils.install +md5sums=('8be543ca270c2234ff18f8c8d35e0d37' + 'dd0d65fc6e8f422fa12520813098264b' + 'f73f197a16b02c3e248488ec35c4cf43' + 'e619f18354ff958ed624d05d08853d8f' + '9cef69bc686cc5dcac23fbb51450747d' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + 'e9144277a89a620d9bc80413158a7d27' + 'f5e7bba09a46c5c5d7007cac6eff9df5' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2' + '38855936dc55a5afe37d84edc0f11066' + '965311784d49a7d126d512cadbe91deb' + 'e05705d9ccccaeaeb1ecaee20adc05bc' + 'd7df7bc311fd95c5b80017dd1741570d' + '2e72ee082cba5d3ec6f51d2a105664da' + '5d33d2e754fd37280365b287603bac90' + '1cd65909fa0983047f3f06a3ab352401' + '02a34835aa077146a90eb7d191e612d0' + '8ffc2ebe932d29efe17d6f3f23d5b975' + '8ac484023d786766d287ccbe878ae4ba') build() { cd $srcdir/${pkgname}-${pkgver} - # Patches from gentoo for heimdal compatibility Bug 231396 - # http://bugs.gentoo.org/show_bug.cgi?id=231396 - patch -Np1 -i ../nfs-utils-1.1.2-kerberos-ac.patch - patch -Np1 -i ../nfs-utils-1.1.6-no_libgssapi.patch - patch -Np0 -i ../nfs-utils-1.1.6-heimdal_functions.patch patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - + #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch - rm -f config.guess config.sub ltmain.sh - autoreconf -i - - export GSSGLUE_CFLAGS='-I/usr/include/gssapi' - export GSSGLUE_LIBS='-lgssapi -ldl' + ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ + --without-tcp-wrappers --with-statedir=/var/lib/nfs \ + --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ + --enable-mountconfig - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc - - unset LDFLAGS - make || return 1 + make } package() { cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install || return 1 + # fix make install + mkdir -p $pkgdir/sbin + make DESTDIR=$pkgdir install + + # support python2 (FS#25120) + sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} # NFS & NFSv4 init scripts install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common @@ -68,20 +91,15 @@ package() { install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf + install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs + install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # systemd files + for i in ${srcdir}/*.{service,mount}; do + install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" + done + install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf # directories + mkdir "$pkgdir/"etc/exports.d mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs mkdir "$pkgdir/"var/lib/nfs/v4recovery } -md5sums=('dad92f64db3266c7757f71bb53ee8f35' - '1beda3420086f1801a7228c06d80fb4e' - 'f73f197a16b02c3e248488ec35c4cf43' - '5ae080f6117cef3140f02bc162bdc755' - 'b9b334414baec31b97f0431d9ecdcfb9' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e24f81a8c8657672e262c61235d34b4a' - 'f3be115d392d9f9bb0f056e8d4341a14' - '20c6fae1c771b9d8e91c4973f16372e3' - 'e6fd3a8acfe97970a53db1b902c34f45' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') diff --git a/abs/core/nfs-utils/blkmapd.service b/abs/core/nfs-utils/blkmapd.service new file mode 100644 index 0000000..16cb68b --- /dev/null +++ b/abs/core/nfs-utils/blkmapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=pNFS block layout mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +ExecStart=/usr/sbin/blkmapd + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/nfs b/abs/core/nfs-utils/nfs new file mode 100644 index 0000000..2d33cf3 --- /dev/null +++ b/abs/core/nfs-utils/nfs @@ -0,0 +1,40 @@ +# +# Optinal options passed to rquotad +RPCRQUOTADOPTS="" +# +# Optional arguments passed to in-kernel lockd +#LOCKDARG= +# TCP port rpc.lockd should listen on. +#LOCKD_TCPPORT=32803 +# UDP port rpc.lockd should listen on. +#LOCKD_UDPPORT=32769 +# +# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) +RPCNFSDARGS="" +# Number of nfs server processes to be started. +# The default is 8. +RPCNFSDCOUNT=8 +# Set V4 grace period in seconds +#NFSD_V4_GRACE=90 +# +# Optional arguments passed to rpc.mountd. See rpc.mountd(8) +RPCMOUNTDOPTS="" +# +# Optional arguments passed to rpc.statd. See rpc.statd(8) +STATDARG="" +# +# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) +RPCIDMAPDARGS="" +# +# Optional arguments passed to rpc.gssd. See rpc.gssd(8) +RPCGSSDARGS="" +# +# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) +RPCSVCGSSDARGS="" +# +# To enable RDMA support on the server by setting this to +# the port the server should listen on +#RDMA_PORT=20049 +# +# Optional arguments passed to blkmapd. See blkmapd(8) +BLKMAPDARGS="" diff --git a/abs/core/nfs-utils/nfs-common b/abs/core/nfs-utils/nfs-common index 9902ec4..7b16b4b 100644 --- a/abs/core/nfs-utils/nfs-common +++ b/abs/core/nfs-utils/nfs-common @@ -2,9 +2,6 @@ daemon_name=nfs-common -# daemon dependencies -DAEMON_DEPENDS=('rpcbind') - NEED_STATD= STATD_OPTS= NEED_IDMAPD= @@ -124,8 +121,7 @@ get_pid() { case "$1" in start) - ck_depends ${DAEMON_DEPENDS[@]} - + ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } rc=0 if [ "$NEED_STATD" = yes ]; then stat_busy "Starting $STATD_DAEMON_NAME daemon" @@ -161,6 +157,8 @@ case "$1" in if [ $rc -gt 0 ]; then stat_fail exit $rc + else + stat_done fi if [ "$NEED_IDMAPD" = yes ]; then @@ -314,4 +312,4 @@ case "$1" in echo "usage: $0 {start|stop|status|restart}" esac exit 0 -
\ No newline at end of file + diff --git a/abs/core/nfs-utils/nfs-server b/abs/core/nfs-utils/nfs-server index 9574cbc..6aa609d 100644 --- a/abs/core/nfs-utils/nfs-server +++ b/abs/core/nfs-utils/nfs-server @@ -2,9 +2,6 @@ daemon_name=nfs-server -# daemon dependencies -DAEMON_DEPENDS=('nfs-common') - NFSD_COUNT= NFSD_OPTS= NEED_SVCGSSD= @@ -85,8 +82,7 @@ get_pid() { case "$1" in start) - ck_depends ${DAEMON_DEPENDS[@]} - + ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } rc=0 stat_busy "Mounting nfsd filesystem" do_modprobe nfsd diff --git a/abs/core/nfs-utils/nfs-server.conf b/abs/core/nfs-utils/nfs-server.conf index cf75fb6..581e263 100644 --- a/abs/core/nfs-utils/nfs-server.conf +++ b/abs/core/nfs-utils/nfs-server.conf @@ -18,7 +18,7 @@ PROCNFSD_MOUNTOPTS="" # If you have a port-based firewall, you might want to set up # a fixed port here using the --port option. # See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2" +MOUNTD_OPTS="" # Do you want to start the svcgssd daemon? It is only required for Kerberos # exports. Valid alternatives are "yes" and "no"; the default is "no". diff --git a/abs/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/abs/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch deleted file mode 100644 index 4a5a138..0000000 --- a/abs/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4 ---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000 +0100 -+++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000 +0200 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e mit; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -- -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/abs/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/abs/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch deleted file mode 100644 index 7f6c7a7..0000000 --- a/abs/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c ---- utils/gssd/krb5_util.c 2009-04-20 19:32:50.000000000 +0200 -+++ utils/gssd/krb5_util.c 2009-04-20 20:57:31.000000000 +0200 -@@ -940,9 +940,37 @@ - { - krb5_error_code ret; - krb5_creds creds; -- krb5_cc_cursor cur; - int found = 0; - -+#ifdef HAVE_HEIMDAL -+ krb5_creds pattern; -+ krb5_realm *client_realm; -+ -+ krb5_cc_clear_mcred(&pattern); -+ -+ client_realm = krb5_princ_realm (context, principal); -+ -+ ret = krb5_make_principal (context, &pattern.server, -+ *client_realm, KRB5_TGS_NAME, *client_realm, -+ NULL); -+ if (ret) -+ krb5_err (context, 1, ret, "krb5_make_principal"); -+ pattern.client = principal; -+ -+ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); -+ krb5_free_principal (context, pattern.server); -+ if (ret) { -+ if (ret == KRB5_CC_END) -+ return 1; -+ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred"); -+ } -+ -+ found = creds.times.endtime > time(NULL); -+ -+ krb5_free_cred_contents (context, &creds); -+#else -+ krb5_cc_cursor cur; -+ - ret = krb5_cc_start_seq_get(context, ccache, &cur); - if (ret) - return 0; -@@ -962,6 +990,7 @@ - krb5_free_cred_contents(context, &creds); - } - krb5_cc_end_seq_get(context, ccache, &cur); -+#endif - - return found; - } -@@ -1008,6 +1037,9 @@ - } - krb5_free_principal(context, principal); - err_princ: -+#ifdef HAVE_HEIMDAL -+#define KRB5_TC_OPENCLOSE 0x00000001 -+#endif - krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE); - krb5_cc_close(context, ccache); - err_cache: -@@ -1262,7 +1294,7 @@ - if (context != NULL) { - origmsg = krb5_get_error_message(context, code); - msg = strdup(origmsg); -- krb5_free_error_message(context, origmsg); -+ krb5_free_error_string(context, origmsg); - } - #endif - if (msg != NULL) diff --git a/abs/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/abs/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch deleted file mode 100644 index 917136a..0000000 --- a/abs/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c -+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c -@@ -51,8 +51,10 @@ - #include "context.h" - - #ifndef OM_uint64 -+#ifndef GSSAPI_GSSAPI_H_ - typedef uint64_t OM_uint64; - #endif -+#endif - - static int - write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key) -@@ -177,10 +179,10 @@ - int retcode = 0; - - printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n"); -- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx, -+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, - 1, &return_ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - goto out_err; - } -@@ -204,9 +206,9 @@ - else - retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime); - -- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); -+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - printerr(0, "WARN: failed to free lucid sec context\n"); - } -Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c -@@ -332,10 +332,10 @@ - return -1; - } - -- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid, -+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, - num_enctypes, &enctypes); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_set_allowable_enctypes", -+ pgsserr("gss_krb5_set_allowable_enctypes", - maj_stat, min_stat, &krb5oid); - gss_release_cred(&min_stat, &credh); - return -1; diff --git a/abs/core/nfs-utils/nfs-utils.conf b/abs/core/nfs-utils/nfs-utils.conf new file mode 100644 index 0000000..33c97b8 --- /dev/null +++ b/abs/core/nfs-utils/nfs-utils.conf @@ -0,0 +1 @@ +nfs diff --git a/abs/core/nfs-utils/nfsd.service b/abs/core/nfs-utils/nfsd.service new file mode 100644 index 0000000..e5481c3 --- /dev/null +++ b/abs/core/nfs-utils/nfsd.service @@ -0,0 +1,16 @@ +[Unit] +Description=NFS server +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=oneshot +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/sbin/exportfs -a +ExecStop=/usr/sbin/rpc.nfsd 0 +ExecStopPost=/usr/sbin/exportfs -a -u +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/proc-fs-nfsd.mount b/abs/core/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 0000000..f8664a8 --- /dev/null +++ b/abs/core/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=RPC Pipe File System +DefaultDependencies=no + +[Mount] +What=sunrpc +Where=/proc/fs/nfsd +Type=rpc_pipefs diff --git a/abs/core/nfs-utils/rpc-gssd.service b/abs/core/nfs-utils/rpc-gssd.service new file mode 100644 index 0000000..446864d --- /dev/null +++ b/abs/core/nfs-utils/rpc-gssd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RPC GSS-API client-side daemon +After=rpcbind.service var-lib-nfs-rpc_pipefs.mount +Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-idmapd.service b/abs/core/nfs-utils/rpc-idmapd.service new file mode 100644 index 0000000..72cd26a --- /dev/null +++ b/abs/core/nfs-utils/rpc-idmapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFSv4 ID-name mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-mountd.service b/abs/core/nfs-utils/rpc-mountd.service new file mode 100644 index 0000000..edd8c85 --- /dev/null +++ b/abs/core/nfs-utils/rpc-mountd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFS Mount Daemon +After=rpcbind.service nfsd.service +Requires=rpcbind.service nfsd.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-statd.service b/abs/core/nfs-utils/rpc-statd.service new file mode 100644 index 0000000..983b404 --- /dev/null +++ b/abs/core/nfs-utils/rpc-statd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFSv2/3 Network Status Monitor Daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.statd $STATD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-svcgssd.service b/abs/core/nfs-utils/rpc-svcgssd.service new file mode 100644 index 0000000..8152e83 --- /dev/null +++ b/abs/core/nfs-utils/rpc-svcgssd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RPC GSS-API server-side daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/start-statd.patch b/abs/core/nfs-utils/start-statd.patch index 38c60a7..5d73b6e 100644 --- a/abs/core/nfs-utils/start-statd.patch +++ b/abs/core/nfs-utils/start-statd.patch @@ -1,7 +1,7 @@ --- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 +++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 @@ -1,9 +1,16 @@ --#!/bin/sh -p +-#!/bin/bash -p +#!/bin/sh + +# Original script provided by the NFS project @@ -10,7 +10,7 @@ # nfsmount calls this script when mounting a filesystem with locking # enabled, but when statd does not seem to be running (based on # /var/run/rpc.statd.pid). - # It should run run statd with whatever flags are apropriate for this + # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin -exec rpc.statd --no-notify diff --git a/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount new file mode 100644 index 0000000..4bd440f --- /dev/null +++ b/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount @@ -0,0 +1,7 @@ +[Unit] +Description=RPC pipe filesystem + +[Mount] +What=rpc_pipefs +Where=/var/lib/nfs/rpc_pipefs +Type=rpc_pipefs diff --git a/abs/core/nfsidmap/PKGBUILD b/abs/core/nfsidmap/PKGBUILD index c275f12..a402e5c 100644 --- a/abs/core/nfsidmap/PKGBUILD +++ b/abs/core/nfsidmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52311 2009-09-17 07:29:57Z allan $ +# $Id: PKGBUILD 136619 2011-08-31 07:19:40Z tpowa $ # Maintainer: # Contributor: Judd <jvinet@zeroflux.org> pkgname=nfsidmap -pkgver=0.23 +pkgver=0.24 pkgrel=3 pkgdesc="Library to help mapping IDs, mainly for NFSv4" arch=('i686' 'x86_64') @@ -12,20 +12,18 @@ depends=('glibc' 'libldap>=2.4.18') license=('custom:nfsidmap') options=(!libtool) source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) -md5sums=('28f3ece648c1dc5d25e8d623d55f8bd6') +md5sums=('d71a1ee9881d5b5814ff3ec41256937d') build() { cd $srcdir/lib$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd $srcdir/lib$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - # remove idmap manpage provided by nfs-utils! - rm $pkgdir/usr/share/man/man5/idmapd.conf.5 || return 1 + make DESTDIR=$pkgdir install + # install license - install -Dm644 COPYING \ - $pkgdir/usr/share/licenses/nfsidmap/LICENSE || return 1 + install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE } - diff --git a/abs/core/nilfs-utils/PKGBUILD b/abs/core/nilfs-utils/PKGBUILD new file mode 100644 index 0000000..f943a0d --- /dev/null +++ b/abs/core/nilfs-utils/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=nilfs-utils +pkgver=2.1.4 +pkgrel=1 +pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" +arch=('i686' 'x86_64') +url="http://www.nilfs.org/" +license=('GPL2' 'LGPL2.1') +backup=('etc/nilfs_cleanerd.conf') +depends=('util-linux') +options=(!libtool) +source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('e72f941f5041a057a81a1ce22e03497d') + +build() { + cd $pkgname-$pkgver + ./configure --enable-libmount + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install LDCONFIG=/bin/true +} diff --git a/abs/core/nmbscan/PKGBUILD b/abs/core/nmbscan/PKGBUILD index 8c03f9f..e1d0b73 100755 --- a/abs/core/nmbscan/PKGBUILD +++ b/abs/core/nmbscan/PKGBUILD @@ -6,11 +6,11 @@ arch=('i686' 'x86_64') license=('GPL' 'LGPL') url="http://nmbscan.g76r.eu/" #source=("http://knoppmyth.net/repo/source/nmbscan-1.2.5.tar.gz") -source=("${url}/down.php?file=${pkgname}-${pkgver}.tar.gz") +source=("${url}/down/${pkgname}-${pkgver}.tar.gz") build() { cd ${srcdir} - make || return 1 +# make || return 1 } package() { cd ${srcdir} diff --git a/abs/core/ntp/PKGBUILD b/abs/core/ntp/PKGBUILD index 290b6b2..3da7795 100644 --- a/abs/core/ntp/PKGBUILD +++ b/abs/core/ntp/PKGBUILD @@ -1,78 +1,64 @@ -# $Id$ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 162162 2012-06-22 12:59:21Z dreisner $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> pkgname=ntp -pkgver=4.2.6.p3 -_realver=4.2.6p3 -pkgrel=3 -pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync" -arch=(i686 x86_64) +pkgver=4.2.6.p5 +_realver=4.2.6p5 +pkgrel=7 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' license=('custom') -url="http://www.ntp.org/" -depends=('openssl' 'readline' 'libcap') +arch=('i686' 'x86_64') makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf') -options=('!emptydirs') -changelog=changelog -source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz - ntp-4.2.4-html2man.patch - ntp.conf - ntp-client.conf - ntpd - ntpdate) -md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723' - '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33' - 'bf20804e75656609e808ca21b53ea4aa' '99b49d763e5866f4f81c48d922c80b93') - -build() { - cd "$srcdir/$pkgname-$_realver" - # fix man page generation - patch -Np1 -i ../ntp-4.2.4-html2man.patch - # configure - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - # 4.2.6p3: aclocal too old, regenerate - rm -f aclocal.m4 - libtoolize --copy --force - ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linux-caps - # build - make -} - -package() { - cd "$srcdir/$pkgname-$_realver" +depends=('openssl' 'readline' 'libcap') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf' + 'logrotate.d' + 'ntpd.service') +sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' + '4e324e625c1f080b5c028be5092aa71adbf9bd99' + '01394b8a952f5edc85d19df8335eeac3980320f4' + 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' + '4537d1f58b299d463db5048129cb264511474b0b' + '4f76f7f9ffc8315ff9924f793f272d4f6939b816' + '81df5c4d51cb69bc29363625ff49e2bd388d1fa9') - # install - make DESTDIR="$pkgdir" install +install=install - # install conf files - install -d "$pkgdir/usr/share/ntp" - install -D -m644 conf/* "${pkgdir}/usr/share/ntp" +build() { + cd "${srcdir}/${pkgname}-${_realver}" - # install launch scripts - install -d "$pkgdir/etc/rc.d" - install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linuxcaps \ - # install man pages - cd html - ../scripts/html2man - sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] - install -d "$pkgdir"/usr/share/man/man{5,8} - install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" - install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" - mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" - cd .. + make +} - # install sample configs - install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" - install -D -m644 "$srcdir/ntp-client.conf" \ - "$pkgdir/etc/conf.d/ntp-client.conf" +package() { + cd "${srcdir}/${pkgname}-$_realver" - # create /var/lib/ntp - install -d "$pkgdir/var/lib/ntp" - touch "$pkgdir/var/lib/ntp/.placeholder" + make DESTDIR="${pkgdir}" install - install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d -o 87 "${pkgdir}"/var/lib/ntp + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf + install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd + install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd } diff --git a/abs/core/ntp/changelog b/abs/core/ntp/changelog deleted file mode 100644 index 528a078..0000000 --- a/abs/core/ntp/changelog +++ /dev/null @@ -1,25 +0,0 @@ -2011-04-03 andrea <andrea@archlinux.org> - - * ntp 4.2.6p3-3 - - Use 'ntpd -p' to get the PID in ntpd - - Don't run the ntp client in background in ntpdate - -2011-03-28 andrea <andrea@archlinux.org> - - * ntp 4.2.6p3-2 - - Improved daemon scripts - -2010-10-16 kevin <kevin@archlinux.org> - - * ntp 4.2.6p3 - - Implemented FS#18469, replace ntpdate with ntpd -q - - Removed LIBS - - Removed old IPv6 and nano patch - -2010-10-16 kevin <kevin@archlinux.org> - - * ntp 4.2.6p2 - - Added changelog - - Set LIBS to use librt since configure doesn't set it - - Convert PKGBUILD to build()/package() format - - removed "|| return 1" diff --git a/abs/core/ntp/install b/abs/core/ntp/install new file mode 100644 index 0000000..e6eddf8 --- /dev/null +++ b/abs/core/ntp/install @@ -0,0 +1,37 @@ +post_install() { + getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null + true +} + +post_upgrade() { + if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then + cat <<EOF + +==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf +==> If you made changes to the former, please update the latter. + +EOF + fi + if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then + cat <<EOF + +==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid +==> and the new rc.d script only takes the latter into account. +==> To stop your old ntpd process, please kill it manually. + +EOF + fi + if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then + post_install + fi + if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then + chown -R ntp /var/lib/ntp + fi +} + +post_remove() { + getent passwd ntp &>/dev/null && userdel ntp >/dev/null + getent group ntp &>/dev/null && groupdel ntp >/dev/null + true +} diff --git a/abs/core/ntp/logrotate.d b/abs/core/ntp/logrotate.d new file mode 100644 index 0000000..8a9f066 --- /dev/null +++ b/abs/core/ntp/logrotate.d @@ -0,0 +1,4 @@ +/var/log/ntp.log { + missingok + copytruncate +} diff --git a/abs/core/ntp/ntp-4.2.4-html2man.patch b/abs/core/ntp/ntp-4.2.4-html2man.patch deleted file mode 100644 index 333d452..0000000 --- a/abs/core/ntp/ntp-4.2.4-html2man.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200 -+++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100 -@@ -23,10 +23,10 @@ - 'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'], - 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], - 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], -- 'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'], -+ 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], - 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], - 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], -- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], -+ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'], - 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'], - 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'], - 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'], -@@ -34,17 +34,8 @@ - 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); - - # Disclaimer to go in SEE ALSO section of the man page --$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' . -- 'documentation pages, which are maintained in HTML format. These files are ' . -- 'included in the NTP source distribution. If you installed NTP from a binary ' . -- 'package, or it came pre-installed on your system, chances are the documentation ' . -- 'was also included in the usual place for your system. The HTML files are more ' . -- 'correct and complete than these man pages, which are provided for your reference ' . -- 'only.'; -- --# Disclaimer to go right at the top --$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' . -- 'incorrect. See the SEE ALSO section at the end of this file for more info'; -+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" . -+ "This file was automatically generated from HTML source.\n"; - - mkdir $MANDIR, 0777; - mkdir "$MANDIR/man8", 0777; -@@ -64,7 +55,8 @@ - $fileinfo = $manfiles{$filename}; - - $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!"; -- open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]") -+ $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]"; -+ open(MANOUT, ">$fileout") - || die "Can't open: $!"; - - $p->get_tag("title"); -@@ -73,7 +65,6 @@ - - # Setup man header - print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] . "\n"; -- print MANOUT ".UC 4\n"; - print MANOUT ".SH NAME\n"; - $pat = $fileinfo->[0]; - if ($name =~ /$pat/) { -@@ -81,10 +72,12 @@ - # Add the manpage name, if not in the HTML title already - print MANOUT "$fileinfo->[0] - "; - } -- print MANOUT "$name\n\n"; -- -- print MANOUT "$top_disclaimer\n"; -+ print MANOUT "$name\n.SH \\ \n\n"; - -+ @fontstack = (); -+ $deflevel = 0; -+ $pre = 0; -+ $ignore = 0; - # Now start scanning. We basically print everything after translating some tags. - # $token->[0] has "T", "S", "E" for Text, Start, End - # $token->[1] has the tag name, or text (for "T" case) -@@ -92,19 +85,37 @@ - while (my $token = $p->get_token) { - if($token->[0] eq "T") { - my $text = $token->[1]; -- if($tag) { -- $text =~ s/^[\n ]*//; -- $text =~ s/[\n ]*$/ /; -+ if (!$pre) { -+ if($tag) { -+ $text =~ s/^[\n\t ]*//; -+ } -+ $text =~ s/^[\n\t ][\n\t ]+$//; -+ $text =~ s/[\n\t ]+/ /g; -+ $text =~ s/ \;/ /g; -+ $text =~ s/>\;/>/g; -+ $text =~ s/<\;/</g; -+ $text =~ s/"\;/"/g; -+ $text =~ s/&\;/&/g; -+ $text =~ s/^\./\\[char46]/; - } -- $text =~ s/ \;/ /g; -- $text =~ s/^\./\\./; - print MANOUT "$text"; - $tag = 0; - } - if($token->[0] eq "S") { - if($token->[1] eq "h4") { - my $text = uc($p->get_trimmed_text("/h4")); -- print MANOUT ".SH $text\n"; -+ # ignore these two sections in ntpd.html -+ if ($filename eq "ntpd" && -+ ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) { -+ $ignore = 1; -+ close(MANOUT); -+ open(MANOUT, ">/dev/null"); -+ } elsif ($ignore) { -+ $ignore = 0; -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n\n.SH $text\n"; - } - if($token->[1] eq "tt") { - push @fontstack, "tt"; -@@ -118,22 +129,30 @@ - my $text = $p->get_trimmed_text("/address"); - print MANOUT "\n.SH AUTHOR\n$text\n"; - } -- if($token->[1] eq "dt") { -- $tmp = $deflevel-4; -- print MANOUT "\n.RS $tmp\n"; -+ if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) { -+ print MANOUT "\n.TP 8\n"; - $tag = 1; - } - if($token->[1] eq "dd") { -- print MANOUT "\n.RS $deflevel\n"; -+ print MANOUT "\n"; - $tag = 1; - } - if($token->[1] eq "dl") { -- $deflevel+=4; -+ $deflevel+=1; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0; -+ } -+ } -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; -+ } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.nf"; -+ $pre = 1; - } - } - elsif($token->[0] eq "E") { -- if($token->[1] eq "dd") { -- print MANOUT "\n.RE\n"; -+ if($token->[1] eq "h4") { - $tag = 1; - } - if($token->[1] eq "tt") { -@@ -157,15 +176,27 @@ - print MANOUT "$fontswitch"; - } - if($token->[1] eq "dl") { -- $deflevel-=4; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RE"; -+ } -+ print MANOUT "\n"; -+ $deflevel-=1; - } -- if($token->[1] eq "dt") { -- print MANOUT "\n.RE"; -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; - $tag = 1; - } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.fi"; -+ $pre = 0; -+ } - } - } -- print MANOUT ".SH SEE ALSO\n\n"; -+ if ($ignore) { -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n.SH SEE ALSO\n\n"; - print MANOUT "$fileinfo->[2]\n\n"; - print MANOUT "$seealso_disclaimer\n"; - close(MANOUT); diff --git a/abs/core/ntp/ntp.conf b/abs/core/ntp/ntp.conf index 7f888e4..a27b228 100644 --- a/abs/core/ntp/ntp.conf +++ b/abs/core/ntp/ntp.conf @@ -1,52 +1,23 @@ -# NOTES: -# - you should only have to update the server line below -# - if you start getting lines like 'restrict' and 'fudge' -# and you didnt add them, AND you run dhcpcd on your -# network interfaces, be sure to add '-Y -N' to the -# dhcpcd_ethX variables in /etc/conf.d/net - -# Name of the servers ntpd should sync with -# Please respect the access policy as stated by the responsible person. -#server ntp.example.tld iburst - -server pool.ntp.org - -## -# A list of available servers can be found here: -# http://www.pool.ntp.org/ -# http://www.pool.ntp.org/#use -# A good way to get servers for your machine is: -# netselect -s 3 pool.ntp.org -## - -#server ntplocal.example.com prefer -#server timeserver.example.org - -# Warning: Using default NTP settings will leave your NTP -# server accessible to all hosts on the Internet. - -# A default deny all (including localhost) policy -# To use this define restrictions for all servers and clients -#restrict default ignore -#restrict -6 default ignore - -# A more open policy, allow access but deny changing the configuration -restrict default nomodify nopeer -#restrict -6 default nomodify nopeer - -# Allow localhost -restrict 127.0.0.1 -#restrict -6 ::1 - - -# To allow machines within your network to synchronize -# their clocks with your server, but ensure they are -# not allowed to configure the server or used as peers -# to synchronize against, uncomment this line. +# With the default settings below, ntpd will only synchronize your clock. # -#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap - +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon + +# Associate to public NTP pool servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org + +# Only allow read-only access from localhost +restrict default noquery nopeer +restrict 127.0.0.1 +restrict ::1 -# you should not need to modify the following paths -driftfile /var/lib/ntp/ntp.drift +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/abs/core/ntp/ntpd b/abs/core/ntp/ntpd index 825efc1..480fa10 100644..100755 --- a/abs/core/ntp/ntpd +++ b/abs/core/ntp/ntpd @@ -2,51 +2,46 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf -PIDFILE="/var/run/ntpd/ntpd.pid" -PID=$(cat $PIDFILE 2> /dev/null) +unset PID +PIDFILE='/run/ntpd.pid' + +if [[ -r ${PIDFILE} ]]; then + read -r PID <"${PIDFILE}" + if [[ -n ${PID} && ! -d /proc/${PID} ]]; then + rm -f "${PIDFILE}" + unset PID + fi +fi case "$1" in - start) - stat_busy "Starting NTP Daemon" - [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null - if [ -z "$PID" ]; then - /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [ -n "$PID" ]; then - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm $PIDFILE &>/dev/null - rm_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting NTP Daemon" + if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then + add_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Daemon" + if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then + rm ${PIDFILE} + rm_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac diff --git a/abs/core/ntp/ntp-client.conf b/abs/core/ntp/ntpd.conf index e728db5..047961f 100644 --- a/abs/core/ntp/ntp-client.conf +++ b/abs/core/ntp/ntpd.conf @@ -1,5 +1,5 @@ # client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g" +NTP_CLIENT_OPTION="-g -u ntp" # arguments passed to ntpd when started -NTPD_ARGS="-g" +NTPD_ARGS="-g -u ntp" diff --git a/abs/core/ntp/ntpd.service b/abs/core/ntp/ntpd.service new file mode 100644 index 0000000..e0cbf87 --- /dev/null +++ b/abs/core/ntp/ntpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Network Time Service +After=network.target + +[Service] +Type=forking +PIDFile=/run/ntpd.pid +EnvironmentFile=/etc/conf.d/ntpd.conf +ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/ntp/ntpdate b/abs/core/ntp/ntpdate index 99508f4..a8e7467 100644..100755 --- a/abs/core/ntp/ntpdate +++ b/abs/core/ntp/ntpdate @@ -2,30 +2,28 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf case "$1" in - start) - stat_busy "Starting NTP Client" - /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ntpdate - stat_done - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting NTP Client" + if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then + add_daemon ntpdate + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Client" + rm_daemon ntpdate + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac - diff --git a/abs/core/openexr/PKGBUILD b/abs/core/openexr/PKGBUILD index c71f10b..6c55b9b 100644 --- a/abs/core/openexr/PKGBUILD +++ b/abs/core/openexr/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 17480 2008-10-30 16:52:29Z pierre $ +# $Id: PKGBUILD 149571 2012-02-08 14:46:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openexr -pkgver=1.6.1 -pkgrel=1 +pkgver=1.7.0 +pkgrel=2 +pkgdesc="An high dynamic-range image file format library" +url="http://www.openexr.com/" +arch=('i686' 'x86_64') +license=('BSD') depends=('zlib' 'ilmbase') -pkgdesc="openexr library for EXR images" -arch=(i686 x86_64) options=('!libtool') -license=('custom') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch') -url="http://www.openexr.org" -md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a') +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc43.patch') +md5sums=('27113284f7d26a58f853c346e0851d7a' + 'd91fae759053a70bcedcf02eb33ca4a2') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 -i $srcdir/gcc43.patch || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ${srcdir}/gcc43.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/openexr/gcc43.patch b/abs/core/openexr/gcc43.patch index 3624872..ab99eb9 100644 --- a/abs/core/openexr/gcc43.patch +++ b/abs/core/openexr/gcc43.patch @@ -1,22 +1,11 @@ -diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp ---- openexr-1.6.1/exrenvmap/main.cpp 2007-04-25 03:07:51.000000000 +0200 -+++ openexr-1.6.1.new/exrenvmap/main.cpp 2008-10-30 17:18:13.000000000 +0100 -@@ -45,6 +45,7 @@ - #include <iostream> - #include <exception> - #include <stdlib.h> -+#include <string.h> +--- exrenvmap/blurImage.cpp ++++ exrenvmap/blurImage.cpp +@@ -39,6 +39,8 @@ + // + //----------------------------------------------------------------------------- - using namespace Imf; - using namespace std; -diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp ---- openexr-1.6.1/exrmaketiled/main.cpp 2007-04-25 03:08:45.000000000 +0200 -+++ openexr-1.6.1.new/exrmaketiled/main.cpp 2008-10-30 17:18:40.000000000 +0100 -@@ -46,6 +46,7 @@ - #include <exception> - #include <string> - #include <stdlib.h> -+#include <string.h> ++#include <cstring> ++ + #include <blurImage.h> - using namespace Imf; - using namespace std; + #include <resizeImage.h> diff --git a/abs/core/openexr/openexr-gcc4.patch b/abs/core/openexr/openexr-gcc4.patch deleted file mode 100644 index ff63681..0000000 --- a/abs/core/openexr/openexr-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- OpenEXR-1.2.2/exrmaketiled/Image.h~ 2004-06-04 06:11:23.000000000 +0200 -+++ OpenEXR-1.2.2/exrmaketiled/Image.h 2005-07-15 07:02:08.000000000 +0200 -@@ -50,6 +50,8 @@ - #include <map> - - -+class Image; -+ - class ImageChannel - { - public: diff --git a/abs/core/openldap/PKGBUILD b/abs/core/openldap/PKGBUILD new file mode 100644 index 0000000..b7af129 --- /dev/null +++ b/abs/core/openldap/PKGBUILD @@ -0,0 +1,106 @@ +# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.31 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default slapd.service slapd.tmpfiles + ntlm.patch + mutex-end-of-struct-sigsegv.patch) +sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' + 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' + 'd89b8a533045123f1ab46c9c430cf132d58a20a4' + 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' + 'f86a82e35ebe15026980467c9dee4007e686b795' + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' + '694269dad78c7a806649c2d7f57bb7e503df3af1') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}"/ntlm.patch + patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch + + sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in + sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in + + LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" + ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --enable-ipv6 --enable-syslog --enable-local \ + --enable-bdb --enable-hdb \ + --enable-crypt --enable-dynamic \ + --with-threads --disable-wrappers \ + --without-fetch \ + --enable-spasswd --with-cyrus-sasl \ + --enable-overlays=mod --enable-modules=yes + make +} + +check() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make test +} + +package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" + depends=('libsasl' 'e2fsprogs') + backup=('etc/openldap/ldap.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in include libraries doc/man/man3 ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 + ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_openldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" + depends=("libldap>=${pkgver}" 'libltdl' 'util-linux') + backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') + options=('!libtool' 'emptydirs') + install=openldap.install + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8} ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + rm -r "${pkgdir}"/run + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + + chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + + install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap + install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service + install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/core/openldap/mutex-end-of-struct-sigsegv.patch b/abs/core/openldap/mutex-end-of-struct-sigsegv.patch new file mode 100644 index 0000000..e899638 --- /dev/null +++ b/abs/core/openldap/mutex-end-of-struct-sigsegv.patch @@ -0,0 +1,293 @@ + libraries/libldap/init.c | 8 ++- + libraries/libldap/ldap-int.h | 198 ++++++++++++++++++++++-------------------- + 2 files changed, 110 insertions(+), 96 deletions(-) + +diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c +index 39292d2..9d37e64 100644 +--- a/libraries/libldap/init.c ++++ b/libraries/libldap/init.c +@@ -36,7 +36,13 @@ + #include "lutil.h" + + struct ldapoptions ldap_int_global_options = +- { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG }; ++ { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE ++ LDAP_LDO_NULLARG ++ LDAP_LDO_CONNECTIONLESS_NULLARG ++ LDAP_LDO_TLS_NULLARG ++ LDAP_LDO_SASL_NULLARG ++ LDAP_LDO_GSSAPI_NULLARG ++ LDAP_LDO_MUTEX_NULLARG }; + + #define ATTR_NONE 0 + #define ATTR_BOOL 1 +diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h +index f8e6126..ac6c9e5 100644 +--- a/libraries/libldap/ldap-int.h ++++ b/libraries/libldap/ldap-int.h +@@ -185,29 +185,59 @@ struct ldapoptions { + #define LDAP_TRASHED_SESSION 0xFF + int ldo_debug; + +-#ifdef LDAP_R_COMPILE +- ldap_pvt_thread_mutex_t ldo_mutex; +-#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL +-#else +-#define LDAP_LDO_MUTEX_NULLARG +-#endif ++ ber_int_t ldo_version; ++ ber_int_t ldo_deref; ++ ber_int_t ldo_timelimit; ++ ber_int_t ldo_sizelimit; ++ ++ /* per API call timeout */ ++ struct timeval ldo_tm_api; ++ struct timeval ldo_tm_net; ++ ++ LDAPURLDesc *ldo_defludp; ++ int ldo_defport; ++ char* ldo_defbase; ++ char* ldo_defbinddn; /* bind dn */ ++ ++ /* ++ * Per connection tcp-keepalive settings (Linux only, ++ * ignored where unsupported) ++ */ ++ ber_int_t ldo_keepalive_idle; ++ ber_int_t ldo_keepalive_probes; ++ ber_int_t ldo_keepalive_interval; ++ ++ int ldo_refhoplimit; /* limit on referral nesting */ ++ ++ /* LDAPv3 server and client controls */ ++ LDAPControl **ldo_sctrls; ++ LDAPControl **ldo_cctrls; ++ ++ /* LDAP rebind callback function */ ++ LDAP_REBIND_PROC *ldo_rebind_proc; ++ void *ldo_rebind_params; ++ LDAP_NEXTREF_PROC *ldo_nextref_proc; ++ void *ldo_nextref_params; ++ LDAP_URLLIST_PROC *ldo_urllist_proc; ++ void *ldo_urllist_params; ++ ++ /* LDAP connection callback stack */ ++ ldaplist *ldo_conn_cbs; ++ ++ LDAP_BOOLEANS ldo_booleans; /* boolean options */ ++ ++#define LDAP_LDO_NULLARG ,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0 + + #ifdef LDAP_CONNECTIONLESS + #define LDAP_IS_UDP(ld) ((ld)->ld_options.ldo_is_udp) + void* ldo_peer; /* struct sockaddr* */ + char* ldo_cldapdn; + int ldo_is_udp; ++#define LDAP_LDO_CONNECTIONLESS_NULLARG ,0,0,0 ++#else ++#define LDAP_LDO_CONNECTIONLESS_NULLARG + #endif + +- /* per API call timeout */ +- struct timeval ldo_tm_api; +- struct timeval ldo_tm_net; +- +- ber_int_t ldo_version; +- ber_int_t ldo_deref; +- ber_int_t ldo_timelimit; +- ber_int_t ldo_sizelimit; +- + #ifdef HAVE_TLS + /* tls context */ + void *ldo_tls_ctx; +@@ -226,16 +256,12 @@ struct ldapoptions { + int ldo_tls_mode; + int ldo_tls_require_cert; + int ldo_tls_impl; +-#ifdef HAVE_OPENSSL_CRL + int ldo_tls_crlcheck; +-#endif ++#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0 ++#else ++#define LDAP_LDO_TLS_NULLARG + #endif + +- LDAPURLDesc *ldo_defludp; +- int ldo_defport; +- char* ldo_defbase; +- char* ldo_defbinddn; /* bind dn */ +- + #ifdef HAVE_CYRUS_SASL + char* ldo_def_sasl_mech; /* SASL Mechanism(s) */ + char* ldo_def_sasl_realm; /* SASL realm */ +@@ -244,6 +270,9 @@ struct ldapoptions { + + /* SASL Security Properties */ + struct sasl_security_properties ldo_sasl_secprops; ++#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0} ++#else ++#define LDAP_LDO_SASL_NULLARG + #endif + + #ifdef HAVE_GSSAPI +@@ -253,34 +282,17 @@ struct ldapoptions { + #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT 0x0001 + #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL 0x0002 + unsigned ldo_gssapi_options; ++#define LDAP_LDO_GSSAPI_NULLARG ,0,0 ++#else ++#define LDAP_LDO_GSSAPI_NULLARG + #endif + +- /* +- * Per connection tcp-keepalive settings (Linux only, +- * ignored where unsupported) +- */ +- ber_int_t ldo_keepalive_idle; +- ber_int_t ldo_keepalive_probes; +- ber_int_t ldo_keepalive_interval; +- +- int ldo_refhoplimit; /* limit on referral nesting */ +- +- /* LDAPv3 server and client controls */ +- LDAPControl **ldo_sctrls; +- LDAPControl **ldo_cctrls; +- +- /* LDAP rebind callback function */ +- LDAP_REBIND_PROC *ldo_rebind_proc; +- void *ldo_rebind_params; +- LDAP_NEXTREF_PROC *ldo_nextref_proc; +- void *ldo_nextref_params; +- LDAP_URLLIST_PROC *ldo_urllist_proc; +- void *ldo_urllist_params; +- +- /* LDAP connection callback stack */ +- ldaplist *ldo_conn_cbs; +- +- LDAP_BOOLEANS ldo_booleans; /* boolean options */ ++#ifdef LDAP_R_COMPILE ++ ldap_pvt_thread_mutex_t ldo_mutex; ++#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL ++#else ++#define LDAP_LDO_MUTEX_NULLARG ++#endif + }; + + +@@ -375,6 +387,46 @@ struct ldap_common { + Sockbuf *ldc_sb; /* socket descriptor & buffer */ + #define ld_sb ldc->ldc_sb + ++ unsigned short ldc_lberoptions; ++#define ld_lberoptions ldc->ldc_lberoptions ++ ++ /* protected by msgid_mutex */ ++ ber_len_t ldc_msgid; ++#define ld_msgid ldc->ldc_msgid ++ ++ /* do not mess with these */ ++ /* protected by req_mutex */ ++ LDAPRequest *ldc_requests; /* list of outstanding requests */ ++ /* protected by res_mutex */ ++ LDAPMessage *ldc_responses; /* list of outstanding responses */ ++#define ld_requests ldc->ldc_requests ++#define ld_responses ldc->ldc_responses ++ ++ /* protected by abandon_mutex */ ++ ber_len_t ldc_nabandoned; ++ ber_int_t *ldc_abandoned; /* array of abandoned requests */ ++#define ld_nabandoned ldc->ldc_nabandoned ++#define ld_abandoned ldc->ldc_abandoned ++ ++ /* unused by libldap */ ++ LDAPCache *ldc_cache; /* non-null if cache is initialized */ ++#define ld_cache ldc->ldc_cache ++ ++ /* do not mess with the rest though */ ++ ++ /* protected by conn_mutex */ ++ LDAPConn *ldc_defconn; /* default connection */ ++#define ld_defconn ldc->ldc_defconn ++ LDAPConn *ldc_conns; /* list of server connections */ ++#define ld_conns ldc->ldc_conns ++ void *ldc_selectinfo;/* platform specifics for select */ ++#define ld_selectinfo ldc->ldc_selectinfo ++ ++ /* ldap_common refcnt - free only if 0 */ ++ /* protected by ldc_mutex */ ++ unsigned int ldc_refcnt; ++#define ld_ldcrefcnt ldc->ldc_refcnt ++ + /* protected by ldo_mutex */ + struct ldapoptions ldc_options; + #define ld_options ldc->ldc_options +@@ -403,66 +455,22 @@ struct ldap_common { + #define ld_urllist_params ld_options.ldo_urllist_params + + #define ld_version ld_options.ldo_version +-#ifdef LDAP_R_COMPILE +-#define ld_ldopts_mutex ld_options.ldo_mutex +-#endif +- +- unsigned short ldc_lberoptions; +-#define ld_lberoptions ldc->ldc_lberoptions +- +- /* protected by msgid_mutex */ +- ber_len_t ldc_msgid; +-#define ld_msgid ldc->ldc_msgid +- +- /* do not mess with these */ +- /* protected by req_mutex */ +- LDAPRequest *ldc_requests; /* list of outstanding requests */ +- /* protected by res_mutex */ +- LDAPMessage *ldc_responses; /* list of outstanding responses */ +-#define ld_requests ldc->ldc_requests +-#define ld_responses ldc->ldc_responses + + #ifdef LDAP_R_COMPILE ++ ldap_pvt_thread_mutex_t ldc_mutex; + ldap_pvt_thread_mutex_t ldc_msgid_mutex; + ldap_pvt_thread_mutex_t ldc_conn_mutex; + ldap_pvt_thread_mutex_t ldc_req_mutex; + ldap_pvt_thread_mutex_t ldc_res_mutex; + ldap_pvt_thread_mutex_t ldc_abandon_mutex; ++#define ld_ldopts_mutex ld_options.ldo_mutex ++#define ld_ldcmutex ldc->ldc_mutex + #define ld_msgid_mutex ldc->ldc_msgid_mutex + #define ld_conn_mutex ldc->ldc_conn_mutex + #define ld_req_mutex ldc->ldc_req_mutex + #define ld_res_mutex ldc->ldc_res_mutex + #define ld_abandon_mutex ldc->ldc_abandon_mutex + #endif +- +- /* protected by abandon_mutex */ +- ber_len_t ldc_nabandoned; +- ber_int_t *ldc_abandoned; /* array of abandoned requests */ +-#define ld_nabandoned ldc->ldc_nabandoned +-#define ld_abandoned ldc->ldc_abandoned +- +- /* unused by libldap */ +- LDAPCache *ldc_cache; /* non-null if cache is initialized */ +-#define ld_cache ldc->ldc_cache +- +- /* do not mess with the rest though */ +- +- /* protected by conn_mutex */ +- LDAPConn *ldc_defconn; /* default connection */ +-#define ld_defconn ldc->ldc_defconn +- LDAPConn *ldc_conns; /* list of server connections */ +-#define ld_conns ldc->ldc_conns +- void *ldc_selectinfo;/* platform specifics for select */ +-#define ld_selectinfo ldc->ldc_selectinfo +- +- /* ldap_common refcnt - free only if 0 */ +-#ifdef LDAP_R_COMPILE +- ldap_pvt_thread_mutex_t ldc_mutex; +-#define ld_ldcmutex ldc->ldc_mutex +-#endif +- /* protected by ldc_mutex */ +- unsigned int ldc_refcnt; +-#define ld_ldcrefcnt ldc->ldc_refcnt + }; + + struct ldap { diff --git a/abs/core/libldap/ntlm.patch b/abs/core/openldap/ntlm.patch index a4fe4d4..6804b61 100644 --- a/abs/core/libldap/ntlm.patch +++ b/abs/core/openldap/ntlm.patch @@ -194,7 +194,7 @@ Index: trunk/libraries/libldap/Makefile.in tls2.c tls_o.c tls_g.c tls_m.c \ - turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ + turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c + assertion.c deref.c ldif.c fetch.c OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ @@ -40,7 +40,7 @@ @@ -203,7 +203,7 @@ Index: trunk/libraries/libldap/Makefile.in tls2.lo tls_o.lo tls_g.lo tls_m.lo \ - turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ + turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo + assertion.lo deref.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include Index: trunk/libraries/libldap_r/Makefile.in @@ -216,7 +216,7 @@ Index: trunk/libraries/libldap_r/Makefile.in tls2.c tls_o.c tls_g.c tls_m.c \ - turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ + turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c + assertion.c deref.c ldif.c fetch.c SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ @@ -47,7 +47,7 @@ @@ -225,6 +225,6 @@ Index: trunk/libraries/libldap_r/Makefile.in tls2.lo tls_o.lo tls_g.lo tls_m.lo \ - turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ + turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo + assertion.lo deref.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include diff --git a/abs/core/openldap/openldap.install b/abs/core/openldap/openldap.install new file mode 100644 index 0000000..cf3cb9f --- /dev/null +++ b/abs/core/openldap/openldap.install @@ -0,0 +1,20 @@ +post_install(){ + groupadd -g 439 ldap &>/dev/null + useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_upgrade(){ + getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null + getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_remove(){ + if getent passwd ldap >/dev/null 2>&1; then + userdel ldap + fi + if getent group ldap >/dev/null 2>&1; then + groupdel ldap + fi +} diff --git a/abs/core/openldap/slapd b/abs/core/openldap/slapd new file mode 100755 index 0000000..4f212da --- /dev/null +++ b/abs/core/openldap/slapd @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS + else + /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/openldap/slapd.pid + rm -f /run/openldap/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/core/openldap/slapd.default b/abs/core/openldap/slapd.default new file mode 100644 index 0000000..72ae2a6 --- /dev/null +++ b/abs/core/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/abs/core/openldap/slapd.service b/abs/core/openldap/slapd.service new file mode 100644 index 0000000..d8baa57 --- /dev/null +++ b/abs/core/openldap/slapd.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenLDAP server daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/slapd + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/openldap/slapd.tmpfiles b/abs/core/openldap/slapd.tmpfiles new file mode 100644 index 0000000..5f63bd6 --- /dev/null +++ b/abs/core/openldap/slapd.tmpfiles @@ -0,0 +1 @@ +D /run/openldap 0750 ldap ldap - diff --git a/abs/core/openssh/PKGBUILD b/abs/core/openssh/PKGBUILD index 36a82bd..fced1e1 100644 --- a/abs/core/openssh/PKGBUILD +++ b/abs/core/openssh/PKGBUILD @@ -1,64 +1,96 @@ -# $Id: PKGBUILD 89278 2010-08-30 21:38:00Z thomas $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=5.6p1 -pkgrel=1 -pkgdesc='A Secure SHell server/client' +pkgver=6.0p1 +pkgrel=3 +pkgdesc='Free version of the SSH connectivity tools' +url='http://www.openssh.org/portable.html' +license=('custom:BSD') arch=('i686' 'x86_64') -license=('custom') -url="http://www.openssh.org/portable.html" -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') -depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal') +depends=('krb5' 'openssl' 'libedit' 'ldns') +optdepends=('xorg-xauth: X11 forwarding' + 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd' 'sshd.confd' 'sshd.pam') -md5sums=('e6ee52e47c768bf0ec42a232b5d18fb0' - '17b1b1bf0f578a55945ee204bd4462af' - 'e2cea70ac13af7e63d40eb04415eacd5' - '1c7c2ea8734ec7e3ca58d820634dc73a') + 'sshd.close-sessions' + 'sshdgenkeys.service' + 'sshd@.service' + 'sshd.service' + 'sshd.socket' + 'tmpfiles.d' + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' + '954bf1660aa32620c37034320877f4511b767ccb' + '6c71de2c2ca9622aa8e863acd94b135555e11125' + 'bd6eae36c7ef9efb7147778baad7858b81f2d660' + '83a257b8f6a62237383262cb0e2583e5609ddac0' + 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' + 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '659e3ee95c269014783ff8b318c6f50bf7496fbd' + 'ed36e3a522f619ff6b13e253526596e4cca11e9f') + +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ + --with-pam \ + --with-privsep-user=nobody \ + --with-kerberos5=/usr \ + --with-xauth=/usr/bin/xauth \ + --with-mantype=man \ + --with-md5-passwords \ + --with-pid-dir=/run \ + + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" - #NOTE we disable-strip so that makepkg can decide whether to strip or not - ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ - --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ - --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ - --disable-strip - make || return 1 + # The connect.sh test must be run by a user with a decent login shell; + # chroot builds use nobody with /bin/false. + make tests || true } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -Dm755 ${srcdir}/sshd ${pkgdir}/etc/rc.d/sshd + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE - install -Dm644 ${srcdir}/sshd.pam ${pkgdir}/etc/pam.d/sshd - install -Dm644 ${srcdir}/sshd.confd ${pkgdir}/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - rm ${pkgdir}/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1.gz + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf - #additional contrib scripts that we like - install -Dm755 contrib/findssl.sh ${pkgdir}/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id ${pkgdir}/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 ${pkgdir}/usr/share/man/man1/ssh-copy-id.1 + install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - # sshd_config - sed -i \ - -e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \ - -e 's|^#UsePAM no|UsePAM yes|g' \ - -e 's|^#ChallengeResponseAuthentication yes|ChallengeResponseAuthentication no|g' \ - ${pkgdir}/etc/ssh/sshd_config - echo "HashKnownHosts yes" >> ${pkgdir}/etc/ssh/ssh_config - echo "StrictHostKeyChecking ask" >> ${pkgdir}/etc/ssh/ssh_config + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - #ssh_config - sed -i \ - -e 's|^# Host \*|Host *|g' \ - ${pkgdir}/etc/ssh/ssh_config + sed \ + -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + -i "${pkgdir}"/etc/ssh/sshd_config } diff --git a/abs/core/openssh/sshd b/abs/core/openssh/sshd index bc0e453..4bf4780 100755 --- a/abs/core/openssh/sshd +++ b/abs/core/openssh/sshd @@ -4,38 +4,42 @@ . /etc/rc.d/functions . /etc/conf.d/sshd -PID="$(cat /var/run/sshd.pid 2>/dev/null)" +PIDFILE=/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + case "$1" in - start) - stat_busy "Starting Secure Shell Daemon" - [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } - [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } - [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } - [ -d /var/empty ] || mkdir -p /var/empty - [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy "Stopping Secure Shell Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy 'Starting Secure Shell Daemon' + /usr/bin/ssh-keygen -A + [[ -d /var/empty ]] || mkdir -p /var/empty + [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy 'Stopping Secure Shell Daemon' + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/abs/core/openssh/sshd.close-sessions b/abs/core/openssh/sshd.close-sessions new file mode 100644 index 0000000..be2a709 --- /dev/null +++ b/abs/core/openssh/sshd.close-sessions @@ -0,0 +1,17 @@ +# Close sshd sessions before shutting down the network; see FS#17389. + +sshd_close_sessions () { + if ck_daemon sshd; then + return + fi + /etc/rc.d/sshd stop + stat_busy "Stopping Secure Shell Sessions" + for i in $(pgrep sshd); do + if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then + kill $i + fi + done &>/dev/null + stat_done +} + +add_hook shutdown_start sshd_close_sessions diff --git a/abs/core/openssh/sshd.pam b/abs/core/openssh/sshd.pam index dc70815..aeef8be 100644 --- a/abs/core/openssh/sshd.pam +++ b/abs/core/openssh/sshd.pam @@ -1,10 +1,13 @@ #%PAM-1.0 #auth required pam_securetty.so #Disable remote root auth required pam_unix.so -auth required pam_nologin.so auth required pam_env.so +account required pam_nologin.so account required pam_unix.so account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +session optional pam_loginuid.so +-session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/abs/core/openssh/sshd.service b/abs/core/openssh/sshd.service new file mode 100644 index 0000000..7c8f883 --- /dev/null +++ b/abs/core/openssh/sshd.service @@ -0,0 +1,19 @@ +[Unit] +Description=OpenSSH Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=/usr/sbin/sshd -D +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target +Also=sshdgenkeys.service + +# Note that this is the service file for running a single SSH server for all +# incoming connections, suitable only for systems with a large amount of SSH +# traffic. In almost all other cases it is a better idea to use sshd.socket + +# sshd@.service (i.e. the on-demand spawning version for one instance per +# connection). diff --git a/abs/core/openssh/sshd.socket b/abs/core/openssh/sshd.socket new file mode 100644 index 0000000..6a67bfe --- /dev/null +++ b/abs/core/openssh/sshd.socket @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/abs/core/openssh/sshd@.service b/abs/core/openssh/sshd@.service new file mode 100644 index 0000000..2fd9b08 --- /dev/null +++ b/abs/core/openssh/sshd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +StandardInput=socket +StandardError=syslog diff --git a/abs/core/openssh/sshdgenkeys.service b/abs/core/openssh/sshdgenkeys.service new file mode 100644 index 0000000..47c1c3f --- /dev/null +++ b/abs/core/openssh/sshdgenkeys.service @@ -0,0 +1,18 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/openssh/tmpfiles.d b/abs/core/openssh/tmpfiles.d new file mode 100644 index 0000000..7c5b261 --- /dev/null +++ b/abs/core/openssh/tmpfiles.d @@ -0,0 +1 @@ +d /var/empty 0755 root root - diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 9853a57..29fd885 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 81714 2010-06-02 11:00:36Z pierre $ +# $Id: PKGBUILD 158833 2012-05-11 23:33:03Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.0a +_ver=1.0.1c # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=2 +#pkgver=$_ver +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -15,38 +16,53 @@ optdepends=('ca-certificates') options=('!makeflags') backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" + "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'fix-manpages.patch' 'no-rpath.patch' 'ca-dir.patch') -md5sums=('e3873edfffc783624cfbdb65e2249cbd' - 'f540cd9e0e3047d589d0581fe7a2d0f2' +md5sums=('ae412727c8c15b67880aef7bd2999b2e' + 'a3d90bc42253def61cd1c4237f1ce5f7' + '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - build() { cd $srcdir/$pkgname-$_ver + if [ "${CARCH}" == 'x86_64' ]; then + openssltarget='linux-x86_64' + optflags='enable-ec_nistp_64_gcc_128' + elif [ "${CARCH}" == 'i686' ]; then + openssltarget='linux-elf' + optflags='' + fi + # avoid conflicts with other man pages # see http://www.linuxfromscratch.org/patches/downloads/openssl/ - patch -p0 -i $srcdir/fix-manpages.patch || return 1 + patch -p1 -i $srcdir/fix-manpages.patch # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch || return 1 + patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch || return 1 + patch -p0 -i $srcdir/ca-dir.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 -Wa,--noexecstack || return 1 + # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared zlib enable-md2 ${optflags} \ + "${openssltarget}" \ + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT - make || return 1 + make depend + make +} +check() { + cd $srcdir/$pkgname-$_ver # the test fails due to missing write permissions in /etc/ssl # revert this patch for make test - #patch -p0 -R -i $srcdir/ca-dir.patch - #make test || return 1 - #patch -p0 -i $srcdir/ca-dir.patch + patch -p0 -R -i $srcdir/ca-dir.patch + make test + patch -p0 -i $srcdir/ca-dir.patch } package() { diff --git a/abs/core/openssl/fix-manpages.patch b/abs/core/openssl/fix-manpages.patch index e043081..0a300f3 100644 --- a/abs/core/openssl/fix-manpages.patch +++ b/abs/core/openssl/fix-manpages.patch @@ -1,5 +1,18 @@ ---- crypto/rand/md_rand.c 2009-01-03 10:25:32.000000000 +0100 -+++ crypto/rand/md_rand.c 2010-04-01 00:45:00.746327192 +0200 +Submitted By: Robert Connolly <robert at linuxfromscratch dot org> +Date: 2005-11-13 +Initial Package Version: 0.9.8a +Upstream Status: Submitted upstream +Origin: Anderson Lizardo +Description: This patch fixes conflicts between man pages + installed by OpenSSL and those found on other + packages (particulary Shadow, Perl, and + Man-pages). It also fixes syntax errors on some + POD files that generates slightly broken man + pages. Rediffed for 1.0.0a by Ken Moffat + +diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c +--- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000 ++++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100 @@ -196,7 +196,7 @@ int do_not_lock; @@ -18,8 +31,9 @@ * * For each group of 10 bytes (or less), we do the following: * ---- doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/apps/openssl-passwd.pod 2010-04-01 00:45:00.796327220 +0200 +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod +--- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100 @@ -0,0 +1,82 @@ +=pod + @@ -103,8 +117,9 @@ +B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. + +=cut ---- doc/apps/openssl.pod 2010-01-21 19:46:28.000000000 +0100 -+++ doc/apps/openssl.pod 2010-04-01 00:45:00.796327220 +0200 +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod +--- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000 ++++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100 @@ -163,7 +163,7 @@ Online Certificate Status Protocol utility. @@ -123,8 +138,9 @@ L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, ---- doc/apps/passwd.pod 2002-10-04 14:59:00.000000000 +0200 -+++ doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod +--- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -=pod - @@ -208,8 +224,9 @@ -B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. - -=cut ---- doc/crypto/BN_generate_prime.pod 2003-01-13 14:18:22.000000000 +0100 -+++ doc/crypto/BN_generate_prime.pod 2010-04-01 00:45:00.824035190 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100 @@ -90,7 +90,7 @@ =head1 SEE ALSO @@ -219,8 +236,9 @@ =head1 HISTORY ---- doc/crypto/bn.pod 2008-07-03 21:59:24.000000000 +0200 -+++ doc/crypto/bn.pod 2010-04-01 00:45:01.022993777 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod +--- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100 @@ -167,7 +167,7 @@ =head1 SEE ALSO @@ -230,8 +248,9 @@ L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>, L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>, L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>, ---- doc/crypto/BN_rand.pod 2002-09-25 15:33:26.000000000 +0200 -+++ doc/crypto/BN_rand.pod 2010-04-01 00:45:00.824035190 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100 @@ -45,7 +45,7 @@ =head1 SEE ALSO @@ -241,8 +260,9 @@ L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)> =head1 HISTORY ---- doc/crypto/CONF_modules_free.pod 2006-12-21 22:13:27.000000000 +0100 -+++ doc/crypto/CONF_modules_free.pod 2010-04-01 00:45:00.827162198 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100 @@ -37,7 +37,7 @@ =head1 SEE ALSO @@ -252,8 +272,9 @@ =head1 HISTORY ---- doc/crypto/CONF_modules_load_file.pod 2004-03-02 14:31:32.000000000 +0100 -+++ doc/crypto/CONF_modules_load_file.pod 2010-04-01 00:45:00.833827289 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100 @@ -51,7 +51,7 @@ =head1 SEE ALSO @@ -263,8 +284,9 @@ =head1 HISTORY ---- doc/crypto/crypto.pod 2002-10-06 14:59:25.000000000 +0200 -+++ doc/crypto/crypto.pod 2010-04-01 00:45:01.029660428 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod +--- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100 @@ -46,7 +46,7 @@ =item AUXILIARY FUNCTIONS @@ -274,8 +296,9 @@ L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> =item INPUT/OUTPUT, DATA ENCODING ---- doc/crypto/des.pod 2003-10-01 17:02:45.000000000 +0200 -+++ doc/crypto/des.pod 2010-04-01 00:45:01.036327160 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod +--- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100 @@ -115,7 +115,7 @@ the key; it is used to speed the encryption process. @@ -294,8 +317,9 @@ =head1 HISTORY ---- doc/crypto/DH_generate_key.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DH_generate_key.pod 2010-04-01 00:45:00.840494142 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 @@ -40,7 +40,7 @@ =head1 SEE ALSO @@ -305,8 +329,9 @@ =head1 HISTORY ---- doc/crypto/DH_generate_parameters.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DH_generate_parameters.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -316,8 +341,9 @@ L<DH_free(3)|DH_free(3)> =head1 HISTORY ---- doc/crypto/dh.pod 2002-08-05 18:27:01.000000000 +0200 -+++ doc/crypto/dh.pod 2010-04-01 00:45:01.036327160 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod +--- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100 @@ -67,8 +67,8 @@ =head1 SEE ALSO @@ -329,8 +355,9 @@ L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, L<DH_generate_parameters(3)|DH_generate_parameters(3)>, ---- doc/crypto/DSA_do_sign.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_do_sign.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100 @@ -36,7 +36,7 @@ =head1 SEE ALSO @@ -340,8 +367,9 @@ L<DSA_SIG_new(3)|DSA_SIG_new(3)>, L<DSA_sign(3)|DSA_sign(3)> ---- doc/crypto/DSA_generate_key.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_generate_key.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 @@ -24,7 +24,7 @@ =head1 SEE ALSO @@ -351,8 +379,9 @@ L<DSA_generate_parameters(3)|DSA_generate_parameters(3)> =head1 HISTORY ---- doc/crypto/DSA_generate_parameters.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_generate_parameters.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 @@ -90,7 +90,7 @@ =head1 SEE ALSO @@ -362,8 +391,9 @@ L<DSA_free(3)|DSA_free(3)> =head1 HISTORY ---- doc/crypto/dsa.pod 2002-08-05 18:27:01.000000000 +0200 -+++ doc/crypto/dsa.pod 2010-04-01 00:45:01.042994012 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod +--- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100 @@ -100,7 +100,7 @@ =head1 SEE ALSO @@ -373,8 +403,9 @@ L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>, L<DSA_new(3)|DSA_new(3)>, L<DSA_size(3)|DSA_size(3)>, ---- doc/crypto/DSA_sign.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_sign.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100 @@ -55,7 +55,7 @@ =head1 SEE ALSO @@ -384,8 +415,9 @@ L<DSA_do_sign(3)|DSA_do_sign(3)> =head1 HISTORY ---- doc/crypto/engine.pod 2007-11-19 10:18:03.000000000 +0100 -+++ doc/crypto/engine.pod 2010-04-01 00:45:01.049660583 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod +--- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100 @@ -594,6 +594,6 @@ =head1 SEE ALSO @@ -394,8 +426,9 @@ +L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)> =cut ---- doc/crypto/ERR_clear_error.pod 2000-02-01 02:36:58.000000000 +0100 -+++ doc/crypto/ERR_clear_error.pod 2010-04-01 00:45:00.857161750 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -20,7 +20,7 @@ =head1 SEE ALSO @@ -405,8 +438,9 @@ =head1 HISTORY ---- doc/crypto/ERR_error_string.pod 2004-11-14 16:11:37.000000000 +0100 -+++ doc/crypto/ERR_error_string.pod 2010-04-01 00:45:00.863828202 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100 @@ -60,7 +60,7 @@ =head1 SEE ALSO @@ -416,8 +450,9 @@ L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> L<ERR_print_errors(3)|ERR_print_errors(3)> ---- doc/crypto/ERR_get_error.pod 2002-11-29 15:21:54.000000000 +0100 -+++ doc/crypto/ERR_get_error.pod 2010-04-01 00:45:00.870494614 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -61,7 +61,7 @@ =head1 SEE ALSO @@ -427,8 +462,9 @@ L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> =head1 HISTORY ---- doc/crypto/ERR_GET_LIB.pod 2000-02-01 02:36:58.000000000 +0100 -+++ doc/crypto/ERR_GET_LIB.pod 2010-04-01 00:45:00.850495218 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100 @@ -41,7 +41,7 @@ =head1 SEE ALSO @@ -438,8 +474,9 @@ =head1 HISTORY ---- doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 12:55:08.000000000 +0100 -+++ doc/crypto/ERR_load_crypto_strings.pod 2010-04-01 00:45:00.873827919 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100 @@ -35,7 +35,7 @@ =head1 SEE ALSO @@ -449,8 +486,9 @@ =head1 HISTORY ---- doc/crypto/ERR_load_strings.pod 2000-02-24 12:55:08.000000000 +0100 -+++ doc/crypto/ERR_load_strings.pod 2010-04-01 00:45:00.876327759 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100 @@ -43,7 +43,7 @@ =head1 SEE ALSO @@ -460,8 +498,9 @@ =head1 HISTORY ---- doc/crypto/err.pod 2002-07-10 21:35:46.000000000 +0200 -+++ doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod +--- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -=pod - @@ -650,8 +689,9 @@ -L<SSL_get_error(3)|SSL_get_error(3)> - -=cut ---- doc/crypto/ERR_print_errors.pod 2000-02-01 02:36:59.000000000 +0100 -+++ doc/crypto/ERR_print_errors.pod 2010-04-01 00:45:00.879660945 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100 @@ -38,7 +38,7 @@ =head1 SEE ALSO @@ -661,8 +701,9 @@ L<ERR_get_error(3)|ERR_get_error(3)>, L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> ---- doc/crypto/ERR_put_error.pod 2000-02-24 12:55:08.000000000 +0100 -+++ doc/crypto/ERR_put_error.pod 2010-04-01 00:45:00.886327158 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -34,7 +34,7 @@ =head1 SEE ALSO @@ -672,8 +713,9 @@ =head1 HISTORY ---- doc/crypto/ERR_remove_state.pod 2000-05-19 09:54:42.000000000 +0200 -+++ doc/crypto/ERR_remove_state.pod 2010-04-01 00:45:00.892994288 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100 @@ -25,7 +25,7 @@ =head1 SEE ALSO @@ -683,8 +725,9 @@ =head1 HISTORY ---- doc/crypto/EVP_BytesToKey.pod 2004-11-25 18:47:30.000000000 +0100 -+++ doc/crypto/EVP_BytesToKey.pod 2010-04-01 00:45:00.899660540 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -694,8 +737,9 @@ L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> =head1 HISTORY ---- doc/crypto/EVP_OpenInit.pod 2000-09-23 09:16:14.000000000 +0200 -+++ doc/crypto/EVP_OpenInit.pod 2010-04-01 00:45:00.906327633 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100 @@ -54,7 +54,7 @@ =head1 SEE ALSO @@ -705,8 +749,9 @@ L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, L<EVP_SealInit(3)|EVP_SealInit(3)> ---- doc/crypto/EVP_SealInit.pod 2005-03-29 19:50:08.000000000 +0200 -+++ doc/crypto/EVP_SealInit.pod 2010-04-01 00:45:00.912995642 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100 @@ -74,7 +74,7 @@ =head1 SEE ALSO @@ -716,8 +761,9 @@ L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, L<EVP_OpenInit(3)|EVP_OpenInit(3)> ---- doc/crypto/EVP_SignInit.pod 2006-07-12 14:31:29.000000000 +0200 -+++ doc/crypto/EVP_SignInit.pod 2010-04-01 00:45:00.919661935 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100 @@ -89,7 +89,7 @@ =head1 SEE ALSO @@ -727,8 +773,9 @@ L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> ---- doc/crypto/EVP_VerifyInit.pod 2006-07-12 14:31:30.000000000 +0200 -+++ doc/crypto/EVP_VerifyInit.pod 2010-04-01 00:45:00.926327388 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100 @@ -80,7 +80,7 @@ L<evp(3)|evp(3)>, @@ -738,8 +785,9 @@ L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> ---- doc/crypto/OPENSSL_config.pod 2005-06-03 01:19:56.000000000 +0200 -+++ doc/crypto/OPENSSL_config.pod 2010-04-01 00:45:00.932995118 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod +--- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100 @@ -73,7 +73,7 @@ =head1 SEE ALSO @@ -749,8 +797,9 @@ =head1 HISTORY ---- doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/crypto/openssl_err.pod 2010-04-01 00:45:01.059660101 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100 @@ -0,0 +1,187 @@ +=pod + @@ -939,8 +988,9 @@ +L<SSL_get_error(3)|SSL_get_error(3)> + +=cut ---- doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/crypto/openssl_rand.pod 2010-04-01 00:45:01.059660101 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100 @@ -0,0 +1,175 @@ +=pod + @@ -1117,16 +1167,15 @@ +L<RAND_cleanup(3)|RAND_cleanup(3)> + +=cut ---- doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/crypto/openssl_threads.pod 2009-10-01 01:40:52.000000000 +0200 -@@ -0,0 +1,210 @@ +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -0,0 +1,175 @@ +=pod + +=head1 NAME + -+CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback, -+CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy, -+CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks, ++CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks, +CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, +CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, +CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support @@ -1135,26 +1184,14 @@ + + #include <openssl/crypto.h> + -+ /* Don't use this structure directly. */ -+ typedef struct crypto_threadid_st -+ { -+ void *ptr; -+ unsigned long val; -+ } CRYPTO_THREADID; -+ /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */ -+ void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); -+ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); -+ int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); -+ void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); -+ void CRYPTO_THREADID_current(CRYPTO_THREADID *id); -+ int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, -+ const CRYPTO_THREADID *b); -+ void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, -+ const CRYPTO_THREADID *src); -+ unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id); ++ void CRYPTO_set_locking_callback(void (*locking_function)(int mode, ++ int n, const char *file, int line)); ++ ++ void CRYPTO_set_id_callback(unsigned long (*id_function)(void)); + + int CRYPTO_num_locks(void); + ++ + /* struct CRYPTO_dynlock_value needs to be defined by the user */ + struct CRYPTO_dynlock_value; + @@ -1186,8 +1223,7 @@ +=head1 DESCRIPTION + +OpenSSL can safely be used in multi-threaded applications provided -+that at least two callback functions are set, locking_function and -+threadid_func. ++that at least two callback functions are set. + +locking_function(int mode, int n, const char *file, int line) is +needed to perform locking on shared data structures. @@ -1202,42 +1238,10 @@ +B<file> and B<line> are the file number of the function setting the +lock. They can be useful for debugging. + -+threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing -+thread's identifier into B<id>. The implementation of this callback should not -+fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread -+IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based. -+If the application does not register such a callback using -+CRYPTO_THREADID_set_callback(), then a default implementation is used - on -+Windows and BeOS this uses the system's default thread identifying APIs, and on -+all other platforms it uses the address of B<errno>. The latter is satisfactory -+for thread-safety if and only if the platform has a thread-local error number -+facility. -+ -+Once threadid_func() is registered, or if the built-in default implementation is -+to be used; -+ -+=over 4 -+ -+=item * -+CRYPTO_THREADID_current() records the currently-executing thread ID into the -+given B<id> object. -+ -+=item * -+CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie. -+the same semantics as memcmp()). -+ -+=item * -+CRYPTO_THREADID_cpy() duplicates a thread ID value, -+ -+=item * -+CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This -+is usually the exact numeric or pointer-based thread ID used internally, however -+this also handles the unusual case where pointers are larger than 'long' -+variables and the platform's thread IDs are pointer-based - in this case, mixing -+is done to attempt to produce a unique numeric value even though it is not as -+wide as the platform's true thread IDs. -+ -+=back ++id_function(void) is a function that returns a thread ID, for example ++pthread_self() if it returns an integer (see NOTES below). It isn't ++needed on Windows nor on platforms where getpid() returns a different ++ID for each thread (see NOTES below). + +Additionally, OpenSSL supports dynamic locks, and sometimes, some parts +of OpenSSL need it for better performance. To enable this, the following @@ -1309,6 +1313,22 @@ +Also, dynamic locks are currently not used internally by OpenSSL, but +may do so in the future. + ++Defining id_function(void) has it's own issues. Generally speaking, ++pthread_self() should be used, even on platforms where getpid() gives ++different answers in each thread, since that may depend on the machine ++the program is run on, not the machine where the program is being ++compiled. For instance, Red Hat 8 Linux and earlier used ++LinuxThreads, whose getpid() returns a different value for each ++thread. Red Hat 9 Linux and later use NPTL, which is ++Posix-conformant, and has a getpid() that returns the same value for ++all threads in a process. A program compiled on Red Hat 8 and run on ++Red Hat 9 will therefore see getpid() returning the same value for ++all threads. ++ ++There is still the issue of platforms where pthread_self() returns ++something other than an integer. This is a bit unusual, and this ++manual has no cookbook solution for that case. ++ +=head1 EXAMPLES + +B<crypto/threads/mttest.c> shows examples of the callback functions on @@ -1316,22 +1336,19 @@ + +=head1 HISTORY + -+CRYPTO_set_locking_callback() is ++CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are +available in all versions of SSLeay and OpenSSL. +CRYPTO_num_locks() was added in OpenSSL 0.9.4. +All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. -+B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0 -+to replace (actually, deprecate) the previous CRYPTO_set_id_callback(), -+CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed -+thread IDs to always be represented by 'unsigned long'. + +=head1 SEE ALSO + +L<crypto(3)|crypto(3)> + +=cut ---- doc/crypto/RAND_add.pod 2000-03-22 16:30:03.000000000 +0100 -+++ doc/crypto/RAND_add.pod 2010-04-01 00:45:00.939660251 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100 @@ -65,7 +65,7 @@ =head1 SEE ALSO @@ -1341,8 +1358,9 @@ L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> =head1 HISTORY ---- doc/crypto/RAND_bytes.pod 2007-09-24 13:01:18.000000000 +0200 -+++ doc/crypto/RAND_bytes.pod 2010-04-01 00:45:00.946326823 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100 @@ -38,7 +38,7 @@ =head1 SEE ALSO @@ -1352,8 +1370,9 @@ L<RAND_add(3)|RAND_add(3)> =head1 HISTORY ---- doc/crypto/RAND_cleanup.pod 2000-01-27 02:25:06.000000000 +0100 -+++ doc/crypto/RAND_cleanup.pod 2010-04-01 00:45:00.952993593 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100 @@ -20,7 +20,7 @@ =head1 SEE ALSO @@ -1363,8 +1382,9 @@ =head1 HISTORY ---- doc/crypto/RAND_egd.pod 2008-11-10 12:26:44.000000000 +0100 -+++ doc/crypto/RAND_egd.pod 2010-04-01 00:45:00.959660646 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100 @@ -72,7 +72,7 @@ =head1 SEE ALSO @@ -1374,8 +1394,9 @@ L<RAND_cleanup(3)|RAND_cleanup(3)> =head1 HISTORY ---- doc/crypto/RAND_load_file.pod 2001-03-21 16:25:56.000000000 +0100 -+++ doc/crypto/RAND_load_file.pod 2010-04-01 00:45:00.976327494 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100 @@ -43,7 +43,7 @@ =head1 SEE ALSO @@ -1385,8 +1406,9 @@ =head1 HISTORY ---- doc/crypto/rand.pod 2002-08-05 18:27:01.000000000 +0200 -+++ doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod +--- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,175 +0,0 @@ -=pod - @@ -1563,8 +1585,9 @@ -L<RAND_cleanup(3)|RAND_cleanup(3)> - -=cut ---- doc/crypto/RAND_set_rand_method.pod 2007-11-19 10:18:03.000000000 +0100 -+++ doc/crypto/RAND_set_rand_method.pod 2010-04-01 00:45:00.982994946 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100 @@ -67,7 +67,7 @@ =head1 SEE ALSO @@ -1574,8 +1597,9 @@ =head1 HISTORY ---- doc/crypto/RSA_blinding_on.pod 2000-02-24 12:55:10.000000000 +0100 -+++ doc/crypto/RSA_blinding_on.pod 2010-04-01 00:45:00.989661318 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100 @@ -34,7 +34,7 @@ =head1 SEE ALSO @@ -1585,8 +1609,9 @@ =head1 HISTORY ---- doc/crypto/RSA_generate_key.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/RSA_generate_key.pod 2010-04-01 00:45:00.996327969 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -1596,8 +1621,9 @@ L<RSA_free(3)|RSA_free(3)> =head1 HISTORY ---- doc/crypto/rsa.pod 2002-08-04 23:08:36.000000000 +0200 -+++ doc/crypto/rsa.pod 2010-04-01 00:45:01.062995006 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod +--- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100 @@ -108,7 +108,7 @@ =head1 SEE ALSO @@ -1607,8 +1633,9 @@ L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>, L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>, L<RSA_generate_key(3)|RSA_generate_key(3)>, ---- doc/crypto/RSA_public_encrypt.pod 2004-03-23 22:01:34.000000000 +0100 -+++ doc/crypto/RSA_public_encrypt.pod 2010-04-01 00:45:01.002994781 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100 @@ -73,7 +73,7 @@ =head1 SEE ALSO @@ -1618,8 +1645,9 @@ L<RSA_size(3)|RSA_size(3)> =head1 HISTORY ---- doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 15:33:28.000000000 +0200 -+++ doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-04-01 00:45:01.009660553 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100 @@ -48,7 +48,7 @@ =head1 SEE ALSO @@ -1629,8 +1657,9 @@ L<RSA_verify(3)|RSA_verify(3)> =head1 HISTORY ---- doc/crypto/threads.pod 2009-10-01 01:40:52.000000000 +0200 -+++ doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod +--- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ -=pod - @@ -1842,8 +1871,9 @@ -L<crypto(3)|crypto(3)> - -=cut ---- doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 13:27:59.000000000 +0200 -+++ doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-04-01 00:45:01.016327524 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod +--- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100 @@ -65,7 +65,7 @@ =head1 SEE ALSO @@ -1853,8 +1883,9 @@ =head1 HISTORY ---- doc/ssl/SSL_get_error.pod 2005-03-30 13:50:14.000000000 +0200 -+++ doc/ssl/SSL_get_error.pod 2010-04-01 00:45:03.069662282 +0200 +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100 @@ -105,7 +105,7 @@ =head1 SEE ALSO @@ -1864,8 +1895,9 @@ =head1 HISTORY ---- doc/ssl/SSL_want.pod 2005-03-30 13:50:14.000000000 +0200 -+++ doc/ssl/SSL_want.pod 2010-04-01 00:45:03.082993225 +0200 +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100 @@ -72,6 +72,6 @@ =head1 SEE ALSO @@ -1874,11 +1906,12 @@ +L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> =cut ---- FAQ 2010-03-29 15:11:53.000000000 +0200 -+++ FAQ 2010-04-01 00:46:00.593821225 +0200 +diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ +--- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100 ++++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100 @@ -724,7 +724,7 @@ CRYPTO_set_id_callback(), for all versions of OpenSSL up to and - including 0.9.8[abc...]. As of version 0.9.9, CRYPTO_set_id_callback() + including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() and associated APIs are deprecated by CRYPTO_THREADID_set_callback() -and friends. This is described in the threads(3) manpage. +and friends. This is described in the openssl_threads(3) manpage. diff --git a/abs/core/p11-kit/PKGBUILD b/abs/core/p11-kit/PKGBUILD new file mode 100644 index 0000000..639a279 --- /dev/null +++ b/abs/core/p11-kit/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=p11-kit +pkgver=0.12 +pkgrel=1 +pkgdesc="Library to work with PKCS#11 modules" +arch=(i686 x86_64) +url="http://p11-glue.freedesktop.org" +license=('BSD') +depends=(glibc) +options=(!libtool) +source=($url/releases/$pkgname-$pkgver.tar.gz) +md5sums=('66baf7ddde982d1b7294d3bd63be7446') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-module-path=/usr/lib/pkcs11 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/pacman-mirrorlist/PKGBUILD b/abs/core/pacman-mirrorlist/PKGBUILD index 76aa033..14d87a2 100644 --- a/abs/core/pacman-mirrorlist/PKGBUILD +++ b/abs/core/pacman-mirrorlist/PKGBUILD @@ -1,19 +1,16 @@ -# $Id: PKGBUILD 83368 2010-06-21 12:46:38Z dan $ +# $Id: PKGBUILD 162423 2012-06-27 01:30:44Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pacman-mirrorlist -pkgver=20100621 +pkgver=20120626 pkgrel=1 pkgdesc="Arch Linux mirror list for use by pacman" arch=('any') -url="http://www.archlinux.org/pacman/" +url="http://www.archlinux.org/mirrorlist/" license=('GPL') backup=(etc/pacman.d/mirrorlist) source=(mirrorlist) -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - # NOTE on building this package: # * Go to the trunk/ directory # * Run bash -c ". PKGBUILD; updatelist" @@ -21,8 +18,8 @@ PKGEXT='.pkg.tar.gz' # * Build the package updatelist() { - wget -O mirrorlist http://www.archlinux.org/mirrorlist/i686/all/ - sed -i 's/i686/$arch/' mirrorlist + rm -f mirrorlist + wget -O mirrorlist https://www.archlinux.org/mirrorlist/all/smart/ } build() { @@ -30,5 +27,5 @@ build() { install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/ } -md5sums=('506e96c2c64c5dbea880112bc5070a22') -sha256sums=('03507e32ab9fc9988e0df164cb82c75316a0b043c584ae9240cf801600e55c31') +md5sums=('49afc13a48fae447b9717cc686d3ee24') +sha256sums=('2fc3ec4aac3e9587679f75066f9387e65016e9651c0df5decfe7d56f6fce4a1c') diff --git a/abs/core/pacman-mirrorlist/mirrorlist b/abs/core/pacman-mirrorlist/mirrorlist index d8498f3..f41941f 100644 --- a/abs/core/pacman-mirrorlist/mirrorlist +++ b/abs/core/pacman-mirrorlist/mirrorlist @@ -1,282 +1,236 @@ -# -# Arch Linux repository mirrorlist -# Generated on 2010-06-21 -# +## +## Arch Linux repository mirrorlist +## Generated on 2012-06-26 +## -# Any -#Server = ftp://mirrors.kernel.org/archlinux/$repo/os/$arch -#Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch - -# Australia -#Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch +## Australia #Server = http://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch -#Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch #Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch -#Server = ftp://mirror.internode.on.net/pub/archlinux/$repo/os/$arch #Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/$arch -#Server = ftp://ftp.netspace.net.au/pub/archlinux/$repo/os/$arch -#Server = http://ftp.netspace.net.au/pub/archlinux/$repo/os/$arch -#Server = ftp://mirror.optus.net/archlinux/$repo/os/$arch #Server = http://mirror.optus.net/archlinux/$repo/os/$arch -# Austria -#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/$arch -#Server = http://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/$arch - -# Belgium -#Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/$arch -#Server = http://ftp.belnet.be/mirror/archlinux.org/$repo/os/$arch -#Server = ftp://archlinux.mirror.kangaroot.net/pub/archlinux/$repo/os/$arch +## Belgium #Server = http://archlinux.mirror.kangaroot.net/$repo/os/$arch -# Brazil -#Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/$arch +## Bulgaria +#Server = http://archlinux.igor.onlinedirect.bg/$repo/os/$arch + +## Brazil +#Server = http://www.bitwave.com.br/downloads/archlinux/$repo/os/$arch #Server = http://archlinux.c3sl.ufpr.br/$repo/os/$arch -#Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/$arch #Server = http://www.las.ic.unicamp.br/pub/archlinux/$repo/os/$arch #Server = http://pet.inf.ufsc.br/mirrors/archlinux/$repo/os/$arch -# Bulgaria -#Server = http://archlinux.igor.onlinedirect.bg/$repo/os/$arch +## Belarus +#Server = http://mirror.datacenter.by/pub/archlinux/$repo/os/$arch -# Canada -#Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +## Canada #Server = http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch -#Server = ftp://mirror.its.dal.ca/archlinux/$repo/os/$arch #Server = http://mirror.its.dal.ca/archlinux/$repo/os/$arch -#Server = http://mirror.twilightlair.net/arch/$repo/os/$arch -# Chile -#Server = ftp://mirror.archlinux.cl/$repo/os/$arch +## Switzerland +#Server = http://archlinux.puzzle.ch/$repo/os/$arch -# China -#Server = http://mirrors.163.com/archlinux/$repo/os/$arch +## Chile +#Server = http://mirror.archlinux.cl/$repo/os/$arch + +## China #Server = http://mirror.bjtu.edu.cn/archlinux/$repo/os/$arch #Server = http://mirror6.bjtu.edu.cn/archlinux/$repo/os/$arch -#Server = ftp://mirrors.sohu.com/archlinux/$repo/os/$arch -#Server = http://mirrors.sohu.com/archlinux/$repo/os/$arch - -# Czech Republic -#Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/$arch -#Server = http://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/$arch - -# Denmark -#Server = ftp://mirrors.dotsrc.org/archlinux/$repo/os/$arch -#Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch -#Server = ftp://ftp.klid.dk/archlinux/$repo/os/$arch - -# Estonia -#Server = ftp://ftp.eenet.ee/pub/archlinux/$repo/os/$arch -#Server = http://ftp.eenet.ee/pub/archlinux/$repo/os/$arch +#Server = http://mirrors.stuhome.net/archlinux/$repo/os/$arch +#Server = http://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch +#Server = http://mirrors6.ustc.edu.cn/archlinux/$repo/os/$arch -# Finland -#Server = ftp://mirror.archlinux.fi/archlinux/$repo/os/$arch -#Server = http://mirror.archlinux.fi/archlinux/$repo/os/$arch +## Colombia +#Server = http://www.laqee.unal.edu.co/archlinux/$repo/os/$arch -# France -#Server = http://mir.archlinux.fr/$repo/os/$arch -#Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/$arch -#Server = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/$arch -#Server = ftp://mir1.archlinux.fr/archlinux/$repo/os/$arch -#Server = http://mir1.archlinux.fr/archlinux/$repo/os/$arch -#Server = ftp://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch -#Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch -#Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/$arch +## Czech Republic +#Server = http://archlinux.mirror.dkm.cz/pub/archlinux/$repo/os/$arch +#Server = http://mirror.vpsfree.cz/archlinux/$repo/os/$arch -# Germany +## Germany +#Server = http://1favre.de/arch/$repo/os/$arch #Server = http://archlinux.limun.org/$repo/os/$arch -#Server = ftp://artfiles.org/archlinux/$repo/os/$arch -#Server = http://artfiles.org/archlinux/$repo/os/$arch -#Server = http://archlinux.giantix-server.de/$repo/os/$arch -#Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://artfiles.org/archlinux.org/$repo/os/$arch +#Server = http://mirror.devnu11.net/archlinux/$repo/os/$arch #Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch -#Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch -#Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch #Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch -#Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch #Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch -#Server = ftp://mirror.selfnet.de/archlinux/$repo/os/$arch +#Server = http://mirror.de.leaseweb.net/archlinux/$repo/os/$arch #Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch -#Server = ftp://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +#Server = http://mirrors.mycraft.eu/archlinux/$repo/os/$arch +#Server = http://mirrors.n-ix.net/archlinux/$repo/os/$arch +#Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch #Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch -#Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch #Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.tuxdroid.org/archlinux/$repo/os/$arch #Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch #Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch -# Great Britain -#Server = ftp://mirror.lividpenguin.com/pub/archlinux/$repo/os/$arch +## Denmark +#Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch + +## Estonia +#Server = http://ftp.eenet.ee/pub/archlinux/$repo/os/$arch + +## Spain +#Server = http://sunsite.rediris.es/mirror/archlinux/$repo/os/$arch + +## Finland +#Server = http://mirror.academica.fi/archlinux/$repo/os/$arch + +## France +#Server = http://mirror.archlinux.ikoula.com/archlinux/$repo/os/$arch +#Server = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/$arch +#Server = http://mir.archlinux.fr/$repo/os/$arch +#Server = http://mir1.archlinux.fr/archlinux/$repo/os/$arch +#Server = http://miroir.ezvan.fr/archlinux/$repo/os/$arch +#Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch +#Server = http://archlinux.polymorf.fr/$repo/os/$arch + +## United Kingdom +#Server = http://mirror.bytemark.co.uk/archlinux/$repo/os/$arch +#Server = http://mirror.cinosure.com/archlinux/$repo/os/$arch #Server = http://mirror.lividpenguin.com/pub/archlinux/$repo/os/$arch -#Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch -#Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/$arch #Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch -# Greece -#Server = ftp://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch +## Greece #Server = http://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch +#Server = http://foss.aueb.gr/mirrors/linux/archlinux/$repo/os/$arch #Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.otenet.gr/pub/linux/archlinux/$repo/os/$arch #Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch -# Hungary -#Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/$arch - -# India -#Server = ftp://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch -#Server = http://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch +## Hungary +#Server = http://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/$arch -# Indonesia -#Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/$arch -#Server = http://archlinux.cbn.net.id/$repo/os/$arch -#Server = ftp://mirror.unej.ac.id/archlinux/$repo/os/$arch -#Server = http://mirror.unej.ac.id/archlinux/$repo/os/$arch +## Indonesia +#Server = http://repo.ukdw.ac.id/archlinux/$repo/os/$arch -# Ireland -#Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch +## Ireland #Server = http://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch -# Israel +## Israel #Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/$arch -# Italy -#Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/$arch -#Server = http://mi.mirror.garr.it/mirrors/archlinux/$repo/os/$arch +## India +#Server = http://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch +#Server = http://glug.nith.ac.in/archlinux/$repo/os/$arch + +## Italy +#Server = http://archlinux.openlabto.org/archlinux/$repo/os/$arch +#Server = http://mirrors.prometeus.net/archlinux/$repo/os/$arch -# Japan -#Server = ftp://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch +## Japan +#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch -#Server = ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/$arch #Server = http://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/$arch -# Kazakhstan -#Server = ftp://archlinux.linuxforum.kz/$repo/os/$arch -#Server = http://archlinux.linuxforum.kz/$repo/os/$arch +## Korea, Republic of +#Server = http://ftp.kaist.ac.kr/ArchLinux/$repo/os/$arch +#Server = http://mirror.yongbok.net/archlinux/$repo/os/$arch -# Latvia -#Server = http://archlinux.goodsoft.lv/$repo/os/$arch +## Kazakhstan +#Server = http://archlinux.kz/$repo/os/$arch +#Server = http://mirror.neolabs.kz/archlinux/$repo/os/$arch -# Lithuania -#Server = ftp://atviras.lt/archmirror/$repo/os/$arch -#Server = http://atviras.lt/archmirror/$repo/os/$arch +## Sri Lanka +#Server = http://mirror.learn.ac.lk/archlinux/$repo/os/$arch -# Netherlands -#Server = ftp://mirror.leaseweb.com/archlinux/$repo/os/$arch -#Server = http://mirror.leaseweb.com/archlinux/$repo/os/$arch -#Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/$arch -#Server = http://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/$arch -#Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/$arch -#Server = http://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/$arch +## Latvia +#Server = http://archlinux.goodsoft.lv/$repo/os/$arch + +## Macedonia, The Former Yugoslav Republic of +#Server = http://arch.linux.net.mk/archlinux/$repo/os/$arch -# New Caledonia -#Server = ftp://archlinux.nautile.nc/archlinux/$repo/os/$arch +## New Caledonia #Server = http://archlinux.nautile.nc/archlinux/$repo/os/$arch -# New Zealand -#Server = http://mirror.ihug.co.nz/archlinux/$repo/os/$arch -#Server = http://mirror.ihug.co.nz/archlinux/$repo/os/$arch +## Netherlands +#Server = http://arch.apt-get.eu/$repo/os/$arch +#Server = http://mirror.i3d.net/pub/archlinux/$repo/os/$arch +#Server = http://mirror.nl.leaseweb.net/archlinux/$repo/os/$arch +#Server = http://ftp.nluug.nl/pub/os/Linux/distr/archlinux/$repo/os/$arch -# Norway -#Server = ftp://mirror.archlinux.no/$repo/os/$arch +## Norway +#Server = http://arch.ping.uio.no/$repo/os/$arch #Server = http://mirror.archlinux.no/$repo/os/$arch +#Server = http://archlinux.uib.no/$repo/os/$arch + +## New Zealand +#Server = http://mirror.xnet.co.nz/pub/archlinux/$repo/os/$arch -# Poland -#Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch +## Poland +#Server = http://mirror.chmuri.net/archmirror/$repo/os/$arch #Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch -#Server = ftp://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = http://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = ftp://ftp.tpnet.pl/pub/linux/archlinux/$repo/os/$arch -#Server = http://unix.net.pl/archlinux.org/$repo/os/$arch - -# Portugal -#Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/$arch -#Server = http://cesium.di.uminho.pt/pub/archlinux/$repo/os/$arch -#Server = http://darkstar.ist.utl.pt/archlinux/$repo/os/$arch -#Server = ftp://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/$arch -#Server = http://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/$arch -#Server = ftp://ftp.rnl.ist.utl.pt/pub/archlinux/$repo/os/$arch + +## Portugal #Server = http://ftp.rnl.ist.utl.pt/pub/archlinux/$repo/os/$arch -# Romania -#Server = ftp://mirror.archlinux.ro/archlinux/$repo/os/$arch +## Romania +#Server = http://mirrors.adnettelecom.ro/archlinux/$repo/os/$arch #Server = http://mirror.archlinux.ro/archlinux/$repo/os/$arch -#Server = ftp://ftp.roedu.net/mirrors/archlinux.org/$repo/os/$arch #Server = http://ftp.roedu.net/mirrors/archlinux.org/$repo/os/$arch -# Russia -#Server = http://archlinux.freeside.ru/$repo/os/$arch -#Server = ftp://mirror.svk.su/archlinux/$repo/os/$arch -#Server = http://mirror.svk.su/archlinux/$repo/os/$arch -#Server = ftp://mirror.yandex.ru/archlinux/$repo/os/$arch -#Server = http://mirror.yandex.ru/archlinux/$repo/os/$arch +## Serbia +#Server = http://mirror.pmf.kg.ac.rs/archlinux/$repo/os/$arch -# Spain -#Server = ftp://ftp.rediris.es/mirror/archlinux/$repo/os/$arch -#Server = http://sunsite.rediris.es/mirror/archlinux/$repo/os/$arch +## Russian Federation +#Server = http://mirror.rol.ru/archlinux/$repo/os/$arch +#Server = http://mirror.yandex.ru/archlinux/$repo/os/$arch -# Sweden -#Server = ftp://ftp.df.lth.se/pub/archlinux/$repo/os/$arch +## Sweden #Server = http://ftp.df.lth.se/pub/archlinux/$repo/os/$arch -#Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/$arch #Server = http://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.gigabit.nu/$repo/os/$arch -#Server = http://ftp.gigabit.nu/$repo/os/$arch -#Server = ftp://ftp.port80.se/archlinux/$repo/os/$arch -#Server = http://ftp.port80.se/archlinux/$repo/os/$arch +#Server = http://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch -# Switzerland -#Server = ftp://archlinux.puzzle.ch/$repo/os/$arch -#Server = http://archlinux.puzzle.ch/$repo/os/$arch +## Singapore +#Server = ftp://ftp.oss.eznetsols.org/linux/archlinux/$repo/os/$arch -# Taiwan -#Server = ftp://ftp.mirror.tw/pub/ArchLinux/$repo/os/$arch -#Server = http://www.mirror.tw/pub/ArchLinux/$repo/os/$arch -#Server = ftp://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch -#Server = http://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch +## Slovakia +#Server = http://mirror.lnx.sk/pub/linux/archlinux/$repo/os/$arch -# Turkey -#Server = ftp://ftp.linux.org.tr/archlinux/$repo/os/$arch +## Turkey +#Server = http://ftp.linux.org.tr/archlinux/$repo/os/$arch -# Ukraine -#Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/$arch -#Server = http://archlinux.hell.org.ua/archlinux/$repo/os/$arch -#Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/$arch -#Server = http://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/$arch +## Taiwan, Province of China +#Server = http://linux.cs.nctu.edu.tw/archlinux/$repo/os/$arch +#Server = http://shadow.ind.ntou.edu.tw/archlinux/$repo/os/$arch +#Server = http://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch -# United States -#Server = http://mirror.ams.sunysb.edu/archlinux/$repo/os/$arch -#Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch -#Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch -#Server = ftp://mirrors.easynews.com/linux/archlinux/$repo/os/$arch -#Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/$arch -#Server = ftp://ftp.archlinux.org/$repo/os/$arch -#Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = http://www.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = ftp://mirrors.hosef.org/archlinux/$repo/os/$arch -#Server = http://mirrors.hosef.org/archlinux/$repo/os/$arch -#Server = ftp://ibiblio.org/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = http://distro.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/$arch -#Server = http://archlinux.linuxfreedom.com/$repo/os/$arch -#Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/$arch -#Server = ftp://lug.mtu.edu/archlinux/ftpfull/$repo/os/$arch +## Ukraine +#Server = http://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/$arch +#Server = http://mirrors.mithril.org.ua/linux/archlinux/$repo/os/$arch + +## United States +#Server = http://archlinux.supsec.org/$repo/os/$arch +#Server = http://archlinux.surlyjake.com/archlinux/$repo/os/$arch +#Server = http://cake.lib.fit.edu/archlinux/$repo/os/$arch +#Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch +#Server = http://cosmos.cites.illinois.edu/pub/archlinux/$repo/os/$arch +#Server = http://www.gtlib.gatech.edu/pub/archlinux/$repo/os/$arch +#Server = http://mirror.ancl.hawaii.edu/linux/archlinux/$repo/os/$arch +#Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch +#Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch #Server = http://lug.mtu.edu/archlinux/ftpfull/$repo/os/$arch -#Server = ftp://mirrors.xmission.com/archlinux/$repo/os/$arch +#Server = http://mirror.umd.edu/archlinux/$repo/os/$arch +#Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch +#Server = http://mirrors.liquidweb.com/archlinux/$repo/os/$arch #Server = http://mirrors.xmission.com/archlinux/$repo/os/$arch -#Server = ftp://ftp.osuosl.org/pub/archlinux/$repo/os/$arch +#Server = http://mirror.mocker.org/archlinux/$repo/os/$arch #Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch -#Server = ftp://mirror.rit.edu/archlinux/$repo/os/$arch #Server = http://mirror.rit.edu/archlinux/$repo/os/$arch +#Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch #Server = http://schlunix.org/archlinux/$repo/os/$arch -#Server = http://archlinux.umflint.edu/$repo/os/$arch -#Server = http://mirror.umoss.org/archlinux/$repo/os/$arch +#Server = http://mirrors.lax1.thegcloud.com/arch/$repo/os/$arch +#Server = http://hive.ist.unomaha.edu/archlinux/$repo/os/$arch +#Server = http://mirror.yellowfiber.net/archlinux/$repo/os/$arch + +## Uzbekistan +#Server = http://mirrors.st.uz/archlinux/$repo/os/$arch -# Vietnam -#Server = ftp://202.78.230.5/archlinux/$repo/os/$arch -#Server = ftp://ftp.indochinalinux.com/archlinux/$repo/os/$arch -#Server = ftp://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/$arch +## Viet Nam #Server = http://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/$arch +## South Africa +#Server = http://ftp.wa.co.za/pub/archlinux/$repo/os/$arch + diff --git a/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch new file mode 100644 index 0000000..85622aa --- /dev/null +++ b/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch @@ -0,0 +1,152 @@ +From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001 +From: Allan McRae <allan@archlinux.org> +Date: Sun, 8 Jul 2012 21:36:36 +1000 +Subject: [PATCH 1/4] Add conflict for replacing owned empty directory + +When two packages own an empty directory, pacman finds no conflict when +one of those packages wants to replace the directory with a file or a +symlink. When it comes to actually extracting the new file/symlink, +pacman sees the directory is still there (we do not remove empty +directories if they are owned by a package) and refuses to extract. + +Detect this potential conflict early and bail. Note that it is a +_potential_ conflict and not a guaranteed one as the other package owning +the directory could be updated or removed first which would remove +the conflict. However, pacman currently can not sort package installation +order to ensure this, so this conflict requires manual upgrade ordering. + +Signed-off-by: Allan McRae <allan@archlinux.org> +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + lib/libalpm/conflict.c | 32 ++++++++++++++++++++++++++------ + test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++ + test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++ + 3 files changed, 66 insertions(+), 6 deletions(-) + create mode 100644 test/pacman/tests/fileconflict009.py + create mode 100644 test/pacman/tests/fileconflict010.py + +diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c +index 32f6f30..efa1a87 100644 +--- a/lib/libalpm/conflict.c ++++ b/lib/libalpm/conflict.c +@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, + return NULL; + } + +-static int dir_belongsto_pkg(const char *root, const char *dirpath, ++static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, + alpm_pkg_t *pkg) + { ++ alpm_list_t *i; + struct stat sbuf; + char path[PATH_MAX]; + char abspath[PATH_MAX]; +- struct dirent *ent = NULL; + DIR *dir; ++ struct dirent *ent = NULL; ++ const char *root = handle->root; ++ ++ /* TODO: this is an overly strict check but currently pacman will not ++ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that ++ * is not simple as even if the directory is being unowned by a conflicting ++ * package, pacman does not sort this to ensure all required directory ++ * "removals" happen before installation of file/symlink */ ++ ++ /* check that no other _installed_ package owns the directory */ ++ for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { ++ if(pkg == i->data) { ++ continue; ++ } ++ ++ if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) { ++ return 0; ++ } ++ } + ++ /* check all files in directory are owned by the package */ + snprintf(abspath, PATH_MAX, "%s%s", root, dirpath); + dir = opendir(abspath); + if(dir == NULL) { +@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath, + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } +- snprintf(path, PATH_MAX, "%s/%s", dirpath, name); ++ snprintf(path, PATH_MAX, "%s%s", dirpath, name); + snprintf(abspath, PATH_MAX, "%s%s", root, path); + if(stat(abspath, &sbuf) != 0) { + continue; + } + if(S_ISDIR(sbuf.st_mode)) { +- if(dir_belongsto_pkg(root, path, pkg)) { ++ if(dir_belongsto_pkg(handle, path, pkg)) { + continue; + } else { + closedir(dir); +@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, + sprintf(dir, "%s/", filestr); + if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) { + _alpm_log(handle, ALPM_LOG_DEBUG, +- "check if all files in %s belongs to %s\n", ++ "check if all files in %s belong to %s\n", + dir, dbpkg->name); +- resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg); ++ resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg); + } + free(dir); + } +diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py +new file mode 100644 +index 0000000..904af4a +--- /dev/null ++++ b/test/pacman/tests/fileconflict009.py +@@ -0,0 +1,20 @@ ++self.description = "dir->symlink change during package upgrade (directory conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++lp2 = pmpkg("pkg2") ++lp2.files = ["dir/"] ++self.addpkg2db("local", lp2) ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir -> /usr/dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("PKG_VERSION=pkg2|1.0-1") ++self.addrule("DIR_EXIST=dir/") +diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py +new file mode 100644 +index 0000000..0a3ce83 +--- /dev/null ++++ b/test/pacman/tests/fileconflict010.py +@@ -0,0 +1,20 @@ ++self.description = "dir->file change during package upgrade (directory conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++lp2 = pmpkg("pkg2") ++lp2.files = ["dir/"] ++self.addpkg2db("local", lp2) ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("PKG_VERSION=pkg2|1.0-1") ++self.addrule("DIR_EXIST=dir/") +-- +1.7.11.1 + diff --git a/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch b/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch new file mode 100644 index 0000000..6cf496d --- /dev/null +++ b/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch @@ -0,0 +1,61 @@ +From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001 +From: Allan McRae <allan@archlinux.org> +Date: Sun, 8 Jul 2012 23:58:37 +1000 +Subject: [PATCH 2/4] Check empty subdirectory ownership + +When checking if a package owns a directory, it is important to check +not only that all the files in the directory are part of the package, +but also if the directory is part of a package. This catches empty +subdirectories during conflict checking for directory to file/symlink +replacements. + +Signed-off-by: Allan McRae <allan@archlinux.org> +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + lib/libalpm/conflict.c | 5 +++++ + test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++ + 2 files changed, 22 insertions(+) + create mode 100644 test/pacman/tests/fileconflict012.py + +diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c +index efa1a87..d6e5d8c 100644 +--- a/lib/libalpm/conflict.c ++++ b/lib/libalpm/conflict.c +@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, + struct dirent *ent = NULL; + const char *root = handle->root; + ++ /* check directory is actually in package - used for subdirectory checks */ ++ if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) { ++ return 0; ++ } ++ + /* TODO: this is an overly strict check but currently pacman will not + * overwrite a directory with a file (case 10/11 in add.c). Adjusting that + * is not simple as even if the directory is being unowned by a conflicting +diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py +new file mode 100644 +index 0000000..421b739 +--- /dev/null ++++ b/test/pacman/tests/fileconflict012.py +@@ -0,0 +1,17 @@ ++self.description = "dir->file change during package upgrade (filesystem file conflict)" ++ ++lp1 = pmpkg("pkg1") ++lp1.files = ["dir/"] ++self.addpkg2db("local", lp1) ++ ++self.filesystem = ["dir/file"] ++ ++p = pmpkg("pkg1", "1.0-2") ++p.files = ["dir"] ++self.addpkg2db("sync", p) ++ ++self.args = "-S pkg1" ++ ++self.addrule("PACMAN_RETCODE=1") ++self.addrule("PKG_VERSION=pkg1|1.0-1") ++self.addrule("DIR_EXIST=dir/") +-- +1.7.11.1 + diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 80dabe4..623f4cc 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -1,35 +1,52 @@ -# $Id$ +# vim: set ts=2 sw=2 et: +# $Id: PKGBUILD 163493 2012-07-13 12:31:08Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman -pkgver=3.5.3 -pkgrel=5 +pkgver=4.0.3 +pkgrel=3 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') -depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') -optdepends=('fakeroot: for makepkg usage as normal user' - 'curl: for rankmirrors usage') +depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4' + 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') +makedepends=('asciidoc') +optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install options=(!libtool) -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} + 0001-Add-conflict-for-replacing-owned-empty-directory.patch + 0002-Check-empty-subdirectory-ownership.patch pacman.conf pacman.conf.x86_64 makepkg.conf) - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' + '1a70392526c8768470da678b31905a6e' + '1a9b79788640907a2b34e8671cacc94a' + 'a9ddd43891bed364e1e97d27b2887bf1' + '99734ea46795f466d41c503e9e23b6d4' + '556d49489e82b5750cf026d3b18c8f4f' + '589cd34eb9d5b678455e8289394f523e') build() { cd $srcdir/$pkgname-$pkgver + + patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch + patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -41,13 +58,13 @@ package() { install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 " + myflags="-march=i686" ;; x86_64) install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 " + myflags="-march=x86-64" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -58,14 +75,10 @@ package() { -e "s|@CARCHFLAGS[@]|$myflags|g" # install completion files - mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman - mkdir -p $pkgdir/usr/share/zsh/site-functions/ - install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman -} + install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman" + for f in makepkg pacman-key; do + ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" + done -# vim: set ts=2 sw=2 et: -md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - '8ec73ab08305cdbe3671aedbbb4ceede' - 'ae905192b4bf71772173e8abbd53291e' - 'a8684989d3dfad5a6e1bcf95af3e571b') + install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog deleted file mode 100644 index f028169..0000000 --- a/abs/core/pacman/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -make cache dir /data/var/cache/pacman/pkg -add custom message to post_upgrade() of pacman.install diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf index a655e93..25ca015 100644 --- a/abs/core/pacman/makepkg.conf +++ b/abs/core/pacman/makepkg.conf @@ -8,16 +8,16 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' +DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: # /usr/bin/snarf # /usr/bin/lftpget -c -# /usr/bin/curl +# /usr/bin/wget ######################################################################### # ARCHITECTURE, COMPILE FLAGS @@ -26,12 +26,12 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' CARCH="@CARCH@" CHOST="@CHOST@" -#-- Exclusive: will only run on @CARCH@ +#-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" @@ -39,7 +39,7 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user @@ -47,19 +47,23 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation #-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file # -BUILDENV=(fakeroot !distcc color !ccache check) +BUILDENV=(fakeroot !distcc color !ccache check !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. #DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg ######################################################################### # GLOBAL PACKAGE OPTIONS # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -68,8 +72,9 @@ BUILDENV=(fakeroot !distcc color !ccache check) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -100,6 +105,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #SRCPKGDEST=/home/srcpackages #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john@doe.com>" +#-- Specify a key to use for package signing +#GPGKEY="" ######################################################################### # EXTENSION DEFAULTS diff --git a/abs/core/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch b/abs/core/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch deleted file mode 100644 index 8baa35e..0000000 --- a/abs/core/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Thu, 17 Jun 2010 14:32:08 +1000 -Subject: [PATCH] makepkg: fallback to sane defaults for library stripping - -If the library stripping variables are not defined in makepkg.conf, -libraries will be fully stripped and become broken. Fallback to a -sane default stripping level. - -Signed-off-by: Allan McRae <allan@archlinux.org> -Signed-off-by: Dan McGee <dan@archlinux.org> ---- - scripts/makepkg.sh.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index d986701..e64b564 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -864,6 +864,9 @@ tidy_install() { - - if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then - msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" -+ # make sure library stripping variables are defined to prevent excess stripping -+ [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" -+ [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" - local binary - find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in --- -1.7.1 - diff --git a/abs/core/pacman/old/PKGBUILD b/abs/core/pacman/old/PKGBUILD deleted file mode 100644 index a138950..0000000 --- a/abs/core/pacman/old/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=pacman -pkgver=3.4.0 -pkgrel=3 -pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/pacman/" -license=('GPL') -groups=('base') -depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') -optdepends=('fakeroot: for makepkg usage as normal user') -backup=(etc/pacman.conf etc/makepkg.conf) -install=pacman.install -options=(!libtool) -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz - pacman.conf - makepkg.conf - 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch) -md5sums=('50ad71be1faaad84842c576e239d1bb5' - '80f5bb2a606553512d0db857f78d9ac2' - 'aef317285c7d16ac495b0e53deeb948d' - 'f8c4a3cc7702a7a70d177659441495c5') -sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3' - '97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838' - '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418' - '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 < $srcdir/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - - # install Arch specific stuff - mkdir -p $pkgdir/etc - install -m644 $srcdir/pacman.conf $pkgdir/etc/ - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ - # set things correctly in the default conf file - case "$CARCH" in - i686) - mycarch="i686" - mychost="i686-pc-linux-gnu" - myflags="-march=i686 " - ;; - x86_64) - mycarch="x86_64" - mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 " - ;; - esac - sed -i $pkgdir/etc/makepkg.conf \ - -e "s|@CARCH[@]|$mycarch|g" \ - -e "s|@CHOST[@]|$mychost|g" \ - -e "s|@CARCHFLAGS[@]|$myflags|g" - - # install completion files - mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman - mkdir -p $pkgdir/usr/share/zsh/site-functions/ - install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman -} - -# vim: set ts=2 sw=2 et: diff --git a/abs/core/pacman/old/makepkg.conf b/abs/core/pacman/old/makepkg.conf deleted file mode 100644 index ff08a0f..0000000 --- a/abs/core/pacman/old/makepkg.conf +++ /dev/null @@ -1,115 +0,0 @@ -# -# /etc/makepkg.conf -# - -######################################################################### -# SOURCE ACQUISITION -######################################################################### -# -#-- The download utilities that makepkg should use to acquire sources -# Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - -# Other common tools: -# /usr/bin/snarf -# /usr/bin/lftpget -c -# /usr/bin/curl - -######################################################################### -# ARCHITECTURE, COMPILE FLAGS -######################################################################### -# -CARCH="@CARCH@" -CHOST="@CHOST@" - -#-- Exclusive: will only run on @CARCH@ -# -march (or -mcpu) builds exclusively for an architecture -# -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" -#-- Make Flags: change this for DistCC/SMP systems -#MAKEFLAGS="-j2" - -######################################################################### -# BUILD ENVIRONMENT -######################################################################### -# -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) -# A negated environment option will do the opposite of the comments below. -# -#-- fakeroot: Allow building packages as a non-root user -#-- distcc: Use the Distributed C/C++/ObjC compiler -#-- color: Colorize output messages -#-- ccache: Use ccache to cache compilation -# -BUILDENV=(fakeroot !distcc color !ccache) -# -#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, -#-- specify a space-delimited list of hosts running in the DistCC cluster. -#DISTCC_HOSTS="" - -######################################################################### -# GLOBAL PACKAGE OPTIONS -# These are default values for the options=() settings -######################################################################### -# -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) -# A negated option will do the opposite of the comments below. -# -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -# -OPTIONS=(strip docs libtool emptydirs zipman purge) - -#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 -INTEGRITY_CHECK=(md5) -#-- Options to be used when stripping binaries. See `man strip' for details. -STRIP_BINARIES="--strip-all" -#-- Options to be used when stripping shared libraries. See `man strip' for details. -STRIP_SHARED="--strip-unneeded" -#-- Options to be used when stripping static libraries. See `man strip' for details. -STRIP_STATIC="--strip-debug" -#-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) -#-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) - -######################################################################### -# PACKAGE OUTPUT -######################################################################### -# -# Default: put built package and cached source in build directory -# -#-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages -#-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources -#-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages -#-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe <john@doe.com>" - -######################################################################### -# EXTENSION DEFAULTS -######################################################################### -# -# WARNING: Do NOT modify these variables unless you know what you are -# doing. -# -PKGEXT='.pkg.tar.xz' -SRCEXT='.src.tar.gz' - -# vim: set ft=sh ts=2 sw=2 et: diff --git a/abs/core/pacman/old/mirrorlist b/abs/core/pacman/old/mirrorlist deleted file mode 100644 index 83e75ae..0000000 --- a/abs/core/pacman/old/mirrorlist +++ /dev/null @@ -1,101 +0,0 @@ -# -# Arch Linux repository mirrorlist -# - -# North America -# - United States -Server = ftp://ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@carch@ -Server = http://archlinux.unixheads.org/$repo/os/@carch@ -Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@carch@ -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@carch@ -Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@carch@ -Server = http://holmes.umflint.edu/archlinux/$repo/os/@carch@ -Server = http://mirror.neotuli.net/arch/$repo/os/@carch@ -Server = http://mirror.rit.edu/archlinux/$repo/os/@carch@ -Server = http://mirror.umoss.org/archlinux/$repo/os/@carch@ -Server = http://schlunix.org/archlinux/$repo/os/@carch@ -# - Canada -Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@carch - -# South America -# - Brazil -Server = http://archlinux.c3sl.ufpr.br/$repo/os/@carch@ -Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@carch@ -Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/@carch@ - -# Europe -# - Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@carch@ -# - Belgium -Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@carch@ -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@carch@ -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@carch@ -# - France -Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@carch@ -Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@carch@ -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@carch@ -Server = http://mir.archlinux.fr/$repo/os/@carch@ -Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/@carch@ -# - Germany -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.archlinuxppc.org/@carch@/$repo/os/@carch@ -Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@carch@ -Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/@carch@ -# - Great Britain -Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/@carch@ -Server = http://archlinux.mirrors.uk2.net/$repo/os/@carch@ -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@carch@ -# - Hungary -Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@carch@ -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@carch@ -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@carch@ -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@carch@ -# - Norway -Server = http://arch.likbilen.com/$repo/os/@carch -# - Poland -Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@carch@ -Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = http://unix.net.pl/archlinux.org/$repo/os/@carch@ -# - Portugal -Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@carch@ -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@carch@ -# - Russia -Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@carch@ -Server = http://archlinux.freeside.ru/$repo/os/@carch@ -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.gigabit.nu/$repo/os/@carch@ -# - Switzerland -Server = http://archlinux.puzzle.ch/$repo/os/@carch@ -# - Turkey -Server = http://server.elsistech.com/archlinux/$repo/os/@carch@ -# - Ukraine -Server = ftp://hell.org.ua/archlinux/$repo/os/@carch@ -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@carch@ - -# Asia -# - Israel -Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@carch@ -# - Vietnam -# Domain name is ftp.indochinalinux.com but there are frequent DNS problems -Server = ftp://202.78.230.5/archlinux/$repo/os/@carch@ - -# Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@carch@ -Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@carch@ - diff --git a/abs/core/pacman/old/pacman.conf b/abs/core/pacman/old/pacman.conf deleted file mode 100644 index 911c23d..0000000 --- a/abs/core/pacman/old/pacman.conf +++ /dev/null @@ -1,84 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options (all disabled by default) -#UseSyslog -#ShowSize -#UseDelta -#TotalDownload - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -## Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/mirrorlist - -[core] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/mirrorlist - -[extra] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -## Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/mirrorlist - -[community] -# Add your preferred servers here, they will be used first -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/abs/core/pacman/old/pacman.install b/abs/core/pacman/old/pacman.install deleted file mode 100644 index 294222e..0000000 --- a/abs/core/pacman/old/pacman.install +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi -} - -_resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" - - # path variables - pacconf="/etc/pacman.conf" - dbpath="/var/lib/pacman/local" - - # get a list of NoUpgrade files from the user's pacman.conf - echo ">>> Retrieving pacman.conf NoUpgrade list..." - config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) - # add the standard list of files, even if they are already above - config="$config \ - etc/passwd etc/group etc/shadow etc/sudoers \ - etc/fstab etc/raidtab etc/ld.so.conf \ - etc/rc.conf etc/rc.local \ - etc/modprobe.conf etc/modules.conf \ - etc/lilo.conf boot/grub/menu.lst" - - # blank md5sum for use in sed expression - zeroes='00000000000000000000000000000000' - - for file in $config; do - echo ">>> -> finding owner of /$file..." - line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) - # if file is owned by a package, go find its incorrectly stored sum - if [ ! -z "$line" ]; then - # get the name and version of the package owning file - name=$(echo $line | awk '{print $5}') - version=$(echo $line | awk '{print $6}') - # set the path to the backup array holding the md5sum - path="$dbpath/$name-$version/files" - # run a sed on the path to reset the line containing $file - # NOTE: literal tab characters in sed expression after $file - echo ">>> -> resetting sum of /$file..." - sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path - else - echo ">>> -> $file is unowned." - fi - done -} diff --git a/abs/core/pacman/pacman-3.4.1-1-i686.pkg.tar.gz b/abs/core/pacman/pacman-3.4.1-1-i686.pkg.tar.gz deleted file mode 120000 index 5d96387..0000000 --- a/abs/core/pacman/pacman-3.4.1-1-i686.pkg.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.4.1-1-i686.pkg.tar.gz
\ No newline at end of file diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index 25ab6b6..0596b7a 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -11,13 +11,14 @@ # If you wish to use different paths, uncomment and update the paths. #RootDir = / #DBPath = /var/lib/pacman/ -CacheDir = /data/var/cache/pacman/pkg/ +#CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled Architecture = auto @@ -26,16 +27,22 @@ Architecture = auto #IgnoreGroup = #NoUpgrade = -NoUpgrade = data/srv/hobbit/etc/bb-hosts -NoUpgrade = etc/func/minion.conf #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload -#CheckSpace +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +#SigLevel = Optional TrustedOnly + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. # # REPOSITORIES @@ -60,56 +67,29 @@ NoUpgrade = etc/func/minion.conf # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[core] -Server = http://linhes.org/repo/$arch/$repo - -[extra] -Server = http://linhes.org/repo/$arch/$repo - -#[chroot-devel] -#Server = http://linhes.org/repo/$arch/$repo - -#[core-testing] -#Server = http://linhes.org/repo/$arch/$repo - -#[extra-testing] -#Server = http://linhes.org/repo/$arch/$repo - #[testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist -#[core] -#Include = /etc/pacman.d/mirrorlist +[core] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist -#[extra] -#Include = /etc/pacman.d/mirrorlist +[extra] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist #[community-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist -#[community] -#Include = /etc/pacman.d/mirrorlist +[community] +SigLevel = PackageRequired +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] +#SigLevel = Optional TrustAll #Server = file:///home/custompkgs -########################ARCH DEFAULTS############# -#[ARCH-core] -# Add your preferred servers here, they will be used first -#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 - -#[ARCH-extra] -# Add your preferred servers here, they will be used first -#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 - -#[community] -# Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/mirrorlist - -# Unstable is disabled by default. To enable, uncomment the following -# two lines. You can add preferred servers immediately after the header, -# and they will be used before the default mirrors. -#[unstable] -#Include = /etc/pacman.d/mirrorlist diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64 index f76dba2..42321bb 100644 --- a/abs/core/pacman/pacman.conf.x86_64 +++ b/abs/core/pacman/pacman.conf.x86_64 @@ -12,13 +12,13 @@ #RootDir = / #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ -CacheDir = /data/var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled Architecture = auto @@ -29,12 +29,20 @@ Architecture = auto #NoUpgrade = #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload -#CheckSpace +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +#SigLevel = Optional TrustedOnly + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. # # REPOSITORIES @@ -60,30 +68,39 @@ Architecture = auto # after the header, and they will be used before the default mirrors. #[testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [core] +SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] +SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist #[community-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [community] +SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. #[multilib-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist #[multilib] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] +#SigLevel = Optional TrustAll #Server = file:///home/custompkgs + diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index c066733..487819a 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,33 +9,22 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi - _updateconf - echo ">>>" - echo ">>> ATTENTION! ATTENTION! ATTENTION!" - echo ">>> /etc/pacman.conf has changed. If you have customized your" - echo ">>> pacman.conf file, please merge your changes into" - echo ">>> /etc/pacman.conf.pacnew. Backup your old pacman.conf and" - echo ">>> then move pacman.conf.pacnew to pacman.conf" - echo ">>>" -} - -_updateconf() { - pacconf="/etc/pacman.conf" - #add SyncFirst - grep -q SyncFirst $pacconf - if [ $? -eq 1 ] - then - sed -i '/\[options\]/ a\SyncFirst = pacman ' $pacconf + if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then + _check_pubring fi - #remove larch - sed -i '/larch/d' $pacconf +} +post_install() { + _check_pubring } - +_check_pubring() { + echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`" + echo " >>> to import the data required by pacman for package verification." + echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages" +} _warnupgrade() { - echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." echo ">>> You will need to run \`pacman-db-upgrade\` as root." echo ">>>" diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD index 05f8837..a778adc 100644 --- a/abs/core/pam/PKGBUILD +++ b/abs/core/pam/PKGBUILD @@ -1,34 +1,45 @@ -# $Id: PKGBUILD 96216 2010-10-19 11:54:04Z allan $ +# $Id: PKGBUILD 161792 2012-06-14 10:14:53Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam -pkgver=1.1.3 -pkgrel=1 +pkgver=1.1.5 +pkgrel=4 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' 'cracklib') -makedepends=('flex') -backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) -source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 - ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 - other) +depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase') +makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') +backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) +source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 + #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 + ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2) options=('!libtool' '!emptydirs') +md5sums=('927ee5585bdec5256c75117e9348aa47' + 'e2788389a6c59224110a45fcff30e02b') build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib + sed -i '1 i#include <sys/resource.h>' modules/pam_unix/pam_unix_auth.c + sed -i '1 i#include <sys/resource.h>' modules/pam_unix/pam_unix_acct.c + ./configure --libdir=/usr/lib make - make INSTALL=/bin/install DESTDIR=$pkgdir install - install -D -m644 ../other $pkgdir/etc/pam.d/other + + # cd $srcdir/pam_unix2-2.6 + # ./configure --libdir=/usr/lib +# make +} + +package() { + cd $srcdir/Linux-PAM-$pkgver + make DESTDIR=$pkgdir install + # build pam_unix2 module # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 - cd $srcdir/pam_unix2-2.6 - ./configure - make - make DESTDIR=$pkgdir install +# cd $srcdir/pam_unix2-2.6 +# make DESTDIR=$pkgdir install + # add the realtime permissions for audio users sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf cat >>$pkgdir/etc/security/limits.conf <<_EOT @@ -38,15 +49,14 @@ build() { @audio - nice -10 @audio - memlock 40000 _EOT + # fix some missing symlinks from old pam for compatibility - cd $pkgdir/lib/security + cd $pkgdir/usr/lib/security ln -s pam_unix.so pam_unix_acct.so ln -s pam_unix.so pam_unix_auth.so ln -s pam_unix.so pam_unix_passwd.so ln -s pam_unix.so pam_unix_session.so + # set unix_chkpwd uid chmod +s $pkgdir/sbin/unix_chkpwd } -md5sums=('6db7fcb5db6253350e3a4648ceac40e7' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') diff --git a/abs/core/pam/__changelog b/abs/core/pam/__changelog new file mode 100644 index 0000000..4e18340 --- /dev/null +++ b/abs/core/pam/__changelog @@ -0,0 +1 @@ +https://bugs.archlinux.org/task/30645 diff --git a/abs/core/pambase/PKGBUILD b/abs/core/pambase/PKGBUILD new file mode 100644 index 0000000..4b52457 --- /dev/null +++ b/abs/core/pambase/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 162994 2012-07-04 21:45:33Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=pambase +pkgver=20120701 +pkgrel=1 +pkgdesc="Base PAM configuration for services" +arch=('any') +url="http://www.archlinux.org" +license=('GPL') +source=('system-auth' + 'system-local-login' + 'system-login' + 'system-remote-login' + 'system-services' + 'other') +backup=('etc/pam.d/system-auth' + 'etc/pam.d/system-local-login' + 'etc/pam.d/system-login' + 'etc/pam.d/system-remote-login' + 'etc/pam.d/system-services' + 'etc/pam.d/other') +md5sums=('5f169a4ffe7ed69f58e106cdd2d760df' + '477237985820117a0e6e1b13a86eb599' + '17c691f2da319df8fe851bc47cc1d662' + '477237985820117a0e6e1b13a86eb599' + '30fe7d41e054ee43fab7855bf88a07e5' + '6e6c8719e5989d976a14610f340bd33a') + +package() { + install -dm755 "$pkgdir/etc/pam.d" + install -m644 -t "$pkgdir/etc/pam.d" \ + system-auth \ + system-local-login \ + system-login \ + system-remote-login \ + system-services \ + other +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/shadow/chage b/abs/core/pambase/other index a7bf8a4..08498b4 100644 --- a/abs/core/shadow/chage +++ b/abs/core/pambase/other @@ -1,6 +1,5 @@ #%PAM-1.0 -auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so +password required pam_unix.so session required pam_unix.so -password required pam_permit.so diff --git a/abs/core/pambase/system-auth b/abs/core/pambase/system-auth new file mode 100644 index 0000000..b28a7e9 --- /dev/null +++ b/abs/core/pambase/system-auth @@ -0,0 +1,17 @@ +#%PAM-1.0 + +auth required pam_env.so +auth required pam_unix.so try_first_pass nullok +auth optional pam_permit.so + +account required pam_unix.so +account optional pam_permit.so +account required pam_time.so + +password required pam_unix.so try_first_pass nullok sha512 shadow +password optional pam_permit.so + +session required pam_limits.so +session required pam_env.so +session required pam_unix.so +session optional pam_permit.so diff --git a/abs/core/pambase/system-local-login b/abs/core/pambase/system-local-login new file mode 100644 index 0000000..347b815 --- /dev/null +++ b/abs/core/pambase/system-local-login @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth include system-login +account include system-login +password include system-login +session include system-login diff --git a/abs/core/pambase/system-login b/abs/core/pambase/system-login new file mode 100644 index 0000000..c3bfd7c --- /dev/null +++ b/abs/core/pambase/system-login @@ -0,0 +1,20 @@ +#%PAM-1.0 + +auth required pam_tally.so onerr=succeed file=/var/log/faillog +auth required pam_shells.so +auth requisite pam_nologin.so +auth include system-auth + +account required pam_access.so +account required pam_nologin.so +account include system-auth + +password include system-auth + +session optional pam_loginuid.so +session required pam_env.so +session include system-auth +session optional pam_motd.so motd=/etc/motd +session optional pam_mail.so dir=/var/spool/mail standard +-session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/abs/core/pambase/system-remote-login b/abs/core/pambase/system-remote-login new file mode 100644 index 0000000..347b815 --- /dev/null +++ b/abs/core/pambase/system-remote-login @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth include system-login +account include system-login +password include system-login +session include system-login diff --git a/abs/core/pambase/system-services b/abs/core/pambase/system-services new file mode 100644 index 0000000..311c0d6 --- /dev/null +++ b/abs/core/pambase/system-services @@ -0,0 +1,11 @@ +#%PAM-1.0 + +auth sufficient pam_permit.so + +account include system-auth + +session optional pam_loginuid.so +session required pam_limits.so +session required pam_env.so +session required pam_unix.so +session optional pam_permit.so diff --git a/abs/core/pango/PKGBUILD b/abs/core/pango/PKGBUILD index 524b9c1..b07ef9c 100644 --- a/abs/core/pango/PKGBUILD +++ b/abs/core/pango/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 82790 2010-06-17 13:43:36Z jgc $ +# $Id: PKGBUILD 161372 2012-06-10 10:55:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.28.3 -pkgrel=2 +pkgver=1.30.1 +pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') license=('LGPL') -depends=('glib2>=2.24.1' 'cairo>=1.8.10' 'libxft>=2.1.14' 'libthai>=0.1.14' 'freetype2>=2.3.12') -makedepends=('pkgconfig' 'libxt' 'gobject-introspection') +depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2') +makedepends=('gobject-introspection' 'libxt' 'gtk-doc') options=('!libtool' '!emptydirs') install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.28/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" +sha256sums=('3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-included-modules=basic-fc || return 1 - make || return 1 + --localstatedir=/var --with-included-modules=basic-fc + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } -md5sums=('caa74baea47e7e16bc73c89f9089d522') diff --git a/abs/core/pango/bgo563356.patch b/abs/core/pango/bgo563356.patch deleted file mode 100644 index 226fd0c..0000000 --- a/abs/core/pango/bgo563356.patch +++ /dev/null @@ -1,305 +0,0 @@ -diff -aur old/ChangeLog new/ChangeLog ---- old/ChangeLog 2008-12-06 14:35:33.037390818 +0800 -+++ new/ChangeLog 2008-12-06 14:35:11.475339336 +0800 -@@ -1,3 +1,39 @@ -+2008-12-05 Behdad Esfahbod <behdad@gnome.org> -+ -+ Bug 563356 – The input area of firefox and the blank width after text -+ in gnome-menu was stretched too wide, under pango-1.22.3 -+ -+ * docs/tmpl/fonts.sgml: -+ * pango/pango-impl-utils.h: -+ * pango/pangocairo-atsuifont.c -+ (pango_cairo_atsui_font_create_metrics_for_context): -+ * pango/pangocairo-win32font.c -+ (pango_cairo_win32_font_create_metrics_for_context): -+ * pango/pangofc-font.c (pango_fc_font_create_metrics_for_context): -+ For approximate_char_width calculation take each char's width into -+ account. That is, do a weighted average instead of uniform average. -+ g_unichar_iszerowidth() chars count as 0, g_unichar_iswide() chars -+ count 2, and the rest count as 1. Pretty much wcwidth() behavior. -+ See bug report for rationale. -+ -+2008-11-28 Behdad Esfahbod <behdad@gnome.org> -+ -+ Bug 562574 – Pangocariowin32 is leaking every cairo font it ever -+ creates -+ -+ * pango/pangocairo-atsuifont.c (pango_cairo_atsui_font_finalize): -+ * pango/pangocairo-win32font.c (pango_cairo_win32_font_finalize): -+ Finalize shared pangocairo font resources. Oops! -+ -+ * pango/pangocairo-font.c (_pango_cairo_font_private_finalize): -+ Protect against multiple calls to finalize. This is practiced by the -+ pangocairo-fcfont when a font is shutdown and then finalized. -+ -+2008-11-26 Behdad Esfahbod <behdad@gnome.org> -+ -+ * examples/cairotwisted.c (parametrize_path), (point_on_path): -+ Handle close_path correctly. -+ - 2008-11-23 Behdad Esfahbod <behdad@gnome.org> - - * === Released 1.22.3 === -diff -aur old/docs/tmpl/fonts.sgml new/docs/tmpl/fonts.sgml ---- old/docs/tmpl/fonts.sgml 2008-12-06 14:35:11.450807479 +0800 -+++ new/docs/tmpl/fonts.sgml 2008-12-06 14:34:53.771786070 +0800 -@@ -441,7 +441,10 @@ - @descent: the distance from the baseline to the lowest point of the glyphs of - the font. This is positive in practically all fonts. - @approximate_char_width: approximate average width of the regular glyphs of -- the font. -+ the font. Note that for this calculation, East Asian characters -+ (those passing g_unichar_iswide()) are counted as double-width. -+ This produces a more uniform value for this measure across languages -+ and results in more uniform and more expected UI sizes. - @approximate_digit_width: approximate average width of the glyphs for digits - of the font. - @underline_position: position of the underline. This is normally negative. -diff -aur old/examples/cairotwisted.c new/examples/cairotwisted.c ---- old/examples/cairotwisted.c 2008-12-06 14:35:32.900725834 +0800 -+++ new/examples/cairotwisted.c 2008-12-06 14:35:11.264059243 +0800 -@@ -216,7 +216,7 @@ - parametrize_path (cairo_path_t *path) - { - int i; -- cairo_path_data_t *data, current_point; -+ cairo_path_data_t *data, last_move_to, current_point; - parametrization_t *parametrization; - - parametrization = malloc (path->num_data * sizeof (parametrization[0])); -@@ -226,8 +226,13 @@ - parametrization[i] = 0.0; - switch (data->header.type) { - case CAIRO_PATH_MOVE_TO: -+ last_move_to = data[1]; - current_point = data[1]; - break; -+ case CAIRO_PATH_CLOSE_PATH: -+ /* Make it look like it's a line_to to last_move_to */ -+ data = (&last_move_to) - 1; -+ /* fall through */ - case CAIRO_PATH_LINE_TO: - parametrization[i] = two_points_distance (¤t_point, &data[1]); - current_point = data[1]; -@@ -245,8 +250,6 @@ - - current_point = data[3]; - break; -- case CAIRO_PATH_CLOSE_PATH: -- break; - default: - g_assert_not_reached (); - } -@@ -320,7 +323,7 @@ - { - int i; - double ratio, the_y = *y, the_x = *x, dx, dy; -- cairo_path_data_t *data, current_point; -+ cairo_path_data_t *data, last_move_to, current_point; - cairo_path_t *path = param->path; - parametrization_t *parametrization = param->parametrization; - -@@ -333,6 +336,7 @@ - switch (data->header.type) { - case CAIRO_PATH_MOVE_TO: - current_point = data[1]; -+ last_move_to = data[1]; - break; - case CAIRO_PATH_LINE_TO: - current_point = data[1]; -@@ -352,6 +356,10 @@ - - case CAIRO_PATH_MOVE_TO: - break; -+ case CAIRO_PATH_CLOSE_PATH: -+ /* Make it look like it's a line_to to last_move_to */ -+ data = (&last_move_to) - 1; -+ /* fall through */ - case CAIRO_PATH_LINE_TO: - { - ratio = the_x / parametrization[i]; -@@ -424,8 +432,6 @@ - *y += dx * ratio; - } - break; -- case CAIRO_PATH_CLOSE_PATH: -- break; - default: - g_assert_not_reached (); - } -diff -aur old/pango/pango-impl-utils.h new/pango/pango-impl-utils.h ---- old/pango/pango-impl-utils.h 2008-12-06 14:35:22.291559359 +0800 -+++ new/pango/pango-impl-utils.h 2008-12-06 14:35:03.550729660 +0800 -@@ -23,6 +23,7 @@ - #ifndef __PANGO_IMPL_UTILS_H__ - #define __PANGO_IMPL_UTILS_H__ - -+#include <glib.h> - #include <glib-object.h> - #include <pango/pango.h> - -@@ -92,6 +93,36 @@ - PangoRectangle *ink_rect, - PangoRectangle *logical_rect); - -+ -+/* We define these functions static here because we don't want to add public API -+ * for them (if anything, it belongs to glib, but glib found it trivial enough -+ * not to add API for). At some point metrics calculations will be -+ * centralized and this mess can be minimized. Or so I hope. -+ */ -+ -+static inline G_GNUC_UNUSED int -+pango_unichar_width (gunichar c) -+{ -+ return G_UNLIKELY (g_unichar_iszerowidth (c)) ? 0 : -+ G_UNLIKELY (g_unichar_iswide (c)) ? 2 : 1; -+} -+ -+static G_GNUC_UNUSED glong -+pango_utf8_strwidth (const gchar *p) -+{ -+ glong len = 0; -+ g_return_val_if_fail (p != NULL, 0); -+ -+ while (*p) -+ { -+ len += pango_unichar_width (g_utf8_get_char (p)); -+ p = g_utf8_next_char (p); -+ } -+ -+ return len; -+} -+ -+ - G_END_DECLS - - #endif /* __PANGO_IMPL_UTILS_H__ */ -diff -aur old/pango/pangocairo-atsuifont.c new/pango/pangocairo-atsuifont.c ---- old/pango/pangocairo-atsuifont.c 2008-12-06 14:35:23.464057615 +0800 -+++ new/pango/pangocairo-atsuifont.c 2008-12-06 14:35:04.914061436 +0800 -@@ -24,6 +24,7 @@ - - #import <Cocoa/Cocoa.h> - -+#include "pango-impl-utils.h" - #include "pangoatsui-private.h" - #include "pangocairo.h" - #include "pangocairo-private.h" -@@ -148,7 +149,7 @@ - pango_layout_set_text (layout, sample_str, -1); - pango_layout_get_extents (layout, NULL, &extents); - -- metrics->approximate_char_width = extents.width / g_utf8_strlen (sample_str, -1); -+ metrics->approximate_char_width = extents.width / pango_utf8_strwidth (sample_str); - - pango_layout_set_text (layout, "0123456789", -1); - metrics->approximate_digit_width = max_glyph_width (layout); -@@ -174,6 +175,10 @@ - static void - pango_cairo_atsui_font_finalize (GObject *object) - { -+ PangoCairoATSUIFont *cafont = (PangoCairoATSUIFont *) object; -+ -+ _pango_cairo_font_private_finalize (&cafont->cf_priv); -+ - G_OBJECT_CLASS (pango_cairo_atsui_font_parent_class)->finalize (object); - } - -@@ -191,7 +196,7 @@ - } - - static void --pango_cairo_atsui_font_init (PangoCairoATSUIFont *cafont) -+pango_cairo_atsui_font_init (PangoCairoATSUIFont *cafont G_GNUC_UNUSED) - { - } - -diff -aur old/pango/pangocairo-fcfont.c new/pango/pangocairo-fcfont.c ---- old/pango/pangocairo-fcfont.c 2008-12-06 14:35:22.840724772 +0800 -+++ new/pango/pangocairo-fcfont.c 2008-12-06 14:35:04.294060844 +0800 -@@ -88,7 +88,7 @@ - static void - pango_cairo_fc_font_finalize (GObject *object) - { -- PangoCairoFcFont *cffont = (PangoCairoFcFont *) (object); -+ PangoCairoFcFont *cffont = (PangoCairoFcFont *) object; - - _pango_cairo_font_private_finalize (&cffont->cf_priv); - -@@ -162,7 +162,7 @@ - } - - static void --pango_cairo_fc_font_init (PangoCairoFcFont *cffont) -+pango_cairo_fc_font_init (PangoCairoFcFont *cffont G_GNUC_UNUSED) - { - } - -diff -aur old/pango/pangocairo-font.c new/pango/pangocairo-font.c ---- old/pango/pangocairo-font.c 2008-12-06 14:35:23.387391067 +0800 -+++ new/pango/pangocairo-font.c 2008-12-06 14:35:04.840728398 +0800 -@@ -560,14 +560,18 @@ - - if (cf_priv->scaled_font) - cairo_scaled_font_destroy (cf_priv->scaled_font); -+ cf_priv->scaled_font = NULL; - - _pango_cairo_font_hex_box_info_destroy (cf_priv->hbi); -+ cf_priv->hbi = NULL; - - if (cf_priv->glyph_extents_cache) - g_free (cf_priv->glyph_extents_cache); -+ cf_priv->glyph_extents_cache = NULL; - - g_slist_foreach (cf_priv->metrics_by_lang, (GFunc)free_metrics_info, NULL); - g_slist_free (cf_priv->metrics_by_lang); -+ cf_priv->metrics_by_lang = NULL; - } - - gboolean -diff -aur old/pango/pangocairo-win32font.c new/pango/pangocairo-win32font.c ---- old/pango/pangocairo-win32font.c 2008-12-06 14:35:22.500726273 +0800 -+++ new/pango/pangocairo-win32font.c 2008-12-06 14:35:03.990726207 +0800 -@@ -150,7 +150,7 @@ - pango_layout_set_text (layout, sample_str, -1); - pango_layout_get_extents (layout, NULL, &extents); - -- metrics->approximate_char_width = extents.width / g_utf8_strlen (sample_str, -1); -+ metrics->approximate_char_width = extents.width / pango_utf8_strwidth (sample_str); - - pango_layout_set_text (layout, "0123456789", -1); - metrics->approximate_digit_width = max_glyph_width (layout); -@@ -164,6 +164,10 @@ - static void - pango_cairo_win32_font_finalize (GObject *object) - { -+ PangoCairoWin32Font *cwfont = (PangoCairoWin32Font *) object; -+ -+ _pango_cairo_font_private_finalize (&cwfont->cf_priv); -+ - G_OBJECT_CLASS (pango_cairo_win32_font_parent_class)->finalize (object); - } - -@@ -225,7 +229,7 @@ - } - - static void --pango_cairo_win32_font_init (PangoCairoWin32Font *cwfont) -+pango_cairo_win32_font_init (PangoCairoWin32Font *cwfont G_GNUC_UNUSED) - { - } - -diff -aur old/pango/pangofc-font.c new/pango/pangofc-font.c ---- old/pango/pangofc-font.c 2008-12-06 14:35:23.117390557 +0800 -+++ new/pango/pangofc-font.c 2008-12-06 14:35:04.564059609 +0800 -@@ -496,7 +496,7 @@ - pango_layout_get_extents (layout, NULL, &extents); - - metrics->approximate_char_width = -- extents.width / g_utf8_strlen (sample_str, -1); -+ extents.width / pango_utf8_strwidth (sample_str); - - pango_layout_set_text (layout, "0123456789", -1); - metrics->approximate_digit_width = max_glyph_width (layout); diff --git a/abs/core/parted/PKGBUILD b/abs/core/parted/PKGBUILD index 6bb7ce0..7a94164 100644 --- a/abs/core/parted/PKGBUILD +++ b/abs/core/parted/PKGBUILD @@ -1,29 +1,24 @@ -# $Id$ +# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted -pkgver=3.0 -pkgrel=3 +pkgver=3.1 +pkgrel=1 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') -makedepends=('pkgconfig') +makedepends=('pkg-config') options=('!libtool') -install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" - linux.c.patch) -md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' - '08c942e212424e238271217f52c59706') +install=parted.install +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#25307 - patch -Np1 -i ${srcdir}/linux.c.patch - ./configure --prefix=/usr \ --disable-debug \ --disable-rpath diff --git a/abs/core/patch/PKGBUILD b/abs/core/patch/PKGBUILD index 3124e1f..8c0185f 100644 --- a/abs/core/patch/PKGBUILD +++ b/abs/core/patch/PKGBUILD @@ -1,26 +1,40 @@ -# $Id: PKGBUILD 62841 2010-01-13 01:57:24Z allan $ +# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.6.1 -pkgrel=1 +pkgrel=3 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') url="http://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc') +makedepends=('ed') optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d758eb96d3f75047efc004a720d33daf') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + patch-2.6.1-get-arg.patch) +md5sums=('d758eb96d3f75047efc004a720d33daf' + 'f7953f3e472fae5118815e6138372e22' + '45cd5709adbbcdcb3ab95dc43559c07c') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Fixed argument type for --get + # see https://bugzilla.redhat.com/show_bug.cgi?id=553624 + patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + make } + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install || return 1 + make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install } diff --git a/abs/core/patch/patch-2.6.1-get-arg.patch b/abs/core/patch/patch-2.6.1-get-arg.patch new file mode 100644 index 0000000..45f3bc8 --- /dev/null +++ b/abs/core/patch/patch-2.6.1-get-arg.patch @@ -0,0 +1,12 @@ +diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c +--- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100 ++++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100 +@@ -558,7 +558,7 @@ static struct option const longopts[] = + {"remove-empty-files", no_argument, NULL, 'E'}, + {"force", no_argument, NULL, 'f'}, + {"fuzz", required_argument, NULL, 'F'}, +- {"get", no_argument, NULL, 'g'}, ++ {"get", required_argument, NULL, 'g'}, + {"input", required_argument, NULL, 'i'}, + {"ignore-whitespace", no_argument, NULL, 'l'}, + #ifdef ENABLE_MERGE diff --git a/abs/core/pciutils/PKGBUILD b/abs/core/pciutils/PKGBUILD index 2529e07..3046289 100644 --- a/abs/core/pciutils/PKGBUILD +++ b/abs/core/pciutils/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 69314 2010-02-20 10:20:37Z tpowa $ +# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils -pkgver=3.1.7 +pkgver=3.1.10 pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('GPL2') groups=('base') -url="http://mj.ucw.cz/pciutils.html" -optdepends=('sh: required by update-pciids') -makedepends=('wget') -depends=('glibc') -source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('35222edb86b50a6641352c66fe829b2e') +url="http://mj.ucw.cz/sw/pciutils/" +depends=('glibc' 'hwids') +source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) +md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - CFLAGS="${CFLAGS} -fPIC -DPIC" - sed -i -e 's/^OPT=.*/OPT=-O2 -pipe -fPIC -DPIC/g' Makefile - ./update-pciids.sh + cd "${srcdir}/${pkgname}-${pkgver}" + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + cp lib/libpci.a "${srcdir}/" + make clean + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make ZLIB=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all || return 1 - make PREFIX=${pkgdir}/usr SHAREDIR=${pkgdir}/usr/share/hwdata MANDIR=${pkgdir}/usr/share/man install - install -d ${pkgdir}/usr/lib - install -m644 lib/libpci.a ${pkgdir}/usr/lib - for i in config.h header.h pci.h types.h; do - install -D -m 644 lib/${i} ${pkgdir}/usr/include/pci/${i} - done + cd "${srcdir}/${pkgname}-${pkgver}" + make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" + # this is now supplied by the hwids package + rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} } diff --git a/abs/core/pcmciautils/60-pcmcia.rules b/abs/core/pcmciautils/60-pcmcia.rules deleted file mode 100644 index aa3c1a2..0000000 --- a/abs/core/pcmciautils/60-pcmcia.rules +++ /dev/null @@ -1,30 +0,0 @@ -# PCMCIA devices: -# -ACTION!="add", GOTO="pcmciautils_end" -# modprobe $env{MODALIAS} loads all possibly appropriate modules -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" - -# Very few CIS firmware entries (which we use for matching) -# are so broken that we need to read out random bytes of it -# instead of the manufactor, card or product ID. Then the -# matching is done in userspace. -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/lib/udev/pcmcia-check-broken-cis" - -# However, the "weak" matching by func_id is only allowed _after_ modprobe -# returns, so that "strong" matches have a higher priority. -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1" - -# PCMCIA sockets: -# -# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work -SUBSYSTEM=="pcmcia_socket", \ - RUN+="/lib/udev/load-modules.sh pcmcia" - -# if this is a PCMCIA socket which needs a resource database, -# pcmcia-socket-startup sets it up -SUBSYSTEM=="pcmcia_socket", \ - RUN+="/lib/udev/pcmcia-socket-startup" - -LABEL="pcmciautils_end" diff --git a/abs/core/pcmciautils/PKGBUILD b/abs/core/pcmciautils/PKGBUILD index 40a4a6b..fcc5996 100644 --- a/abs/core/pcmciautils/PKGBUILD +++ b/abs/core/pcmciautils/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 82630 2010-06-15 04:26:01Z allan $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils -pkgver=017 -pkgrel=1 +pkgver=018 +pkgrel=4 pkgdesc="Utilities for inserting and removing PCMCIA cards" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') -depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9') +# sysfsutils will not be required in the next release +depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') -source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-$pkgver.tar.bz2 - 60-pcmcia.rules) +# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + initcpio-install-pcmcia) options=(!makeflags) -md5sums=('5245af28eeba57ec0606a874d44d10f7' - 'f88ac464ab9c75fe1565af551e6553a2') build() { - cd $srcdir/$pkgname-$pkgver - sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's,/usr/bin/install,install,g; + s,/lib/udev,/usr/lib/udev,g' Makefile + make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - # fix lspcmcia symlink - ln -sf pccardctl $pkgdir/sbin/lspcmcia - # add fixed rules file - install -D -m644 $srcdir/60-pcmcia.rules $pkgdir/lib/udev/rules.d/ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # install the mkinitpcio hook + install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia } +md5sums=('964c802994677a71b38ec56554aa229f' + '2659576a4637c58c4e79a96f8e43e316') diff --git a/abs/core/pcmciautils/initcpio-install-pcmcia b/abs/core/pcmciautils/initcpio-install-pcmcia new file mode 100644 index 0000000..71052d6 --- /dev/null +++ b/abs/core/pcmciautils/initcpio-install-pcmcia @@ -0,0 +1,22 @@ +#!/bin/bash + +build() { + FILES="/etc/pcmcia/config.opts" + MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" + + [[ $MODULES ]] && MODULES+=" sd_mod?" + + add_binary "/usr/lib/udev/pcmcia-socket-startup" + add_binary "/usr/lib/udev/pcmcia-check-broken-cis" + add_file "/usr/lib/udev/rules.d/60-pcmcia.rules" +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for a pcmcia root device. Detection will +take place at runtime. To minimize the modules in the image, add the autodetect +hook too. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/pcre/PKGBUILD b/abs/core/pcre/PKGBUILD index 83dfe94..08a9117 100644 --- a/abs/core/pcre/PKGBUILD +++ b/abs/core/pcre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 163492 2012-07-13 12:30:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.12 +pkgver=8.31 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64') @@ -12,25 +12,27 @@ url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') -sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('1c9a276af932b5599157f96e945391f0' + '873bcd2cd9f1e0aa1e28e256b3e31506') build() { cd "${srcdir}"/${pkgname}-${pkgver} + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties + ./configure --prefix=/usr --enable-pcre16 --enable-jit \ + --enable-utf8 --enable-unicode-properties make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - # grep uses pcre, so we need the libs in /lib - install -dm755 "${pkgdir}"/lib - mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ - ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so - install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/abs/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 0000000..1404460 --- /dev/null +++ b/abs/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/abs/core/perl/ChangeLog b/abs/core/perl/ChangeLog index ef05507..9add39e 100644 --- a/abs/core/perl/ChangeLog +++ b/abs/core/perl/ChangeLog @@ -1,3 +1,30 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Fixed #FS24660 + * Rebuilt against db 5.2.28 + +2011-05-16 Angel Velasquez <angvp@archlinux.org> + * perl 5.14.0 + * Removed patch for h2ph warning from 5.12.3 + * Removed provides array, you can use corelist -v 5.14.0 to know the + modules included with the perl core, through Module::CoreList (thx j3nnn1 + for the tip) + +2010-11-07 kevin <kevin@archlinux.org> + + * perl 5.12.2-1 + - Using /usr/bin/*_perl for script directories + +2010-11-06 kevin <kevin@archlinux.org> + + - Removed otherlibdirs directive from Configure + - Removed /usr/*/perl5/site_perl/5.10.1 from INC + - Finally removed legacy dirs /usr/lib/perl5/current and + /usr/lib/perl5/site_perl/current from @INC 2010-05-23 kevin <kevin@archlinux.org> diff --git a/abs/core/perl/PKGBUILD b/abs/core/perl/PKGBUILD index 092b545..58b94e7 100644 --- a/abs/core/perl/PKGBUILD +++ b/abs/core/perl/PKGBUILD @@ -1,135 +1,33 @@ -# $Id: PKGBUILD 96229 2010-10-19 12:28:45Z allan $ -# Maintainer: kevin <kevin.archlinux.org> +# $Id: PKGBUILD 160587 2012-06-02 10:54:59Z bluewind $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.12.1 -pkgrel=4 +pkgver=5.16.0 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://www.perl.org" groups=('base') -depends=('gdbm' 'db>=4.8' 'coreutils' 'glibc' 'sh') -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) +depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') +changelog=ChangeLog +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +provides.pl) install=perl.install -provides=( -perl-archive-extract=0.38 -perl-archive-tar=1.54 -perl-attribute-handlers=0.87 -perl-autodie=2.06_01 -perl-autoloader=5.70 -perl-base=2.15 -perl-b-debug=1.12 -perl-bignum=0.23 -perl-b-lint=1.11_01 -perl-cgi=3.49 -perl-class-isa=0.36 -perl-compress-raw-bzip2=2.024 -perl-compress-raw-zlib=2.024 -perl-constant=1.20 -perl-cpan=1.94_56 -perl-cpanplus=0.90 -perl-cpanplus-dist-build=0.46 -perl-data-dumper=2.125 -perl-db_file=1.820 -perl-devel-dprof=20080331.00 -perl-devel-peek=1.04 -perl-devel-ppport=3.19 -perl-digest=1.16 -perl-digest-md5=2.39 -perl-digest-sha=5.47 -perl-encode=2.39 -perl-encoding-warnings=0.11 -perl-exporter=5.64_01 -perl-extutils-cbuilder=0.27 -perl-extutils-command=1.16 -perl-extutils-constant=0.22 -perl-extutils-embed=1.28 -perl-extutils-install=1.55 -perl-extutils-makemaker=6.56 -perl-extutils-manifest=1.57 -perl-extutils-parsexs=2.21 -perl-file-fetch=0.24 -perl-file-path=2.08_01 -perl-file-temp=0.22 -perl-filter=1.37 -perl-filter-simple=0.84 -perl-getopt-long=2.38 -perl-if=0.05 -perl-io=1.25_02 -perl-io-compress=2.024 -perlio-via-quotedprint=0.06 -perl-io-zlib=1.10 -perl-ipc-cmd=0.54 -perl-ipc-sysv=2.01 -perl-libnet=1.22 -perl-locale-codes=2.07 -perl-locale-maketext=1.14 -perl-locale-maketext-simple=0.21 -perl-log-message=0.02 -perl-log-message-simple=0.06 -perl-math-bigint=1.89_01 -perl-math-bigint-fastcalc=0.19 -perl-math-bigrat=0.24 -perl-math-complex=1.56 -perl-memoize=1.01_03 -perl-mime-base64=3.08 -perl-module-build=0.3603 -perl-module-corelist=2.29 -perl-module-load=0.16 -perl-module-load-conditional=0.34 -perl-module-loaded=0.06 -perl-module-pluggable=3.9 -perl-net-ping=2.36 -perl-next=0.64 -perl-object-accessor=0.36 -perl-package-constants=0.02 -perl-params-check=0.26 -perl-parent=0.223 -perl-parse-cpan-meta=1.40 -perl-pathtools=3.31 -perl-pod-escapes=1.04 -perl-pod-latex=0.58 -perl-podlators=2.3.1 -perl-pod-parser=1.37 -perl-pod-perldoc=3.15_02 -perl-pod-plainer=1.02 -perl-pod-simple=3.14 -perl-safe=2.27 -perl-scalar-list-utils=1.22 -perl-selfloader=1.17 -perl-shell=0.72_01 -perl-storable=2.22 -perl-switch=2.16 -perl-sys-syslog=0.27 -perl-term-ansicolor=2.02 -perl-term-cap=1.12 -perl-term-ui=0.20 -perl-test=1.25_02 -perl-test-harness=3.17 -perl-test-simple=0.94 -perl-text-balanced=2.02 -perl-text-parsewords=3.27 -perl-text-soundex=3.03_01 -perl-text-tabs+wraps=2009.0305 -perl-thread-queue=2.11 -perl-threads=1.75 -perl-thread-semaphore=2.09 -perl-threads-shared=1.32 -perl-tie-file=0.97_02 -perl-tie-refhash=1.38 -perl-time-hires=1.9719 -perl-time-local=1.1901_01 -perl-time-piece=1.15_01 -perl-unicode-collate=0.52_01 -perl-unicode-normalize=1.03 -perl-version=0.82 -perl-win32=0.39 -perl-win32api-file=0.1101 -perl-xsloader=0.10 -) -options=('!makeflags' '!purge') +options=('makeflags' '!purge') +md5sums=('15a2f95fb27231e10998240f13acf961' + '5ed2542fdb9a60682f215bd33701e61a' + '1f0cbbee783e8a6d32f01be5118e0d5e' + '999c3eea6464860704abbb055a0f0896') + +# workaround to let the integrity check find the correct provides array +if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then + true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) +fi build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -141,6 +39,7 @@ build() { # for i686 arch_opts="" fi + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ @@ -149,14 +48,27 @@ build() { -Dsitearch=/usr/lib/perl5/site_perl \ -Dvendorlib=/usr/share/perl5/vendor_perl \ -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dotherlibdirs=/usr/lib/perl5/site_perl/5.10.1:/usr/share/perl5/site_perl/5.10.1:/usr/lib/perl5/current:/usr/lib/perl5/site_perl/current \ - -Dscriptdir=/usr/lib/perl5/core_perl/bin \ - -Dsitescript=/usr/lib/perl5/site_perl/bin \ - -Dvendorscript=/usr/lib/perl5/vendor_perl/bin \ + -Dscriptdir=/usr/bin/core_perl \ + -Dsitescript=/usr/bin/site_perl \ + -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness +# make test +} - make || return 1 +package() { + # hack to work around makepkg running the subshell in check_sanity() + new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) + provides=(${new_provides[@]}) + + cd ${srcdir}/${pkgname}-${pkgver} make install ### Perl Settings ### @@ -179,13 +91,15 @@ build() { -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - # Profile script so set paths to perl scripts. + # Profile script to set paths to perl scripts. install -D -m755 ${srcdir}/perlbin.sh \ ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/lib/perl5/core_perl/bin; \ - ln -sf c2ph pstruct; ln -sf s2p psed) + (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) grep -Rl "${pkgdir}" ${pkgdir}/usr | \ xargs sed -i "s^${pkgdir}^^g" @@ -200,4 +114,3 @@ build() { find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete } -md5sums=('f7f2d7f5aaac15a75028381b159a560f' '15f653f99b270ba91438cae91718c69f') diff --git a/abs/core/perl/archlinux-cpan-installdir.patch b/abs/core/perl/archlinux-cpan-installdir.patch deleted file mode 100644 index 1e005d8..0000000 --- a/abs/core/perl/archlinux-cpan-installdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Some modules which are included in the perl core set INSTALLDIRS => 'perl' -explicitly in Makefile.PL. This makes sense for the normal @INC ordering but -not for Arch Linux. Provide a sensible default. - -Thanks to Charles Mauch (xterminus) for his work on the initial patch. - ---- lib/CPAN/FirstTime.pm.orig 2007-11-04 22:35:31.000000000 -0500 -+++ lib/CPAN/FirstTime.pm 2007-11-04 22:37:59.000000000 -0500 -@@ -358,7 +358,7 @@ - - }; - -- $default = $CPAN::Config->{makepl_arg} || ""; -+ $default = $CPAN::Config->{makepl_arg} || "INSTALLDIRS=site"; - $CPAN::Config->{makepl_arg} = - prompt("Parameters for the 'perl Makefile.PL' command? - Typical frequently used settings: diff --git a/abs/core/perl/archlinux-inc-order.patch b/abs/core/perl/archlinux-inc-order.patch deleted file mode 100644 index a0c7a9c..0000000 --- a/abs/core/perl/archlinux-inc-order.patch +++ /dev/null @@ -1,101 +0,0 @@ -Tweak @INC so that the ordering is: - site (5.8.8) - vendor (all) - core (5.8.8) - obsolete (pre-5.8.8-9) vendor builds - -The rationale being that an admin (via site), or module packager (vendor) can -chose to shadow core modules when there is a newer version than is included in -core. - -Thanks to Charles Mauch (xterminus) for his work on the initial patch. - ---- perl.c.orig 2006-01-31 07:34:47.000000000 -0500 -+++ perl.c 2007-10-31 22:46:56.000000000 -0400 -@@ -4771,44 +4771,12 @@ - - /* Use the ~-expanded versions of APPLLIB (undocumented), - ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB -+ Arch Linux: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB PRIVLIB OTHER - */ - #ifdef APPLLIB_EXP - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); - #endif - --#ifdef ARCHLIB_EXP -- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); --#endif --#ifdef MACOS_TRADITIONAL -- { -- Stat_t tmpstatbuf; -- SV * privdir = NEWSV(55, 0); -- char * macperl = PerlEnv_getenv("MACPERL"); -- -- if (!macperl) -- macperl = ""; -- -- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); -- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -- incpush(SvPVX(privdir), TRUE, FALSE, TRUE); -- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); -- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -- incpush(SvPVX(privdir), TRUE, FALSE, TRUE); -- -- SvREFCNT_dec(privdir); -- } -- if (!PL_tainting) -- incpush(":", FALSE, FALSE, TRUE); --#else --#ifndef PRIVLIB_EXP --# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" --#endif --#if defined(WIN32) -- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); --#else -- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); --#endif -- - #ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -@@ -4850,6 +4818,40 @@ - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); - #endif - -+/* Arch Linux: core libs after site and vendor libs. */ -+#ifdef ARCHLIB_EXP -+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); -+#endif -+#ifdef MACOS_TRADITIONAL -+ { -+ Stat_t tmpstatbuf; -+ SV * privdir = NEWSV(55, 0); -+ char * macperl = PerlEnv_getenv("MACPERL"); -+ -+ if (!macperl) -+ macperl = ""; -+ -+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); -+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE); -+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); -+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE); -+ -+ SvREFCNT_dec(privdir); -+ } -+ if (!PL_tainting) -+ incpush(":", FALSE, FALSE, TRUE); -+#else -+#ifndef PRIVLIB_EXP -+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" -+#endif -+#if defined(WIN32) -+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); -+#else -+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); -+#endif -+ - #ifdef PERL_OTHERLIBDIRS - incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); - #endif diff --git a/abs/core/perl/digest_eval_hole.diff b/abs/core/perl/digest_eval_hole.diff new file mode 100644 index 0000000..4790413 --- /dev/null +++ b/abs/core/perl/digest_eval_hole.diff @@ -0,0 +1,61 @@ +From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001 +From: "Michael G. Schwern" <schwern@pobox.com> +Date: Mon, 3 Oct 2011 19:05:29 +0100 +Subject: Close the eval "require $module" security hole in + Digest->new($algorithm) + +Also the filter was incomplete. + +Bug-Debian: http://bugs.debian.org/644108 + +Patch-Name: fixes/digest_eval_hole.diff +--- + cpan/Digest/Digest.pm | 6 ++++-- + cpan/Digest/t/security.t | 14 ++++++++++++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + create mode 100644 cpan/Digest/t/security.t + +diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm +index 384dfc8..d714434 100644 +--- a/cpan/Digest/Digest.pm ++++ b/cpan/Digest/Digest.pm +@@ -24,7 +24,7 @@ sub new + shift; # class ignored + my $algorithm = shift; + my $impl = $MMAP{$algorithm} || do { +- $algorithm =~ s/\W+//; ++ $algorithm =~ s/\W+//g; + "Digest::$algorithm"; + }; + $impl = [$impl] unless ref($impl); +@@ -35,7 +35,9 @@ sub new + ($class, @args) = @$class if ref($class); + no strict 'refs'; + unless (exists ${"$class\::"}{"VERSION"}) { +- eval "require $class"; ++ my $pm_file = $class . ".pm"; ++ $pm_file =~ s{::}{/}g; ++ eval { require $pm_file }; + if ($@) { + $err ||= $@; + next; +diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t +new file mode 100644 +index 0000000..5cba122 +--- /dev/null ++++ b/cpan/Digest/t/security.t +@@ -0,0 +1,14 @@ ++#!/usr/bin/env perl ++ ++# Digest->new() had an exploitable eval ++ ++use strict; ++use warnings; ++ ++use Test::More tests => 1; ++ ++use Digest; ++ ++$LOL::PWNED = 0; ++eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; ++is $LOL::PWNED, 0; diff --git a/abs/core/perl/fix-h2ph-and-tests.patch b/abs/core/perl/fix-h2ph-and-tests.patch new file mode 100644 index 0000000..a2d176e --- /dev/null +++ b/abs/core/perl/fix-h2ph-and-tests.patch @@ -0,0 +1,104 @@ +From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 +From: Robin Barker <rmbarker@cpan.org> +Date: Thu, 22 Apr 2010 11:51:20 +0100 +Subject: [PATCH 1/1] Fix h2ph and test + +--- + lib/h2ph.t | 12 ++++++++++-- + utils/h2ph.PL | 28 +++++++++++++++++++++++----- + 2 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/lib/h2ph.t b/lib/h2ph.t +index 27dd7b9..8d62d46 100644 +--- a/lib/h2ph.t ++++ b/lib/h2ph.t +@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { + exit 0; + } + +-plan(4); ++plan(5); + + # quickly compare two text files + sub txt_compare { +@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', + stderr => 1 ); + like( $result, qr/syntax OK$/, "output compiles"); + ++$result = runperl( progfile => '_h2ph_pre.ph', ++ switches => ['-c'], ++ stderr => 1 ); ++like( $result, qr/syntax OK$/, "preamble compiles"); ++ + $result = runperl( switches => ["-w"], +- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); ++ stderr => 1, ++ prog => <<'PROG' ); ++$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); ++PROG + is( $result, '', "output free of warnings" ); + + # cleanup +diff --git a/utils/h2ph.PL b/utils/h2ph.PL +index 8f56db4..1255807 100644 +--- a/utils/h2ph.PL ++++ b/utils/h2ph.PL +@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { + exit $Exit; + + sub expr { +- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. ++ if (/\b__asm__\b/) { # freak out ++ $new = '"(assembly code)"'; ++ return ++ } + my $joined_args; + if(keys(%curargs)) { + $joined_args = join('|', keys(%curargs)); +@@ -770,7 +773,7 @@ sub inc_dirs + sub build_preamble_if_necessary + { + # Increment $VERSION every time this function is modified: +- my $VERSION = 2; ++ my $VERSION = 3; + my $preamble = "$Dest_dir/_h2ph_pre.ph"; + + # Can we skip building the preamble file? +@@ -798,7 +801,16 @@ sub build_preamble_if_necessary + # parenthesized value: d=(v) + $define{$_} = $1; + } +- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { ++ if (/^(\w+)\((\w)\)$/) { ++ my($macro, $arg) = ($1, $2); ++ my $def = $define{$_}; ++ $def =~ s/$arg/\$\{$arg\}/g; ++ print PREAMBLE <<DEFINE; ++unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } ++ ++DEFINE ++ } elsif ++ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { + # float: + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; +@@ -807,8 +819,14 @@ sub build_preamble_if_necessary + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; + } elsif ($define{$_} =~ /^\w+$/) { +- print PREAMBLE +- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; ++ my $def = $define{$_}; ++ if ($isatype{$def}) { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; ++ } else { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { &$def } }\n\n"; ++ } + } else { + print PREAMBLE + "unless (defined &$_) { sub $_() { \"", +-- +1.6.5.2.74.g610f9.dirty + diff --git a/abs/core/perl/perl-5.10.0-archlinux-cpan-installdir.patch b/abs/core/perl/perl-5.10.0-archlinux-cpan-installdir.patch deleted file mode 100644 index 0770a5e..0000000 --- a/abs/core/perl/perl-5.10.0-archlinux-cpan-installdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CPAN/FirstTime.pm.orig 2007-12-24 23:21:42.000000000 -0500 -+++ lib/CPAN/FirstTime.pm 2007-12-24 23:26:04.000000000 -0500 -@@ -940,7 +940,7 @@ - } - - if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { -- my_dflt_prompt(makepl_arg => "", $matcher); -+ my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); - my_dflt_prompt(make_arg => "", $matcher); - } - diff --git a/abs/core/perl/perl-5.10.0-archlinux-inc-order.patch b/abs/core/perl/perl-5.10.0-archlinux-inc-order.patch deleted file mode 100644 index 1c85eb8..0000000 --- a/abs/core/perl/perl-5.10.0-archlinux-inc-order.patch +++ /dev/null @@ -1,101 +0,0 @@ -Tweak @INC so that the ordering is: - site (5.8.8) - vendor (all) - core (5.8.8) - obsolete (pre-5.8.8-9) vendor builds - -The rationale being that an admin (via site), or module packager (vendor) can -chose to shadow core modules when there is a newer version than is included in -core. - -Thanks to Charles Mauch (xterminus) for his work on the initial patch. - ---- perl.c.orig 2007-12-18 05:47:08.000000000 -0500 -+++ perl.c 2007-12-24 23:15:23.000000000 -0500 -@@ -4748,44 +4748,12 @@ - - /* Use the ~-expanded versions of APPLLIB (undocumented), - ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB -+ Arch Linux: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB PRIVLIB OTHER - */ - #ifdef APPLLIB_EXP - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); - #endif - --#ifdef ARCHLIB_EXP -- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); --#endif --#ifdef MACOS_TRADITIONAL -- { -- Stat_t tmpstatbuf; -- SV * privdir = newSV(0); -- char * macperl = PerlEnv_getenv("MACPERL"); -- -- if (!macperl) -- macperl = ""; -- -- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); -- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); -- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); -- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); -- -- SvREFCNT_dec(privdir); -- } -- if (!PL_tainting) -- incpush(":", FALSE, FALSE, TRUE, FALSE); --#else --#ifndef PRIVLIB_EXP --# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" --#endif --#if defined(WIN32) -- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); --#else -- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); --#endif -- - #ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -@@ -4828,6 +4796,40 @@ - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); - #endif - -+/* Arch Linux: core libs after site and vendor libs. */ -+#ifdef ARCHLIB_EXP -+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); -+#endif -+#ifdef MACOS_TRADITIONAL -+ { -+ Stat_t tmpstatbuf; -+ SV * privdir = newSV(0); -+ char * macperl = PerlEnv_getenv("MACPERL"); -+ -+ if (!macperl) -+ macperl = ""; -+ -+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); -+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); -+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); -+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) -+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); -+ -+ SvREFCNT_dec(privdir); -+ } -+ if (!PL_tainting) -+ incpush(":", FALSE, FALSE, TRUE, FALSE); -+#else -+#ifndef PRIVLIB_EXP -+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" -+#endif -+#if defined(WIN32) -+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); -+#else -+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); -+#endif -+ - #ifdef PERL_OTHERLIBDIRS - incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE); - #endif diff --git a/abs/core/perl/perl-5.8.6-picdl.patch0 b/abs/core/perl/perl-5.8.6-picdl.patch0 deleted file mode 100644 index f69a680..0000000 --- a/abs/core/perl/perl-5.8.6-picdl.patch0 +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.SH.orig 2003-11-29 01:16:15.000000000 -0800 -+++ Makefile.SH 2003-11-29 01:16:52.000000000 -0800 -@@ -129,8 +129,8 @@ - - ;; - --*) pldlflags='' -- static_target='static' -+*) pldlflags="$cccdlflags" -+ static_target='static_pic' - ;; - esac - diff --git a/abs/core/perl/perl-5.8.8-gcc-4.2.0.patch b/abs/core/perl/perl-5.8.8-gcc-4.2.0.patch deleted file mode 100644 index 679a7ab..0000000 --- a/abs/core/perl/perl-5.8.8-gcc-4.2.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- perl-5.8.x/makedepend.SH 2006-06-13 15:31:22.000000000 -0400 -+++ perl-5.8.x-andy/makedepend.SH 2006-07-25 14:45:11.000000000 -0400 -@@ -167,6 +167,7 @@ - -e '/^#.*<builtin>/d' \ - -e '/^#.*<built-in>/d' \ - -e '/^#.*<command line>/d' \ -+ -e '/^#.*<command-line>/d' \ - -e '/^#.*"-"/d' \ - -e '/: file path prefix .* never used$/d' \ - -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ diff --git a/abs/core/perl/perl-5.8.8-utf-regexes.patch b/abs/core/perl/perl-5.8.8-utf-regexes.patch deleted file mode 100644 index 5799fff..0000000 --- a/abs/core/perl/perl-5.8.8-utf-regexes.patch +++ /dev/null @@ -1,59 +0,0 @@ -CVE-2007-5116 perl regular expression UTF parsing errors -https://bugzilla.redhat.com/show_bug.cgi?id=323571 - ---- regcomp.c 2006-01-08 12:59:27.000000000 -0800 -+++ regcomp.c 2007-10-05 12:07:55.000000000 -0700 -@@ -135,7 +135,8 @@ - I32 extralen; - I32 seen_zerolen; - I32 seen_evals; -- I32 utf8; -+ I32 utf8; /* pattern is utf8 or not */ -+ I32 orig_utf8; /* pattern was originally utf8 */ - #if ADD_TO_REGEXEC - char *starttry; /* -Dr: where regtry was called. */ - #define RExC_starttry (pRExC_state->starttry) -@@ -161,6 +162,7 @@ - #define RExC_seen_zerolen (pRExC_state->seen_zerolen) - #define RExC_seen_evals (pRExC_state->seen_evals) - #define RExC_utf8 (pRExC_state->utf8) -+#define RExC_orig_utf8 (pRExC_state->orig_utf8) - - #define ISMULT1(c) ((c) == '*' || (c) == '+' || (c) == '?') - #define ISMULT2(s) ((*s) == '*' || (*s) == '+' || (*s) == '?' || \ -@@ -1749,15 +1751,17 @@ - if (exp == NULL) - FAIL("NULL regexp argument"); - -- RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8; -+ RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8; - -- RExC_precomp = exp; - DEBUG_r({ - if (!PL_colorset) reginitcolors(); - PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n", - PL_colors[4],PL_colors[5],PL_colors[0], -- (int)(xend - exp), RExC_precomp, PL_colors[1]); -+ (int)(xend - exp), exp, PL_colors[1]); - }); -+ -+redo_first_pass: -+ RExC_precomp = exp; - RExC_flags = pm->op_pmflags; - RExC_sawback = 0; - -@@ -1783,6 +1787,17 @@ - RExC_precomp = Nullch; - return(NULL); - } -+ if (RExC_utf8 && !RExC_orig_utf8) { -+ STRLEN len = xend-exp; -+ DEBUG_r(PerlIO_printf(Perl_debug_log, -+ "UTF8 mismatch! Converting to utf8 for resizing and compile\n")); -+ exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len); -+ xend = exp + len; -+ RExC_orig_utf8 = RExC_utf8; -+ SAVEFREEPV(exp); -+ goto redo_first_pass; -+ } -+ diff --git a/abs/core/perl/perl.install b/abs/core/perl/perl.install index 6a9fc1c..a355c5b 100644 --- a/abs/core/perl/perl.install +++ b/abs/core/perl/perl.install @@ -8,11 +8,3 @@ post_install() { return 0 } -post_upgrade() { - echo '- The directories /usr/lib/perl5/current, /usr/lib/perl5/site_perl/current,' - echo ' /usr/lib/perl5/site_perl/5.10.1, and /usr/share/perl5/site_perl/5.10.1' - echo ' will be removed from @INC in a future release.' - - echo '- The directory /usr/bin/perlbin/site will not be added to $PATH in a' - echo ' future release.' -} diff --git a/abs/core/perl/perlbin.csh b/abs/core/perl/perlbin.csh new file mode 100644 index 0000000..535f0b1 --- /dev/null +++ b/abs/core/perl/perlbin.csh @@ -0,0 +1,15 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/abs/core/perl/perlbin.sh b/abs/core/perl/perlbin.sh index 665d5a8..20f8304 100755 --- a/abs/core/perl/perlbin.sh +++ b/abs/core/perl/perlbin.sh @@ -1,17 +1,16 @@ -# Set path to perl scripts. -# Remove the perlbin dirs in the next release. +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl -# Add dirs to path if they exist. -[ -d /usr/lib/perl5/site_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/perlbin/site ] && - PATH=$PATH:/usr/bin/perlbin/site -[ -d /usr/lib/perl5/vendor_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/perlbin/vendor ] && - PATH=$PATH:/usr/bin/perlbin/vendor -[ -d /usr/lib/perl5/core_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/core_perl/bin export PATH # If you have modules in non-standard directories you can add them here. diff --git a/abs/core/perl/provides.pl b/abs/core/perl/provides.pl new file mode 100644 index 0000000..d2cdc76 --- /dev/null +++ b/abs/core/perl/provides.pl @@ -0,0 +1,299 @@ +# provides.pl +## +# Script for printing out a provides list of every CPAN distribution +# that is bundled with perl. You can run it before building perl +# or you can run it after building perl. Required modules are in core +# for perl 5.13 and above. It might be nice if this didn't require +# HTTP::Tiny and maybe just used wget or curl. +# +# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at +# cpanmetadb.plackperl.org to cross-reference module files to their +# providing CPAN distribution. Thank you Miyagawa! +# +# - Justin "juster" Davis <jrcd83@gmail.com> + +use warnings 'FATAL' => 'all'; +use strict; + +package Common; + +sub evalver +{ + my ($path, $mod) = @_; + + open my $fh, '<', $path or die "open $path: $!"; + + my $m = ($mod + ? qr/(?:\$${mod}::VERSION|\$VERSION)/ + : qr/\$VERSION/); + + while (my $ln = <$fh>) { + next unless $ln =~ /\s*$m\s*=\s*.+/; + chomp $ln; + my $ver = do { no strict; eval $ln }; + return $ver unless $@; + die qq{$path:$. bad version string in "$ln"\n}; + } + + close $fh; + return undef; +} + + +#----------------------------------------------------------------------------- + +package Dists; + +sub maindistfile +{ + my ($dist, $dir) = @_; + + # libpath is the modern style, installing modules under lib/ + # with dirs matching the name components. + my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm"; + + # dumbpath is an old style where there's no subdirs and just + # a .pm file. + my $dumbpath = $dist; + $dumbpath =~ s/\A.+-//; + $dumbpath .= ".pm"; + + my @paths = ($libpath, $dumbpath); + # Some modules (with simple names like XSLoader, lib, etc) are + # generated by Makefile.PL. Search through their generating code. + push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0; + + for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; } + return undef; +} + +sub module_ver +{ + my ($dist, $dir) = @_; + + my $path = maindistfile($dist, $dir) or return undef; + + my $mod = $dist; + $mod =~ s/-/::/g; + my $ver = Common::evalver($path, $mod); + unless ($ver) { + warn "failed to find version in module file for $dist\n"; + return undef; + } + + return $ver; +} + +sub changelog_ver +{ + my ($dist, $dir) = @_; + + my $path; + for my $tmp (glob "$dir/{Changes,ChangeLog}") { + if (-f $tmp) { $path = $tmp; last; } + } + return undef unless $path; + + open my $fh, '<', $path or die "open: $!"; + while (<$fh>) { + return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/; + return $1 if /\A\s*version\s+([0-9._]+)/i; + } + close $fh; + + return undef; +} + +# for some reason podlators has a VERSION file with perl code in it +sub verfile_ver +{ + my ($dist, $dir) = @_; + + my $path = "$dir/VERSION"; + return undef unless -f $path; # no warning, only podlaters has it + + return Common::evalver($path); +} + +# scans a directory full of nicely separated dist. directories. +sub scan_distroot +{ + my ($distroot) = @_; + opendir my $cpand, "$distroot" or die "failed to open $distroot"; + my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand; + closedir $cpand; + + my @found; + for my $dist (@dists) { + my $distdir = "$distroot/$dist"; + my $ver = (module_ver($dist, $distdir) + || changelog_ver($dist, $distdir) + || verfile_ver($dist, $distdir)); + + if ($ver) { push @found, [ $dist, $ver ]; } + else { warn "failed to find version for $dist\n"; } + } + return @found; +} + +sub find +{ + my ($srcdir) = @_; + return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}"; +} + +#----------------------------------------------------------------------------- + +package Modules; + +use HTTP::Tiny qw(); +use File::Find qw(); +use File::stat; + +*findfile = *File::Find::find; + +sub cpan_provider +{ + my ($module) = @_; + my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module"; + my $http = HTTP::Tiny->new; + my $resp = $http->get($url); + return undef unless $resp->{'success'}; + + my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m + or return undef; + + my $dist = $cpanpath; + $dist =~ s{\A.+/}{}; # remove author directory + $dist =~ s{-[^-]+\z}{}; # remove version and extension + return ($dist eq 'perl' ? undef : $dist); +} + +sub find +{ + my ($srcdir) = @_; + my $libdir = "$srcdir/lib/"; + die "failed to find $libdir directory" unless -d $libdir; + + # Find only the module files that have not changed since perl + # was extracted. We don't want the files perl just recently + # installed into lib/. We processed those already. + my @modfiles; + my $finder = sub { + return unless /[.]pm\z/; + return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules + push @modfiles, $_; + }; + findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); + + # First we have to find what the oldest ctime actually is. + my $oldest = time; + @modfiles = map { + my $modfile = $_; + my $ctime = (stat $modfile)->ctime; + $oldest = $ctime if $ctime < $oldest; + [ $modfile, $ctime ]; # save ctime for later + } @modfiles; + + # Then we filter out any file that was created more than a + # few seconds after that. Process the rest. + my @mods; + for my $modfile (@modfiles) { + my ($mod, $ctime) = @$modfile; + next if $ctime - $oldest > 5; # ignore newer files + + my $path = $mod; + $mod =~ s{[.]pm\z}{}; + $mod =~ s{\A$libdir}{}; + $mod =~ s{/}{::}g; + + my $ver = Common::evalver($path, $mod) || q{}; + push @mods, [ $mod, $ver ]; + } + + # Convert modules names to the dist names who provide them. + my %seen; + my @dists; + for my $modref (@mods) { + my ($mod, $ver) = @$modref; + my $dist = cpan_provider($mod) or next; # filter out core modules + next if $seen{$dist}++; # avoid duplicate dists + push @dists, [ $dist, $ver ]; + } + return @dists; +} + +#----------------------------------------------------------------------------- + +package Dist2Pkg; + +sub name +{ + my ($name) = @_; + my $orig = $name; + + # Package names should be lowercase and consist of alphanumeric + # characters only (and hyphens!)... + $name =~ tr/A-Z/a-z/; + $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap) + $name =~ tr/-a-z0-9+//cd; # Delete all other chars. + $name =~ tr/-/-/s; + + # Delete leading or trailing hyphens... + $name =~ s/\A-|-\z//g; + + die qq{Dist. name '$orig' completely violates packaging standards} + unless $name; + + return "perl-$name"; +} + +sub version +{ + my ($version) = @_; + + # Package versions should be numbers and decimal points only... + $version =~ tr/-/./; + $version =~ tr/_0-9.-//cd; + + # Remove developer versions because pacman has no special logic + # to compare them to regular versions like perl does. + $version =~ s/_[^_]+\z//; + + $version =~ tr/_//d; # delete other underscores + $version =~ tr/././s; # only one period at a time + $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period + + return $version; +} + +#----------------------------------------------------------------------------- + +package main; + +my %CPANNAME = ('List-Util' => 'Scalar-List-Utils', + 'Text-Tabs' => 'Text-Tabs+Wrap', + 'Cwd' => 'PathTools'); + +my $perldir = shift or die "Usage: $0 [path to perl source directory]\n"; +die "$perldir is not a valid directory." unless -d $perldir; + +my @dists = (Dists::find($perldir), Modules::find($perldir)); +for my $dist (@dists) { + my $name = $dist->[0]; + $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name}; +} + +my @pkgs = map { + my ($name, $ver) = @$_; + $name = Dist2Pkg::name($name); + $ver = Dist2Pkg::version($ver); + [ $name, $ver ]; +} @dists; + +@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs; + +for my $pkg (@pkgs) { + my ($name, $ver) = @$pkg; + print "$name=$ver\n"; +} diff --git a/abs/core/perl_modules/libxml-perl/PKGBUILD b/abs/core/perl_modules/libxml-perl/PKGBUILD index 5867a11..474d3eb 100644 --- a/abs/core/perl_modules/libxml-perl/PKGBUILD +++ b/abs/core/perl_modules/libxml-perl/PKGBUILD @@ -1,11 +1,12 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 55561 2011-09-14 10:11:00Z andrea $ +# Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=libxml-perl pkgver=0.08 -pkgrel=1 +pkgrel=3 pkgdesc="Perl library for working with XML" -arch=('i686' 'x86_64') +arch=('any') url="http://search.cpan.org/~KMACLEOD/libxml-perl" license=('GPL' 'PerlArtistic') depends=('perlxml>=2.19') @@ -14,10 +15,15 @@ source=(http://www.cpan.org/authors/id/K/KM/KMACLEOD/libxml-perl-$pkgver.tar.gz) md5sums=('0ed5fbdda53d1301ddaed88db10503bb') build() { - cd $startdir/src/libxml-perl-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}"/$pkgname-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + + find "${pkgdir}" -name '.packlist' -delete + find "${pkgdir}" -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-archive-zip/PKGBUILD b/abs/core/perl_modules/perl-archive-zip/PKGBUILD index 0559fe6..62ace36 100644 --- a/abs/core/perl_modules/perl-archive-zip/PKGBUILD +++ b/abs/core/perl_modules/perl-archive-zip/PKGBUILD @@ -1,28 +1,28 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 150362 2012-02-17 07:51:32Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=perl-archive-zip _realname=Archive-Zip -pkgver=1.23 -pkgrel=2 +pkgver=1.30 +pkgrel=3 pkgdesc="Provide a perl interface to ZIP archive files" -arch=(i686 x86_64) +arch=(any) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realname}-${pkgver}.tar.gz) -md5sums=('7ffcbdc1b603307235fb8d42084cb84d') - +md5sums=('40153666e7538b410e001aa8a810e702') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} } diff --git a/abs/core/perl_modules/perl-class-factory-util/PKGBUILD b/abs/core/perl_modules/perl-class-factory-util/PKGBUILD index dadcff8..c9da049 100644 --- a/abs/core/perl_modules/perl-class-factory-util/PKGBUILD +++ b/abs/core/perl_modules/perl-class-factory-util/PKGBUILD @@ -1,8 +1,9 @@ -# $Id:$ +# $Id: PKGBUILD 65743 2012-02-22 12:12:49Z spupykin $ + pkgname=perl-class-factory-util _realname=Class-Factory-Util pkgver=1.7 -pkgrel=1 +pkgrel=4 pkgdesc="Provide utility methods for factory classes" arch=(i686 x86_64) license=('GPL' 'Artistic') @@ -16,12 +17,15 @@ md5sums=('aebd79da361b676a7ecd3245fc3d1b3f') build() { cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${pkgdir} || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete } - diff --git a/abs/core/perl_modules/perl-class-load/PKGBUILD b/abs/core/perl_modules/perl-class-load/PKGBUILD new file mode 100644 index 0000000..1fc20c4 --- /dev/null +++ b/abs/core/perl_modules/perl-class-load/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 73839 2012-07-16 05:39:18Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-class-load +pkgver=0.20 +pkgrel=1 +pkgdesc="a working (require 'Class::Name') and more" +arch=('any') +license=('PerlArtistic' 'GPL') +url="http://search.cpan.org/dist/Class-Load" +options=(!emptydirs) +depends=('perl' 'perl-module-runtime' 'perl-data-optlist' 'perl-package-stash>=0.32' + 'perl-try-tiny' 'perl-test-fatal' 'perl-module-implementation') +source=(http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Load-$pkgver.tar.gz) +md5sums=('9ccb131338a6cf1318599c08c095cf72') + +build() { + cd "${srcdir}/Class-Load-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +# make test + make install DESTDIR=${pkgdir} + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/abs/core/perl_modules/perl-class-singleton/PKGBUILD b/abs/core/perl_modules/perl-class-singleton/PKGBUILD index 60f71b9..1f80ce9 100644 --- a/abs/core/perl_modules/perl-class-singleton/PKGBUILD +++ b/abs/core/perl_modules/perl-class-singleton/PKGBUILD @@ -1,12 +1,14 @@ +# $Id: PKGBUILD 65747 2012-02-22 12:14:00Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-singleton pkgver=1.4 -pkgrel=2 +pkgrel=4 pkgdesc="Implementation of a "Singleton" class" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~ABW/Class-Singleton" +arch=('any') +url="http://search.cpan.org/dist/Class-Singleton" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') @@ -14,10 +16,10 @@ source=(http://www.cpan.org/authors/id/A/AB/ABW/Class-Singleton-$pkgver.tar.gz) md5sums=('a18b108ab97e2107cbbe816d2b3e2ee3') build() { - cd $startdir/src/Class-Singleton-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Class-Singleton-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-convert-binhex/PKGBUILD b/abs/core/perl_modules/perl-convert-binhex/PKGBUILD new file mode 100644 index 0000000..9b2311b --- /dev/null +++ b/abs/core/perl_modules/perl-convert-binhex/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 143927 2011-11-30 21:19:35Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Techlive Zheng <techlivezheng [at] gmail [dot] com> +# Contributor: Jakub Fišer <mr [at] MikyMaus [dot] org> +# Contributor: Filip S. Adamsen <fsa [at] fsadev [dot] com> + +pkgname=perl-convert-binhex +pkgver=1.119 +pkgrel=4 +pkgdesc="Perl module to extract data from Macintosh BinHex files" +arch=('any') +url="http://search.cpan.org/~eryq/Convert-BinHex-1.119/" +license=('PerlArtistic') +depends=('perl') +options=('!emptydirs') +install=${pkgname}.install +source=("http://search.cpan.org/CPAN/authors/id/E/ER/ERYQ/Convert-BinHex-$pkgver.tar.gz") +md5sums=('ba70ad1772abac6270078f28197a7961') + +build() { + cd "${srcdir}/Convert-BinHex-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/Convert-BinHex-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + # remove perllocal.pod and .packlist + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete +} diff --git a/abs/core/perl_modules/perl-convert-binhex/perl-convert-binhex.install b/abs/core/perl_modules/perl-convert-binhex/perl-convert-binhex.install new file mode 100644 index 0000000..398bfbe --- /dev/null +++ b/abs/core/perl_modules/perl-convert-binhex/perl-convert-binhex.install @@ -0,0 +1,8 @@ +post_install() { + echo -n "module test... " + perl -mConvert::BinHex -e "exit 0;" 2> /dev/null && echo 'pass.' || echo 'fail.' +} + +post_upgrade() { + post_install +} diff --git a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD index bc561d6..ccaab5e 100644 --- a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD +++ b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 160515 2012-06-02 10:27:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.58 -pkgrel=3 +pkgrel=4 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/abs/core/perl_modules/perl-data-optlist/PKGBUILD b/abs/core/perl_modules/perl-data-optlist/PKGBUILD new file mode 100644 index 0000000..162c662 --- /dev/null +++ b/abs/core/perl_modules/perl-data-optlist/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57546 2011-10-30 17:27:04Z juster $ + +pkgname=perl-data-optlist +pkgver=0.107 +pkgrel=1 +pkgdesc="parse and validate simple name/value option pairs" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl-params-util' 'perl-scalar-list-utils' 'perl-sub-install>=0.921') +makedepends=('perl-extutils-makemaker>=6.30') +checkdepends=('perl-test-simple') +url=https://metacpan.org/release/Data-OptList +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-${pkgver}.tar.gz") +md5sums=(17177b3cfb8941780a8736f9b9b30421) +sha512sums=(06d0ca9b2f6142ea4c0de8c6f858bd96fb3964490e50f1caa677e2d53e144a4ce6c89097ad99d390ea86436923a449df8a38bd9064b0b91290b836f084d765f2) +_distdir="${srcdir}/Data-OptList-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-date-manip/PKGBUILD b/abs/core/perl_modules/perl-date-manip/PKGBUILD index be50d1a..0ef2f9c 100644 --- a/abs/core/perl_modules/perl-date-manip/PKGBUILD +++ b/abs/core/perl_modules/perl-date-manip/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 161416 2012-06-11 02:54:05Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=perl-date-manip _realname=Date-Manip -pkgver=5.54 +pkgver=6.32 pkgrel=1 pkgdesc="Date::Manip - date manipulation routines" -arch=(i686 x86_64) +arch=('any') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') -options=(!emptydirs) +depends=('perl-yaml-syck') +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/${_realname}-${pkgver}.tar.gz) -md5sums=('16c343329bad644b17f4f8ec5fb243cf') +md5sums=('0d5c1ee2f75f6407fb1035e3535f650b') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Build.PL installdirs=vendor destdir="${pkgdir}" + perl Build +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Build install } diff --git a/abs/core/perl_modules/perl-datetime-format-builder/PKGBUILD b/abs/core/perl_modules/perl-datetime-format-builder/PKGBUILD index 10df715..71c3ed6 100644 --- a/abs/core/perl_modules/perl-datetime-format-builder/PKGBUILD +++ b/abs/core/perl_modules/perl-datetime-format-builder/PKGBUILD @@ -1,9 +1,9 @@ -# CPAN Name : DateTime-Format-Builder +# $Id: PKGBUILD 65778 2012-02-22 12:27:49Z spupykin $ # Contributor: Caleb Cushing <xenoterracide@gmail.com> -# Generator : CPANPLUS::Dist::Arch 0.18 + pkgname=perl-datetime-format-builder pkgver=0.8000 -pkgrel=3 +pkgrel=6 pkgdesc="Create DateTime parser classes and objects" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') @@ -15,14 +15,16 @@ source=('http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Format-Bui md5sums=('f6c5d5a17b5b7478ff555a2d3cce5136') build() { - DIST_DIR="${srcdir}/DateTime-Format-Builder-0.80" export PERL_MM_USE_DEFAULT=1 - { cd "$DIST_DIR" && - perl Makefile.PL INSTALLDIRS=vendor && - make && - make test && - make DESTDIR="$pkgdir" install; - } || return 1; + + cd "${srcdir}/DateTime-Format-Builder-0.80" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/DateTime-Format-Builder-0.80" + make DESTDIR="$pkgdir" install find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/abs/core/perl_modules/perl-datetime-format-iso8601/PKGBUILD b/abs/core/perl_modules/perl-datetime-format-iso8601/PKGBUILD index 360b88a..c8e07df 100644 --- a/abs/core/perl_modules/perl-datetime-format-iso8601/PKGBUILD +++ b/abs/core/perl_modules/perl-datetime-format-iso8601/PKGBUILD @@ -1,26 +1,32 @@ +# $Id: PKGBUILD 66111 2012-02-23 01:12:06Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=perl-datetime-format-iso8601 -pkgver=0.07 +pkgver=0.08 pkgrel=1 -pkgdesc="Parses ISO8601 formats." -arch=('i686' 'x86_64') +pkgdesc="Parses ISO8601 formats" +arch=('any') url="http://search.cpan.org/dist/DateTime-Format-ISO8601/" license=('PerlArtistic') -depends=('perl-datetime-format-builder>=0.770.0' 'perl-datetime>=0.18') -#makedepends=('perl-module-build>=0.350.0') +depends=('perl-datetime-format-builder' 'perl-datetime') +makedepends=() optdepends=('perl-file-find-rule' 'perl-test-distribution' 'perl-test-pod') options=(!emptydirs) source=("http://search.cpan.org/CPAN/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-$pkgver.tar.gz") -md5sums=('debb51180d0318ae09cad01c544a1d7d') +md5sums=('b7c0a4b5e767a8d3b87f3dc678d8c30c') build() { cd $srcdir/DateTime-Format-ISO8601-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR="${pkgdir}" || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/DateTime-Format-ISO8601-$pkgver + make install DESTDIR="${pkgdir}" find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete } diff --git a/abs/core/perl_modules/perl-datetime-locale/PKGBUILD b/abs/core/perl_modules/perl-datetime-locale/PKGBUILD index c775d0d..219e9c2 100644 --- a/abs/core/perl_modules/perl-datetime-locale/PKGBUILD +++ b/abs/core/perl_modules/perl-datetime-locale/PKGBUILD @@ -1,23 +1,24 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 65785 2012-02-22 12:32:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime-locale -pkgver=0.42 -pkgrel=1 +pkgver=0.45 +pkgrel=2 pkgdesc="Localization support for DateTime.pm " -arch=('i686' 'x86_64') -url="http://search.cpan.org/~DROLSKY/DateTime-Locale" +arch=(any) +url="http://search.cpan.org/dist/DateTime-Locale" license=('GPL' 'PerlArtistic') depends=('perl-params-validate' 'perl-list-moreutils') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-$pkgver.tar.gz) +md5sums=('8ba6a4b70f8fa7d987529c2e2c708862') build() { - cd $startdir/src/DateTime-Locale-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/DateTime-Locale-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } -md5sums=('2f40350ef1c697f1bc402220824f6a7a') diff --git a/abs/core/perl_modules/perl-datetime-timezone/PKGBUILD b/abs/core/perl_modules/perl-datetime-timezone/PKGBUILD index 65c7e9d..7fe325f 100644 --- a/abs/core/perl_modules/perl-datetime-timezone/PKGBUILD +++ b/abs/core/perl_modules/perl-datetime-timezone/PKGBUILD @@ -1,23 +1,28 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 73843 2012-07-16 05:40:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime-timezone -pkgver=0.84 +pkgver=1.46 pkgrel=1 pkgdesc="Time zone object base class and factory " -arch=('i686' 'x86_64') -url="http://search.cpan.org/~DROLSKY/DateTime-TimeZone" +arch=(any) +url="http://search.cpan.org/dist/DateTime-TimeZone" license=('GPL' 'PerlArtistic') -depends=('perl-class-singleton>=1.03' 'perl-params-validate>=0.72') +depends=('perl-class-singleton>=1.03' 'perl-params-validate>=0.72' 'perl-class-load') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-$pkgver.tar.gz) +md5sums=('e83f412286d7787e3dfd5427a1943569') build() { - cd $startdir/src/DateTime-TimeZone-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/DateTime-TimeZone-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/DateTime-TimeZone-$pkgver + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } -md5sums=('e6f36fa00425d64377aeae74a7da0ac3') diff --git a/abs/core/perl_modules/perl-datetime/PKGBUILD b/abs/core/perl_modules/perl-datetime/PKGBUILD index 0b32ce3..839ff1c 100644 --- a/abs/core/perl_modules/perl-datetime/PKGBUILD +++ b/abs/core/perl_modules/perl-datetime/PKGBUILD @@ -1,29 +1,37 @@ -# $Id: PKGBUILD 31942 2010-11-08 11:04:10Z spupykin $ +# $Id: PKGBUILD 71765 2012-06-02 10:29:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.65 -pkgrel=1 +pkgver=0.72 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" license=('GPL' 'PerlArtistic') -depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' 'perl-params-validate>=0.76') +depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' + 'perl-params-validate>=0.76' 'perl-math-round') LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") -options=('!emptydirs' 'force') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('99fd327152d3a462ba575c8c74d5cb65') +md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') build() { cd $srcdir/DateTime-$pkgver - perl Build.PL installdirs=vendor destdir="$pkgdir/" ./Build +} + +check() { + cd $srcdir/DateTime-$pkgver # ./Build test - ./Build install + true +} +package() { + cd $srcdir/DateTime-$pkgver + ./Build install find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-dbd-mysql/PKGBUILD b/abs/core/perl_modules/perl-dbd-mysql/PKGBUILD index 03e801a..889f627 100644 --- a/abs/core/perl_modules/perl-dbd-mysql/PKGBUILD +++ b/abs/core/perl_modules/perl-dbd-mysql/PKGBUILD @@ -1,34 +1,45 @@ -# $Id: PKGBUILD 82506 2010-06-12 19:27:47Z kevin $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 161944 2012-06-16 19:18:00Z eric $ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.014 -pkgrel=2 +pkgver=4.021 +pkgrel=1 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi' 'perl>=5.10.0') +depends=('libmysqlclient' 'perl-dbi') makedepends=('mysql') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('74f118a4984e6a49f8ece28e68caf543') +md5sums=('35653efca4bbe6e49ef31d237b4a50b7') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 + perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql + make } -package() { - cd ${srcdir}/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} || return 1 +check() { + cd "${srcdir}/${_realname}-${pkgver}" + mkdir -p /tmp/mysql_test + mysql_install_db \ + --basedir=/usr \ + --datadir=/tmp/mysql_test + mysqld -P 17999 \ + --socket=/tmp/socket.mysql \ + --datadir=/tmp/mysql_test & + sleep 10 + DAEMON_PORT=$! + make test || true + kill -9 $DAEMON_PORT +} - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } diff --git a/abs/core/perl_modules/perl-dbi/PKGBUILD b/abs/core/perl_modules/perl-dbi/PKGBUILD index 8bc53e3..602acd0 100644 --- a/abs/core/perl_modules/perl-dbi/PKGBUILD +++ b/abs/core/perl_modules/perl-dbi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id$ +# $Id: PKGBUILD 163571 2012-07-16 03:09:15Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> pkgname=perl-dbi _realname=DBI -pkgver=1.616 -pkgrel=2 +pkgver=1.622 +pkgrel=1 pkgdesc="Database independent interface for Perl" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.12.1') -options=(!emptydirs) +depends=('perl') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('799313e54a693beb635b47918458f7c4') +md5sums=('9836bcf1b9acc842089aa10b16736909') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -21,6 +21,10 @@ build() { # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/abs/core/perl_modules/perl-dist-checkconflicts/PKGBUILD b/abs/core/perl_modules/perl-dist-checkconflicts/PKGBUILD new file mode 100644 index 0000000..fc8bd28 --- /dev/null +++ b/abs/core/perl_modules/perl-dist-checkconflicts/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57550 2011-10-30 17:28:15Z juster $ + +pkgname=perl-dist-checkconflicts +pkgver=0.02 +pkgrel=1 +pkgdesc="declare version conflicts for your dist" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl-list-moreutils>=0.12' 'perl-sub-exporter') +makedepends=('perl-extutils-makemaker>=6.31') +checkdepends=('perl-test-fatal' 'perl-test-simple') +url=https://metacpan.org/release/Dist-CheckConflicts +source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Dist-CheckConflicts-${pkgver}.tar.gz") +md5sums=(64b8d342ba11336b2969c274a60bbc5f) +sha512sums=(e3a342141b13e3604f226d53706fa50b6dc9f96c39ad9c83b074289aff852cbbab97bdf7d389d426116f609589e3d0282b033e79230a5a4ed8782e2b0e58426d) +_distdir="${srcdir}/Dist-CheckConflicts-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-email-date-format/PKGBUILD b/abs/core/perl_modules/perl-email-date-format/PKGBUILD new file mode 100644 index 0000000..6625738 --- /dev/null +++ b/abs/core/perl_modules/perl-email-date-format/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 150522 2012-02-18 12:04:18Z allan $ +# Maintainer: +# Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> + +pkgname=perl-email-date-format +pkgver=1.002 +pkgrel=3 +pkgdesc="produce RFC 2822 date strings" +arch=('any') +url="http://search.cpan.org/dist/Email-Date-Format" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/R/RJ/RJBS/Email-Date-Format-$pkgver.tar.gz") +md5sums=('7ae25275da6ab272aa8b40141eac9f82') + +build() { + cd "${srcdir}"/Email-Date-Format-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}"/Email-Date-Format-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/perl_modules/perl-encode-locale/PKGBUILD b/abs/core/perl_modules/perl-encode-locale/PKGBUILD new file mode 100644 index 0000000..05b129b --- /dev/null +++ b/abs/core/perl_modules/perl-encode-locale/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 150524 2012-02-18 12:06:36Z allan $ + +pkgname=perl-encode-locale +pkgver=1.03 +pkgrel=1 +pkgdesc="Determine the locale encoding" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.008') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/Encode-Locale +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Encode-Locale-1.02.tar.gz) +md5sums=('96a950ee9b57e47e2b990b4c5dd7bf6e') +sha512sums=('7263de267486c835f37dd51da573c5002921a8365124e03eeed1e7a97bac368fff42351d6d31e05d3e596f3486ca5506d985f3992652908948006701d21663cf') +_distdir="${srcdir}/Encode-Locale-1.02" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-error/perl-error-0.17016-2-x86_64-build.log.1 b/abs/core/perl_modules/perl-error/perl-error-0.17016-2-x86_64-build.log.1 new file mode 100644 index 0000000..92c6633 --- /dev/null +++ b/abs/core/perl_modules/perl-error/perl-error-0.17016-2-x86_64-build.log.1 @@ -0,0 +1,72 @@ +Checking if your kit is complete... +Looks good +Writing Makefile for Error +Writing MYMETA.yml and MYMETA.json +cp lib/Error.pm blib/lib/Error.pm +cp lib/Error/Simple.pm blib/lib/Error/Simple.pm +Manifying blib/man3/Error.3pm +Manifying blib/man3/Error::Simple.3pm +PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t +t/01throw.t .......................... ok +t/02order.t .......................... ok +t/03throw-non-Error.t ................ ok +t/04use-base-Error-Simple.t .......... ok +t/05text-errors-with-file-handles.t .. ok +t/06customize-text-throw.t ........... ok +t/07try-in-obj-destructor.t .......... ok + +# Failed test 'warn \n-terminated STDERR' +# at t/08warndie.t line 77. +# 'A warning at t/08warndie.t line 73.: +# main::__ANON__() called at t/08warndie.t line 37 +# main::run_kid('CODE(0x1c905f0)') called at t/08warndie.t line 74 +# ' +# doesn't match '(?^:^A warning at (?^:t\/08warndie\.t) line 73: +# \tmain::__ANON__\(\) called at (?^:t\/08warndie\.t) line 37 +# \tmain::run_kid\('CODE\(0x[0-9a-f]+\)'\) called at (?^:t\/08warndie\.t) line 74 +# $)' + +# Failed test 'warn unterminated STDERR' +# at t/08warndie.t line 89. +# 'A warning at t/08warndie.t line 85.: +# main::__ANON__() called at t/08warndie.t line 37 +# main::run_kid('CODE(0x1c908f0)') called at t/08warndie.t line 86 +# ' +# doesn't match '(?^:^A warning at (?^:t\/08warndie\.t) line 85: +# \tmain::__ANON__\(\) called at (?^:t\/08warndie\.t) line 37 +# \tmain::run_kid\('CODE\(0x[0-9a-f]+\)'\) called at (?^:t\/08warndie\.t) line 86 +# $)' + +# Failed test 'Custom warn STDERR' +# at t/08warndie.t line 192. +# 'My custom warning here: A warning at t/08warndie.t line 188.: +# main::__ANON__() called at t/08warndie.t line 37 +# main::run_kid('CODE(0x1c953e8)') called at t/08warndie.t line 189 +# ' +# doesn't match '(?^:^My custom warning here: A warning at (?^:t\/08warndie\.t) line 188: +# \tmain::__ANON__\(\) called at (?^:t\/08warndie\.t) line 37 +# \tmain::run_kid\('CODE\(0x[0-9a-f]+\)'\) called at (?^:t\/08warndie\.t) line 189 +# $)' +# Looks like you failed 3 tests of 21. +t/08warndie.t ........................ +Dubious, test returned 3 (wstat 768, 0x300) +Failed 3/21 subtests +t/09dollar-at.t ...................... ok +t/10throw-in-catch.t ................. ok +t/11rethrow.t ........................ ok +t/12wrong-error-var.t ................ ok +t/13except-arg0.t .................... ok +t/pod-coverage.t ..................... skipped: Test::Pod::Coverage 1.04 required for testing POD coverage +t/pod.t .............................. ok + +Test Summary Report +------------------- +t/08warndie.t (Wstat: 768 Tests: 21 Failed: 3) + Failed tests: 4, 6, 18 + Non-zero exit status: 3 +Files=15, Tests=62, 0 wallclock secs ( 0.05 usr 0.02 sys + 0.23 cusr 0.04 csys = 0.34 CPU) +Result: FAIL +Failed 1/15 test programs. 3/62 subtests failed. +make: *** [test_dynamic] Error 255 +[1m[31m==> ERROR:(B[m[1m A failure occurred in build().(B[m +[1m Aborting...(B[m diff --git a/abs/core/perl_modules/perl-fcgi/PKGBUILD b/abs/core/perl_modules/perl-fcgi/PKGBUILD index 3a97d1e..a03c4ba 100644 --- a/abs/core/perl_modules/perl-fcgi/PKGBUILD +++ b/abs/core/perl_modules/perl-fcgi/PKGBUILD @@ -1,23 +1,31 @@ -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi -pkgver=0.71 -pkgrel=1 +pkgver=0.74 +pkgrel=3 pkgdesc="Fast CGI" arch=('i686' 'x86_64') -url="http://search.cpan.org/~SKIMO/FCGI" +url="http://search.cpan.org/dist/FCGI" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-$pkgver.tar.gz) +source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz") +md5sums=('462a77a0072480fea791a4d3095eb486') build() { - cd $startdir/src/FCGI-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/FCGI-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/FCGI-${pkgver}" + make test +} + +package() { + cd "${srcdir}/FCGI-${pkgver}" + make install DESTDIR="${pkgdir}" } -md5sums=('26bc4ea53ccc9c9c16695e88e46a1cfb') diff --git a/abs/core/perl_modules/perl-file-listing/PKGBUILD b/abs/core/perl_modules/perl-file-listing/PKGBUILD new file mode 100644 index 0000000..8656fc1 --- /dev/null +++ b/abs/core/perl_modules/perl-file-listing/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Justin "juster" Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 150631 2012-02-19 01:02:52Z allan $ + +pkgname=perl-file-listing +pkgver=6.04 +pkgrel=1 +pkgdesc="parse directory listing" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.8' 'perl-http-date>=6') +conflicts=('perl-libwww<6') +url="http://search.cpan.org/dist/File-Listing" +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-${pkgver}.tar.gz") +md5sums=('83f636b477741f3a014585bb9cc079a6') +sha512sums=('a84198bc82003daaf88ed23218e34a7a1552dcd2855a9563e9609ce5df167a8295043501534c31614854fc8dd9c04b4af27b4d7320112c613914f94c86c2eeb2') +_distdir="${srcdir}/File-Listing-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-html-form/PKGBUILD b/abs/core/perl_modules/perl-html-form/PKGBUILD new file mode 100644 index 0000000..f14fb80 --- /dev/null +++ b/abs/core/perl_modules/perl-html-form/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 69178 2012-04-10 00:11:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> + +pkgname=perl-html-form +pkgver=6.03 +pkgrel=1 +pkgdesc="Class that represents an HTML form element" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.8' 'perl-html-parser' 'perl-http-message' 'perl-uri>=1.10') +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTML-Form +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Form-${pkgver}.tar.gz") +md5sums=('fa6c2680207ed4fef5ea2ef09c210614') + +build() { + cd "${srcdir}/HTML-Form-${pkgver}" + PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null perl Makefile.PL + make +} + +check() { + cd "${srcdir}/HTML-Form-${pkgver}" +# PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test +} + +package() { + cd "${srcdir}/HTML-Form-${pkgver}" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} diff --git a/abs/core/perl_modules/perl-html-parser/PKGBUILD b/abs/core/perl_modules/perl-html-parser/PKGBUILD index e507ceb..b30443f 100644 --- a/abs/core/perl_modules/perl-html-parser/PKGBUILD +++ b/abs/core/perl_modules/perl-html-parser/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.68 +pkgver=3.69 pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') @@ -14,13 +14,17 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl-html-tagset' 'perl>=5.12.1') options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') +md5sums=('d22cc6468ce670a56034be907e4e7c54') build() { cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/abs/core/perl_modules/perl-html-tagset/PKGBUILD b/abs/core/perl_modules/perl-html-tagset/PKGBUILD index b7bb3bc..3c69273 100644 --- a/abs/core/perl_modules/perl-html-tagset/PKGBUILD +++ b/abs/core/perl_modules/perl-html-tagset/PKGBUILD @@ -1,13 +1,13 @@ -# $Id$ +# $Id: PKGBUILD 150635 2012-02-19 01:16:52Z allan $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-html-tagset _realname=HTML-Tagset pkgver=3.20 -pkgrel=2 +pkgrel=3 pkgdesc="Data tables useful in parsing HTML" -arch=(any) +arch=('any') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') @@ -22,15 +22,16 @@ build() { # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd ${srcdir}/${_realname}-${pkgver} make test } package() { cd ${srcdir}/${_realname}-${pkgver} make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete } + # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-http-cookies/PKGBUILD b/abs/core/perl_modules/perl-http-cookies/PKGBUILD new file mode 100644 index 0000000..578f05f --- /dev/null +++ b/abs/core/perl_modules/perl-http-cookies/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 150637 2012-02-19 01:19:55Z allan $ + +pkgname=perl-http-cookies +pkgver=6.01 +pkgrel=1 +pkgdesc="HTTP cookie jars" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.8.8' 'perl-http-date>=6' 'perl-http-message') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTTP-Cookies +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Cookies-6.00.tar.gz) +md5sums=('21bed72b30a46604c152b7e25cf1cb45') +sha512sums=('6399383e61a2fbad1dd130e67f51be32c118ed104065c109cde1e1262aed986fe3790231937dbdee861755bb58d365bc6f1dec316750f02700fce5014d1a1753') +_distdir="${srcdir}/HTTP-Cookies-6.00" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-http-daemon/PKGBUILD b/abs/core/perl_modules/perl-http-daemon/PKGBUILD new file mode 100644 index 0000000..bf55adc --- /dev/null +++ b/abs/core/perl_modules/perl-http-daemon/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 140094 2011-10-06 16:01:26Z bluewind $ + +pkgname=perl-http-daemon +pkgver=6.00 +pkgrel=1 +pkgdesc="a simple http server class" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.8.8' 'perl-http-date>=6' 'perl-http-message' + 'perl-lwp-mediatypes>=6') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTTP-Daemon +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-6.00.tar.gz) +md5sums=(36c8048775b8b53a6fb7c9d781658926) +sha512sums=(9fcdfc46e359bea37b10c979212f14e1cb7a1e0a24d2602b5465426fdac65dd43e4c3a73c4a956505a675a01caeb8385e20723f4362dcaa326a3d829d618b455) +_distdir="${srcdir}/HTTP-Daemon-6.00" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-http-date/PKGBUILD b/abs/core/perl_modules/perl-http-date/PKGBUILD new file mode 100644 index 0000000..20ea327 --- /dev/null +++ b/abs/core/perl_modules/perl-http-date/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 150639 2012-02-19 01:23:42Z allan $ + +pkgname=perl-http-date +pkgver=6.01 +pkgrel=1 +pkgdesc="date conversion routines" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.8.8') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTTP-Date +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Date-6.00.tar.gz) +md5sums=('41b875ac89c14d7f66515b52cdd12acd') +sha512sums=('7101f30a8a3ac333d37d1c4120c3202ebeb961e742cbecd6b4af140fe575da09c3a3e5be3a2c96e8e33fa2d1e29b10abea59434c2c227d9b6386c306a377f81c') +_distdir="${srcdir}/HTTP-Date-6.00" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-http-message/PKGBUILD b/abs/core/perl_modules/perl-http-message/PKGBUILD new file mode 100644 index 0000000..a743973 --- /dev/null +++ b/abs/core/perl_modules/perl-http-message/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 150641 2012-02-19 01:25:44Z allan $ + +pkgname=perl-http-message +pkgver=6.03 +pkgrel=1 +pkgdesc="HTTP style messages" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.8.8' 'perl-encode-locale>=1' 'perl-html-parser>=3.33' + 'perl-http-date>=6' 'perl-lwp-mediatypes>=6' 'perl-uri>=1.10') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTTP-Message +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Message-6.02.tar.gz) +md5sums=('a6b28e44f7b5e5573362f042d522a456') +sha512sums=('1091346307bf063ea6a65ddc8811da368d6080a11776fa5c4dc9df6beb9c8bc8cbe512fd711d44c43d4bd90a65c7195a1d3d5ed10257ef1e17d2145971d89c3c') +_distdir="${srcdir}/HTTP-Message-6.02" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-http-negotiate/PKGBUILD b/abs/core/perl_modules/perl-http-negotiate/PKGBUILD new file mode 100644 index 0000000..850f45a --- /dev/null +++ b/abs/core/perl_modules/perl-http-negotiate/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> +# Generator : pbjam 0.01 +# $Id: PKGBUILD 150643 2012-02-19 01:27:33Z allan $ + +pkgname=perl-http-negotiate +pkgver=6.01 +pkgrel=1 +pkgdesc="choose a variant to serve" +arch=(any) +license=(PerlArtistic GPL) +options=('!emptydirs') +depends=('perl>=5.8.8' 'perl-http-message') +makedepends=() +checkdepends=() +conflicts=('perl-libwww<6') +url=http://search.cpan.org/dist/HTTP-Negotiate +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-6.00.tar.gz) +md5sums=('f2d89957d1c4f62a86f18b08e07c2328') +sha512sums=('d608fa0a9a0866c5d934561ea1a13844bab0d27d4ac332f5174e19c768e01675c6562d6bc4c4e4a5530c5a83de8b1edefa002ce42534217eba5a6d4edd779e74') +_distdir="${srcdir}/HTTP-Negotiate-6.00" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-http-server-simple/PKGBUILD b/abs/core/perl_modules/perl-http-server-simple/PKGBUILD new file mode 100644 index 0000000..33dd3f3 --- /dev/null +++ b/abs/core/perl_modules/perl-http-server-simple/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 56432 2011-10-07 09:57:00Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-http-server-simple +pkgver=0.44 +pkgrel=1 +pkgdesc="Lightweight HTTP server " +arch=(any) +url="http://search.cpan.org/dist/HTTP-Server-Simple" +license=('GPL' 'PerlArtistic') +depends=('perl-uri') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/J/JE/JESSE/HTTP-Server-Simple-$pkgver.tar.gz) +md5sums=('70d4ae98affb9e921ab1478bbdffca3b') + +build() { + cd $srcdir/HTTP-Server-Simple-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/abs/core/perl_modules/perl-image-size/PKGBUILD b/abs/core/perl_modules/perl-image-size/PKGBUILD index 784d1ce..db516ac 100644 --- a/abs/core/perl_modules/perl-image-size/PKGBUILD +++ b/abs/core/perl_modules/perl-image-size/PKGBUILD @@ -1,30 +1,29 @@ -# $Id$ +# $Id: PKGBUILD 73855 2012-07-16 05:43:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: <francois . archlinux . org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Igor Scabini <furester@gmail.com> pkgname=perl-image-size -_cpanname=Image-Size -pkgver=3.230 +pkgver=3.232 pkgrel=1 pkgdesc="Read the dimensions of an image in several popular formats" arch=(any) -url="http://search.cpan.org/dist/${_cpanname}/" +url="http://search.cpan.org/dist/Image-Size/" license=('LGPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJRAY/${_cpanname}-$pkgver.tar.gz") -md5sums=('17b5cc123a522aa3c4ca842094d0c0ba') +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJRAY/Image-Size-$pkgver.tar.gz") +md5sums=('908db185487fabdd293f7759113b3a49') build() { - cd $srcdir/${_cpanname}-$pkgver + cd $srcdir/Image-Size-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } package() { - cd $srcdir/${_cpanname}-$pkgver + cd $srcdir/Image-Size-$pkgver make install DESTDIR="$pkgdir" find "$pkgdir" -name '.packlist' -delete find "$pkgdir" -name '*.pod' -delete diff --git a/abs/core/perl_modules/perl-io-socket-ssl/PKGBUILD b/abs/core/perl_modules/perl-io-socket-ssl/PKGBUILD index 75a906d..e144c03 100644 --- a/abs/core/perl_modules/perl-io-socket-ssl/PKGBUILD +++ b/abs/core/perl_modules/perl-io-socket-ssl/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 163575 2012-07-16 03:26:30Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Manolis Tzanidakis +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-io-socket-ssl -_realname=IO-Socket-SSL -pkgver=1.12 +_cpanname=IO-Socket-SSL +pkgver=1.76 pkgrel=1 -pkgdesc="IO::Socket::SSL - Nearly transparent SSL encapsulation for IO::Socket::INET" -arch=(i686 x86_64) +pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET" +arch=('any') license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/${_cpanname}/" depends=('perl-net-ssleay' 'perl>=5.10.0') -options=(!emptydirs) -replaces=('io-socket-ssl') -provides=('io-socket-ssl') -source=(http://www.cpan.org/authors/id/S/SU/SULLR/${_realname}-${pkgver}.tar.gz) -md5sums=('0f6e80c15341094df16828a25dbaeeaa') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/S/SU/SULLR/${_cpanname}-${pkgver}.tar.gz) +sha1sums=('b27cfff3b5cf03f223431317abda03d44d1a902d') build() { - cd ${startdir}/src/${_realname}-${pkgver} - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + cd "${srcdir}/${_cpanname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make install DESTDIR="${pkgdir}" } -# vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-io-stringy/PKGBUILD b/abs/core/perl_modules/perl-io-stringy/PKGBUILD index 0fdf300..a39789e 100644 --- a/abs/core/perl_modules/perl-io-stringy/PKGBUILD +++ b/abs/core/perl_modules/perl-io-stringy/PKGBUILD @@ -1,23 +1,34 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 143932 2011-11-30 21:29:16Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-io-stringy pkgver=2.110 -pkgrel=6 +pkgrel=9 pkgdesc="I/O on in-core objects like strings/arrays" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~DSKOLL/IO-stringy" +arch=('any') +url="http://search.cpan.org/dist/IO-stringy" license=('GPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DS/DSKOLL/IO-stringy-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/D/DS/DSKOLL/IO-stringy-$pkgver.tar.gz") md5sums=('2e6a976cfa5521e815c1fdf4006982de') build() { - cd $startdir/src/IO-stringy-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/IO-stringy-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/IO-stringy-${pkgver}" + make test +} + +package() { + cd "${srcdir}/IO-stringy-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-json/PKGBUILD b/abs/core/perl_modules/perl-json/PKGBUILD index 88aade8..fa245f6 100644 --- a/abs/core/perl_modules/perl-json/PKGBUILD +++ b/abs/core/perl_modules/perl-json/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 65872 2012-02-22 13:12:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-json pkgver=2.53 -pkgrel=1 +pkgrel=2 pkgdesc="JSON (JavaScript Object Notation) encoder/decoder" arch=('any') url="http://search.cpan.org/dist/JSON" diff --git a/abs/core/perl_modules/perl-libwww/PKGBUILD b/abs/core/perl_modules/perl-libwww/PKGBUILD index 254519a..8aec958 100644 --- a/abs/core/perl_modules/perl-libwww/PKGBUILD +++ b/abs/core/perl_modules/perl-libwww/PKGBUILD @@ -1,32 +1,53 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis +# Packager: Justin "juster" Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 150749 2012-02-21 19:40:54Z juster $ pkgname=perl-libwww -_realname=libwww-perl -pkgver=5.808 -pkgrel=2 -pkgdesc="A set of Perl modules which provides a simple and consistent API to the WWW." -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-uri' 'perl-html-parser' 'perl>=5.10.0') - +pkgver=6.04 +pkgrel=1 +pkgdesc="The World-Wide Web library for Perl" +arch=(any) +license=(PerlArtistic GPL) options=(!emptydirs) -replaces=('libwww-perl') -provides=('libwww-perl') -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('72120d9195ab1649c2d787eb1102a90c') +depends=('perl>=5.8.1' 'perl-encode-locale' 'perl-file-listing>=6' + 'perl-html-parser' 'perl-http-cookies>=6' 'perl-http-daemon>=6' + 'perl-http-date>=6' 'perl-http-negotiate>=6' 'perl-lwp-mediatypes>=6' + 'perl-net-http>=6' 'perl-uri>=1.10' 'perl-www-robotrules>=6' + 'perl-http-message>=6') +optdepends=('perl-lwp-protocol-https: for https:// url schemes') +url=https://metacpan.org/release/libwww-perl +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${pkgver}.tar.gz") +md5sums=(24acf2fe33b2295f048f8859e9665ee3) +sha512sums=(9ea578e6da99e4002a35ae82d1ee025caf15b3bc7e40fbe71abd7e8592036f16bd0268453dfeedc2c445d957c45ec473b1ed4a1738b644d475d65f7cbdb6927b) +_distdir="${srcdir}/libwww-perl-${pkgver}" + +build() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null -build() { - cd ${startdir}/src/${_realname}-${pkgver} - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + cd "$_distdir" + /usr/bin/perl Makefile.PL + make +) - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +check() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test +) + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } -# vim: ts=2 sw=2 et ft=sh + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-lingua-en-numbers-ordinate/PKGBUILD b/abs/core/perl_modules/perl-lingua-en-numbers-ordinate/PKGBUILD index b926acd..fb62569 100644 --- a/abs/core/perl_modules/perl-lingua-en-numbers-ordinate/PKGBUILD +++ b/abs/core/perl_modules/perl-lingua-en-numbers-ordinate/PKGBUILD @@ -1,23 +1,25 @@ +# $Id: PKGBUILD 65879 2012-02-22 13:16:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-lingua-en-numbers-ordinate pkgver=1.02 -pkgrel=2 +pkgrel=4 pkgdesc="Go from cardinal (53) to ordinal (53rd)" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~SBURKE/Lingua-EN-Numbers-Ordinate" +arch=('any') +url="http://search.cpan.org/dist/Lingua-EN-Numbers-Ordinate" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SB/SBURKE/Lingua-EN-Numbers-Ordinate-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/S/SB/SBURKE/Lingua-EN-Numbers-Ordinate-$pkgver.tar.gz) md5sums=('e92078fafd9108a137972c4e9bae9e99') build() { - cd $startdir/src/Lingua-EN-Numbers-Ordinate-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Lingua-EN-Numbers-Ordinate-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-lingua-en-numbers/PKGBUILD b/abs/core/perl_modules/perl-lingua-en-numbers/PKGBUILD index 53b50a8..c7563cf 100644 --- a/abs/core/perl_modules/perl-lingua-en-numbers/PKGBUILD +++ b/abs/core/perl_modules/perl-lingua-en-numbers/PKGBUILD @@ -1,23 +1,25 @@ +# $Id: PKGBUILD 73857 2012-07-16 05:44:00Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-lingua-en-numbers -pkgver=1.01 -pkgrel=2 +pkgver=1.04 +pkgrel=1 pkgdesc="Turn 407 into four hundred and seven, etc." -arch=('i686' 'x86_64') -url="http://search.cpan.org/~SBURKE/Lingua-EN-Numbers" +arch=('any') +url="http://search.cpan.org/dist/Lingua-EN-Numbers" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SB/SBURKE/Lingua-EN-Numbers-$pkgver.tar.gz) -md5sums=('e2f9252b1cdc5002e1f912e20b2f5bbb') +source=(http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/Lingua-EN-Numbers-$pkgver.tar.gz) +md5sums=('6b3d8ea645b37ee29b37388caa01b0f3') build() { - cd $startdir/src/Lingua-EN-Numbers-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Lingua-EN-Numbers-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-lingua-preferred/PKGBUILD b/abs/core/perl_modules/perl-lingua-preferred/PKGBUILD index 23a6507..fa99326 100644 --- a/abs/core/perl_modules/perl-lingua-preferred/PKGBUILD +++ b/abs/core/perl_modules/perl-lingua-preferred/PKGBUILD @@ -1,23 +1,25 @@ +# $Id: PKGBUILD 65881 2012-02-22 13:17:22Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-lingua-preferred pkgver=0.2.4 -pkgrel=2 +pkgrel=4 pkgdesc="Pick a language based on user's preferences" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~EDAVIS/Lingua-Preferred" +arch=('any') +url="http://search.cpan.org/dist/Lingua-Preferred" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/E/ED/EDAVIS/Lingua-Preferred-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/E/ED/EDAVIS/Lingua-Preferred-$pkgver.tar.gz) md5sums=('37e883fafb05b1439de1121f41e8ad75') build() { - cd $startdir/src/Lingua-Preferred-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Lingua-Preferred-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-locale-gettext/PKGBUILD b/abs/core/perl_modules/perl-locale-gettext/PKGBUILD index 22efcb7..e2bb2e3 100644 --- a/abs/core/perl_modules/perl-locale-gettext/PKGBUILD +++ b/abs/core/perl_modules/perl-locale-gettext/PKGBUILD @@ -1,28 +1,43 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> -# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=3 -pkgdesc="Permits access from Perl to the gettext() family of functions." -arch=(i686 x86_64) +pkgrel=9 +pkgdesc="Permits access from Perl to the gettext() family of functions" +arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl>=5.10.0') +depends=('gettext' 'perl') options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz) -md5sums=('f3d3f474a1458f37174c410dfef61a46') +source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz" + 'compatibility-with-POSIX-module.patch') +md5sums=('f3d3f474a1458f37174c410dfef61a46' + '854302f34d01a2f8ae739187788973dd') build() { - cd ${startdir}/src/${_realname}-${pkgver} || return 1 + cd "${srcdir}/${_realname}-${pkgver}" + + patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete } diff --git a/abs/core/perl_modules/perl-locale-gettext/compatibility-with-POSIX-module.patch b/abs/core/perl_modules/perl-locale-gettext/compatibility-with-POSIX-module.patch new file mode 100644 index 0000000..ad67551 --- /dev/null +++ b/abs/core/perl_modules/perl-locale-gettext/compatibility-with-POSIX-module.patch @@ -0,0 +1,10 @@ +--- a/gettext.pm 2005-05-31 20:11:16.000000000 -0700 ++++ b/gettext.pm 2009-10-07 12:39:42.000000000 -0700 +@@ -32,6 +32,7 @@ + =cut + + use Carp; ++use POSIX qw(:locale_h); + + require Exporter; + require DynaLoader; diff --git a/abs/core/perl_modules/perl-lwp-mediatypes/PKGBUILD b/abs/core/perl_modules/perl-lwp-mediatypes/PKGBUILD new file mode 100644 index 0000000..625b2bd --- /dev/null +++ b/abs/core/perl_modules/perl-lwp-mediatypes/PKGBUILD @@ -0,0 +1,49 @@ +# Packager: Justin "juster" Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 150744 2012-02-21 19:28:44Z juster $ + +pkgname=perl-lwp-mediatypes +pkgver=6.02 +pkgrel=1 +pkgdesc="guess media type for a file or a URL" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.6.2') +conflicts=('perl-libwww<6') +url=https://metacpan.org/release/LWP-MediaTypes +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-MediaTypes-${pkgver}.tar.gz") +md5sums=(8c5f25fb64b974d22aff424476ba13c9) +sha512sums=(b2ad33fb2c6dd7afaa9b8dd2ed6a15b2ecc35d13bcdf5297ce1632ea77406def0840a24c5213187707b665f28cc9bbea5774bfd1a4070d1f6192e904f707b94e) +_distdir="${srcdir}/LWP-MediaTypes-${pkgver}" + +build() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make +) + +check() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test +) + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-mailtools/PKGBUILD b/abs/core/perl_modules/perl-mailtools/PKGBUILD index 9c0271f..117352a 100644 --- a/abs/core/perl_modules/perl-mailtools/PKGBUILD +++ b/abs/core/perl_modules/perl-mailtools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 140680 2011-10-18 03:11:21Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> @@ -7,26 +7,22 @@ _realname=MailTools pkgver=2.08 pkgrel=1 pkgdesc="Perl module that provides email tools" -arch=(any) -license=('PerlArtistic') +arch=('any') url="http://search.cpan.org/dist/${_realname}/" +license=('PerlArtistic') depends=('perl>=5.10.0') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/${_realname}-${pkgver}.tar.gz) +md5sums=('0245bf7985c6661e0cf31a59657a18f0') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make } package() { - cd ${srcdir}/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } -md5sums=('0245bf7985c6661e0cf31a59657a18f0') diff --git a/abs/core/perl_modules/perl-math-round/PKGBUILD b/abs/core/perl_modules/perl-math-round/PKGBUILD index 6501887..2881d28 100644 --- a/abs/core/perl_modules/perl-math-round/PKGBUILD +++ b/abs/core/perl_modules/perl-math-round/PKGBUILD @@ -1,22 +1,34 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 143938 2011-11-30 21:38:22Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-math-round pkgver=0.06 -pkgrel=2 +pkgrel=5 pkgdesc="Perl extension for rounding numbers" -arch=('i686' 'x86_64') +arch=('any') url="http://search.cpan.org/dist/Math-Round" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GR/GROMMEL/Math-Round-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/G/GR/GROMMEL/Math-Round-$pkgver.tar.gz") md5sums=('552cef2753b246f97a6e20d8dee66e7c') build() { - cd $startdir/src/Math-Round-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/Math-Round-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/Math-Round-${pkgver}" + make test +} + +package() { + cd "${srcdir}/Math-Round-${pkgver}" + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-mime-lite/PKGBUILD b/abs/core/perl_modules/perl-mime-lite/PKGBUILD index f2fd37a..c0cfe7f 100644 --- a/abs/core/perl_modules/perl-mime-lite/PKGBUILD +++ b/abs/core/perl_modules/perl-mime-lite/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: eric <eric@archlinux.org> +# $Id: PKGBUILD 151298 2012-02-25 13:17:16Z pierre $ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-mime-lite _realname=MIME-Lite -pkgver=3.021 +pkgver=3.028 pkgrel=1 pkgdesc="Perl module that provides lightweight MIME generator" -arch=(i686 x86_64) +arch=('any') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-mailtools' 'perl-mime-types' 'perl>=5.10.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${_realname}-$pkgver.tar.gz) -md5sums=('7b3f4b9b3f8a0023dbc62859ef9a775f') +depends=('perl-email-date-format' 'perl-mailtools' 'perl-mime-types' 'perl') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${_realname}-${pkgver}.tar.gz") +md5sums=('b24770b664db269a2a6e984f66c19fa7') build() { - cd $startdir/src/${_realname}-$pkgver + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd ${srcdir}/${_realname}-${pkgver} + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-mime-tools/ChangeLog b/abs/core/perl_modules/perl-mime-tools/ChangeLog deleted file mode 100644 index 0ece331..0000000 --- a/abs/core/perl_modules/perl-mime-tools/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ - -2008-01-05 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for x86_64 diff --git a/abs/core/perl_modules/perl-mime-tools/PKGBUILD b/abs/core/perl_modules/perl-mime-tools/PKGBUILD index 1979431..7ed81bb 100644 --- a/abs/core/perl_modules/perl-mime-tools/PKGBUILD +++ b/abs/core/perl_modules/perl-mime-tools/PKGBUILD @@ -1,23 +1,37 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 161352 2012-06-10 06:11:24Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-mime-tools -pkgver=5.426 +pkgver=5.503 pkgrel=1 -pkgdesc="Perl modules for parsing and creating MIME entities" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~DONEILL/MIME-tools" +pkgdesc="Parses streams to create MIME entities" +arch=('any') +url="http://search.cpan.org/dist/MIME-tools" license=('GPL' 'PerlArtistic') -depends=('perl-mailtools' 'perl-io-stringy>=2.11' 'perl>=5.10.0') +depends=('perl-mailtools' 'perl-io-stringy' 'perl-convert-binhex') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DO/DONEILL/MIME-tools-$pkgver.tar.gz) -md5sums=('87ab3a328e56268f551ff3ef5f51f416') +provides=('perl-mime-body=5.428.0' 'perl-mime-decoder' 'perl-mime-decoder-base64' + 'perl-mime-decoder-binary' 'perl-mime-decoder-binhex' 'perl-mime-decoder-gzip64' + 'perl-mime-decoder-nbit' 'perl-mime-decoder-quotedprint' 'perl-mime-decoder-uu' + 'perl-mime-entity' 'perl-mime-field-contdisp=5.428.0' 'perl-mime-field-contraenc=5.428.0' + 'perl-mime-field-conttype=5.428.0' 'perl-mime-field-paramval=5.428.0' 'perl-mime-head=5.428.0' + 'perl-mime-parser' 'perl-mime-parser-filer' 'perl-mime-parser-reader' + 'perl-mime-parser-results' 'perl-mime-worddecoder' 'perl-mime-words=5.428.0') +source=("http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-${pkgver}.tar.gz") +md5sums=('f86b968e9405318224b7a9f4574505d0') build() { - cd $startdir/src/MIME-tools-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/MIME-tools-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/MIME-tools-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-mime-types/PKGBUILD b/abs/core/perl_modules/perl-mime-types/PKGBUILD index 3cc06cb..b4b4265 100644 --- a/abs/core/perl_modules/perl-mime-types/PKGBUILD +++ b/abs/core/perl_modules/perl-mime-types/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 151300 2012-02-25 13:18:30Z pierre $ # Maintainer: Jan de Groot # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-mime-types _realname=MIME-Types -pkgver=1.24 +pkgver=1.34 pkgrel=1 pkgdesc="Perl/CPAN Module MIME::Types : Information and processing MIME types" -arch=(i686 x86_64) +arch=('any') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') -makedepends=('perl-test-pod') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/M/MA/MARKOV/${_realname}-${pkgver}.tar.gz) -md5sums=('fe43cf2caac763f8b02fdd4ced3fd038') +depends=('perl') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/M/MA/MARKOV/${_realname}-${pkgver}.tar.gz") +md5sums=('87c496480e463c0b7792e7f5429e50d1') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } diff --git a/abs/core/perl_modules/perl-module-implementation/PKGBUILD b/abs/core/perl_modules/perl-module-implementation/PKGBUILD new file mode 100644 index 0000000..03b2fa5 --- /dev/null +++ b/abs/core/perl_modules/perl-module-implementation/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: 3ED <krzysztof1987 at gmail dot com> + +pkgname=perl-module-implementation +pkgver=0.06 +pkgrel=2 +pkgdesc="Loads one of several alternate underlying implementations for a module" +arch=('any') +license=('PerlArtistic') +options=('!emptydirs') +depends=('perl-module-runtime>=0.012') +checkdepends=('perl-test-requires' 'perl-test-fatal') +url="http://search.cpan.org/dist/Module-Implementation/" +source=(http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Module-Implementation-$pkgver.tar.gz) +md5sums=('748f3540162fc52222d761fab3efb266') + +build() { + cd "${srcdir}/Module-Implementation-${pkgver}" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL="--skipdeps" \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + perl Makefile.PL + make +} + +check() { + cd "${srcdir}/Module-Implementation-${pkgver}" + make test +} + +package() { + cd "${srcdir}/Module-Implementation-${pkgver}" + make install + find "${pkgdir}" -name .packlist -o -name perllocal.pod -delete +} diff --git a/abs/core/perl_modules/perl-module-runtime/PKGBUILD b/abs/core/perl_modules/perl-module-runtime/PKGBUILD new file mode 100644 index 0000000..974f137 --- /dev/null +++ b/abs/core/perl_modules/perl-module-runtime/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 66098 2012-02-23 01:03:59Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-module-runtime +pkgver=0.013 +pkgrel=1 +pkgdesc="runtime module handling" +arch=('any') +url="http://search.cpan.org/dist/Module-Runtime/" +license=('perl') +depends=('perl-params-classify') +options=(!emptydirs) +source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Module-Runtime-$pkgver.tar.gz") +md5sums=('62b88b1f5f0e975a5d7c80cd46167b97') + +build() { + cd $srcdir/Module-Runtime-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/Module-Runtime-$pkgver + make install DESTDIR="${pkgdir}" + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/abs/core/perl_modules/perl-net-http/PKGBUILD b/abs/core/perl_modules/perl-net-http/PKGBUILD new file mode 100644 index 0000000..89eb246 --- /dev/null +++ b/abs/core/perl_modules/perl-net-http/PKGBUILD @@ -0,0 +1,49 @@ +# Packager: Justin "juster" Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 150758 2012-02-21 20:00:38Z juster $ + +pkgname=perl-net-http +pkgver=6.03 +pkgrel=1 +pkgdesc="Low-level HTTP connection (client)" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.6.2') +conflicts=('perl-libwww<6') +url=https://metacpan.org/release/Net-HTTP +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Net-HTTP-${pkgver}.tar.gz") +md5sums=(86957940d96649ca782b686686b82e7b) +sha512sums=(a9ffbe5a4c6e1633b130549bb292c9dce093436e0d80d3a9b2ac95c3d1f5d16d734388a1d52094cb34194a7b8973bfa24c549cced4fdc42f36ec08876f551a32) +_distdir="${srcdir}/Net-HTTP-${pkgver}" + +build() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make +) + +check() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test +) + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-net-ssleay/PKGBUILD b/abs/core/perl_modules/perl-net-ssleay/PKGBUILD index efa9b59..8476265 100644 --- a/abs/core/perl_modules/perl-net-ssleay/PKGBUILD +++ b/abs/core/perl_modules/perl-net-ssleay/PKGBUILD @@ -1,36 +1,38 @@ -# $Id: PKGBUILD 82525 2010-06-12 20:09:39Z kevin $ +# $Id: PKGBUILD 160545 2012-06-02 10:28:03Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.36 -pkgrel=3 +pkgver=1.48 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') url="http://search.cpan.org/dist/${_cpanname}/" -depends=('perl' 'openssl') +depends=('openssl') options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/${_cpanname}-${pkgver}.tar.gz) -md5sums=('54061638720dd6a325395331c77f21d8') +source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") +md5sums=('4e10d9da28f26732e37807820bf72af5') build() { cd ${srcdir}/${_cpanname}-${pkgver} + # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor || return 1 - make || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor + make } + package() { cd ${srcdir}/${_cpanname}-${pkgver} - make install DESTDIR=${pkgdir} || return 1 + + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete - install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README + install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -# vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-net-upnp/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/PKGBUILD index a49bd6e..9d2945e 100644 --- a/abs/core/perl_modules/perl-net-upnp/PKGBUILD +++ b/abs/core/perl_modules/perl-net-upnp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 143946 2011-11-30 21:55:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> pkgname=perl-net-upnp pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Perl Module UPnP" arch=('i686' 'x86_64') url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" @@ -19,7 +19,12 @@ build() { # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make + make +} + +package() { + cd "${srcdir}/Net-UPnP-${pkgver}" + make install DESTDIR="${pkgdir}" find ${pkgdir} -name '.packlist' -delete diff --git a/abs/core/perl_modules/perl-package-deprecationmanager/PKGBUILD b/abs/core/perl_modules/perl-package-deprecationmanager/PKGBUILD new file mode 100644 index 0000000..ae69247 --- /dev/null +++ b/abs/core/perl_modules/perl-package-deprecationmanager/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 71653 2012-05-31 15:45:01Z juster $ + +pkgname=perl-package-deprecationmanager +pkgver=0.13 +pkgrel=1 +pkgdesc='Manage deprecation warnings for your distribution' +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=(perl-list-moreutils perl-params-util perl-sub-install) +checkdepends=(perl-test-fatal perl-test-requires) +url=https://metacpan.org/release/Package-DeprecationManager +source=("http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Package-DeprecationManager-$pkgver.tar.gz") +md5sums=(f81ae3c0f9bcac048eb4bff348b79f67) +sha512sums=(393841bc8a6a96dfc3ce9e2787d532f0e5ba45ef07a8d95be4450ad399b0ae3c4929f8abf07892194fca85c7de75c118a5b611a816b565a7945e34ebca36c4a8) +_dir="$srcdir/Package-DeprecationManager-$pkgver" + +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) + +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) + +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-package-stash-xs/PKGBUILD b/abs/core/perl_modules/perl-package-stash-xs/PKGBUILD new file mode 100644 index 0000000..ee83389 --- /dev/null +++ b/abs/core/perl_modules/perl-package-stash-xs/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 71819 2012-06-02 10:31:46Z bluewind $ + +pkgname=perl-package-stash-xs +pkgver=0.25 +pkgrel=2 +pkgdesc="faster and more correct implementation of the Package::Stash API" +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.1') +makedepends=('perl-extutils-makemaker>=6.30') +checkdepends=('perl-test-fatal' 'perl-test-simple') +url=https://metacpan.org/release/Package-Stash-XS +source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") +md5sums=(52ece18842c46da8fb7a4a14dea910ab) +sha512sums=(2b539d9ba1a68c5ba681e9eabbcde4b396f66dc8dbd3b1e333286ea7ce39b93b97ec4bd97c31681720a925553b128371ce2c48f11254806aebd5de868a22b528) +_distdir="${srcdir}/Package-Stash-XS-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-package-stash/PKGBUILD b/abs/core/perl_modules/perl-package-stash/PKGBUILD new file mode 100644 index 0000000..b985727 --- /dev/null +++ b/abs/core/perl_modules/perl-package-stash/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57663 2011-11-01 00:48:37Z juster $ + +pkgname=perl-package-stash +pkgver=0.33 +pkgrel=2 +pkgdesc="routines for manipulating stashes" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.1' 'perl-dist-checkconflicts>=0.02' + 'perl-package-deprecationmanager' 'perl-scalar-list-utils' + 'perl-package-stash-xs>=0.24') +makedepends=('perl-extutils-makemaker>=6.30') +checkdepends=('perl-test-fatal' 'perl-test-requires' 'perl-test-simple') +url=https://metacpan.org/release/Package-Stash +source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-${pkgver}.tar.gz") +md5sums=(fe1f6efa0dbd46f8520903b436f185f1) +sha512sums=(8b3e62caa7ac99f1429d4ab4c3a00265a8ca2aa6281c5c254c4fb455d8a262c445a1daafa405208f902fd352e18ef121a37303ceb27caabb0bdc3c14b807508b) +_distdir="${srcdir}/Package-Stash-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-params-classify/PKGBUILD b/abs/core/perl_modules/perl-params-classify/PKGBUILD new file mode 100644 index 0000000..d0dae4a --- /dev/null +++ b/abs/core/perl_modules/perl-params-classify/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-params-classify +pkgver=0.013 +pkgrel=2 +pkgdesc="argument type classification" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/~zefram/Params-Classify" +options=(!emptydirs) +depends=('perl>=5.10.1') +source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Params-Classify-$pkgver.tar.gz") +md5sums=('63d24fbec775472ada49d16bce4a9b1f') + +build() { + cd $srcdir/Params-Classify-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=${pkgdir} + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/abs/core/perl_modules/perl-params-util/PKGBUILD b/abs/core/perl_modules/perl-params-util/PKGBUILD new file mode 100644 index 0000000..415ad58 --- /dev/null +++ b/abs/core/perl_modules/perl-params-util/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $ + +pkgname=perl-params-util +pkgver=1.07 +pkgrel=1 +pkgdesc='Simple, compact and correct param-checking functions' +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.5.30') +url=https://metacpan.org/release/Params-Util +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") +md5sums=(02db120c0eef87aae1830cc62bdec37b) +sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) +_dir="$srcdir/Params-Util-$pkgver" + +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) + +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) + +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-params-validate/PKGBUILD b/abs/core/perl_modules/perl-params-validate/PKGBUILD index 2dd4124..b14f42d 100644 --- a/abs/core/perl_modules/perl-params-validate/PKGBUILD +++ b/abs/core/perl_modules/perl-params-validate/PKGBUILD @@ -1,30 +1,27 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 71825 2012-06-02 10:31:58Z bluewind $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.98 -pkgrel=2 +pkgver=1.06 +pkgrel=3 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Params-Validate" license=('GPL' 'PerlArtistic') -depends=('perl') +depends=('perl' 'perl-module-implementation') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') +md5sums=('4f7a281269cd30d7c3994ba5acb50857') build() { cd Params-Validate-${pkgver} - perl ./Build.PL --installdirs=vendor - ./Build } package(){ cd Params-Validate-${pkgver} - ./Build install --destdir=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-soap-lite/PKGBUILD b/abs/core/perl_modules/perl-soap-lite/PKGBUILD index d732ea6..d885fcb 100644 --- a/abs/core/perl_modules/perl-soap-lite/PKGBUILD +++ b/abs/core/perl_modules/perl-soap-lite/PKGBUILD @@ -1,24 +1,58 @@ -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 163581 2012-07-16 06:21:11Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-soap-lite -pkgver=0.710.08 +pkgver=0.715 pkgrel=1 pkgdesc="Client and server side SOAP implementation" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~MKUTTER/SOAP-Lite" +arch=('any') +url="http://search.cpan.org/dist/SOAP-Lite" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'perl-crypt-ssleay' 'perl-mime-lite' 'perl-libwww' 'perl-uri' \ - 'perl-mime-tools' 'perl-io-socket-ssl' 'perlxml>=2.23' 'perl-fcgi') +depends=('perl' 'perl-crypt-ssleay' 'perl-mime-lite' 'perl-libwww' 'perl-uri' \ + 'perl-mime-tools' 'perl-io-socket-ssl' 'perl-xml-parser' 'perl-fcgi' \ + 'perl-class-inspector' ) options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MK/MKUTTER/SOAP-Lite-$pkgver.tar.gz) -md5sums=('e7869ad91fee76cc1782fe29fe3a989d') +provides=( + perl-apache-soap + perl-apache-xmlrpc-lite + perl-io-sessiondata=1.20.0 + perl-io-sessionset + perl-soap-constants + perl-soap-lite-deserializer-xmlschema1999 + perl-soap-lite-deserializer-xmlschema2001 + perl-soap-lite-deserializer-xmlschemasoap1_1 + perl-soap-lite-deserializer-xmlschemasoap1_2 + perl-soap-lite-packager + perl-soap-lite-utils + perl-soap-packager=0.712.0 + perl-soap-test + perl-soap-transport-http + perl-soap-transport-io + perl-soap-transport-local + perl-soap-transport-loopback + perl-soap-transport-mailto + perl-soap-transport-pop3=0.712.0 + perl-soap-transport-tcp=0.712.0 + perl-uddi-lite=0.712.0 + perl-xml-parser-lite + perl-xmlrpc-lite + perl-xmlrpc-test + perl-xmlrpc-transport-http + perl-xmlrpc-transport-pop3 + perl-xmlrpc-transport-tcp +) +source=("http://www.cpan.org/authors/id/M/MK/MKUTTER/SOAP-Lite-${pkgver}.tar.gz") +md5sums=('a44c41291ddddaa19c02a72cd554327b') build() { - cd $startdir/src/SOAP-Lite-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/SOAP-Lite-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/SOAP-Lite-${pkgver}" + make install DESTDIR="${pkgdir}" } diff --git a/abs/core/perl_modules/perl-socket6/PKGBUILD b/abs/core/perl_modules/perl-socket6/PKGBUILD index be7ac34..88c8acc 100644 --- a/abs/core/perl_modules/perl-socket6/PKGBUILD +++ b/abs/core/perl_modules/perl-socket6/PKGBUILD @@ -3,7 +3,7 @@ pkgname='perl-socket6' pkgver='0.23' -pkgrel='1' +pkgrel='2' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') diff --git a/abs/core/perl_modules/perl-sub-exporter/PKGBUILD b/abs/core/perl_modules/perl-sub-exporter/PKGBUILD new file mode 100644 index 0000000..2d2adb3 --- /dev/null +++ b/abs/core/perl_modules/perl-sub-exporter/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57551 2011-10-30 17:28:18Z juster $ + +pkgname=perl-sub-exporter +pkgver=0.982 +pkgrel=1 +pkgdesc="a sophisticated exporter for custom-built routines" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.6.0' 'perl-data-optlist>=0.1' 'perl-params-util>=0.14' + 'perl-sub-install>=0.92') +url=https://metacpan.org/release/Sub-Exporter +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-${pkgver}.tar.gz") +md5sums=(db90a0d73a5ca2d185dd6c6d2fc848f0) +sha512sums=(10fc2a27d28f47cc5193c13e598e7c16caac0ede5700b0301ab04db371b9250348aa69e076b259d3f5a1ebbdd8793c3230e5f71a0adb1554b1d2fd04b2969d97) +_distdir="${srcdir}/Sub-Exporter-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-sub-install/PKGBUILD b/abs/core/perl_modules/perl-sub-install/PKGBUILD new file mode 100644 index 0000000..08b4b65 --- /dev/null +++ b/abs/core/perl_modules/perl-sub-install/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 71649 2012-05-31 15:44:24Z juster $ + +pkgname=perl-sub-install +pkgver=0.926 +pkgrel=1 +pkgdesc='install subroutines into packages easily' +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=(perl) +url=https://metacpan.org/release/Sub-Install +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-$pkgver.tar.gz") +md5sums=(89a7f82dd840bc2401f281b5f24732b9) +sha512sums=(c536e1ace79ce8c6bd4a6e580cc2e181671b54f07cef231a84094c854779aee556de4b2ff0a95f0e6a8aca87f77a6e19d148071a48fe5c6e9c0ca15314f0c9cc) +_dir="$srcdir/Sub-Install-$pkgver" + +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) + +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) + +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD b/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD index 4f3d53d..86409ac 100644 --- a/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD +++ b/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD @@ -1,8 +1,10 @@ +# $Id: PKGBUILD 65925 2012-02-22 13:43:26Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-sub-uplevel pkgver=0.22 -pkgrel=1 +pkgrel=2 pkgdesc="apparently run a function in a higher stack frame " arch=('any') url="http://search.cpan.org/dist/Sub-Uplevel" @@ -13,10 +15,10 @@ source=(http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-$pkgver.tar.gz) md5sums=('c166738a97c0424a0075ebe205d285db') build() { - cd $startdir/src/Sub-Uplevel-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Sub-Uplevel-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-test-fatal/PKGBUILD b/abs/core/perl_modules/perl-test-fatal/PKGBUILD new file mode 100644 index 0000000..dfae079 --- /dev/null +++ b/abs/core/perl_modules/perl-test-fatal/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 71635 2012-05-31 15:12:33Z juster $ + +pkgname=perl-test-fatal +pkgver=0.010 +pkgrel=1 +pkgdesc='incredibly simple helpers for testing code with exceptions' +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl-try-tiny>=0.07') +url=https://metacpan.org/release/Test-Fatal +source=("http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Fatal-$pkgver.tar.gz") +md5sums=(d8052d4160e8d999cbeb574592f26541) +sha512sums=(24ed85a957e316f49673613295978ff4f2485f762427a8e51594221fe7601d6df3ab1d92dd5a9a8943cce42a04a3a712b781a7ae31403995a03bbf177006edf6) +_dir="$srcdir/Test-Fatal-$pkgver" + +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) + +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) + +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-test-pod/PKGBUILD b/abs/core/perl_modules/perl-test-pod/PKGBUILD index a901b02..5adb9d1 100644 --- a/abs/core/perl_modules/perl-test-pod/PKGBUILD +++ b/abs/core/perl_modules/perl-test-pod/PKGBUILD @@ -1,25 +1,30 @@ -# -# Contributor: Oliver Charles <oliver.g.charles@googlemail.com> -# +# $Id: PKGBUILD 140682 2011-10-18 03:16:34Z eric $ +# Maintainer: Kevin <kevin@archlinux.org> +# Contributor: Firmicus <francois.archlinux.org> -pkgname="perl-test-pod" -pkgver=1.26 +pkgname=perl-test-pod +_realname=Test-Pod +pkgver=1.45 pkgrel=1 -pkgdesc="Translate Wiki formatted text to other formats" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~petdance/Test-Pod" -license="unknown" -depends=('perl>=5.10.0') +pkgdesc="Check for POD errors in files" +arch=('any') +url="http://search.cpan.org/dist/${_realname}/" +license=('GPL' 'PerlArtistic') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-$pkgver.tar.gz) -md5sums=('2f259135656ac4549b65a4f14f07b7c6') +source=(http://search.cpan.org/CPAN/authors/id/D/DW/DWHEELER/${_realname}-${pkgver}.tar.gz) +md5sums=('089c8f272931df82f6c4d11a74f04628') build() { - cd $startdir/src/Test-Pod-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR="$pkgdir/" install || return 1 + cd "${srcdir}/${_realname}-${pkgver}" + perl Build.PL installdirs=vendor + ./Build +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + ./Build install destdir="${pkgdir}" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name 'perllocal.pod' -delete + find "${pkgdir}" -name '.packlist' -delete + find "${pkgdir}" -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-test-requires/PKGBUILD b/abs/core/perl_modules/perl-test-requires/PKGBUILD new file mode 100644 index 0000000..c7de2ab --- /dev/null +++ b/abs/core/perl_modules/perl-test-requires/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Justin Davis <jrcd83@gmail.com> + +pkgname='perl-test-requires' +pkgver='0.06' +pkgrel='1' +pkgdesc="Checks to see if the module can be loaded" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +url='http://search.cpan.org/dist/Test-Requires' +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/Test-Requires-$pkgver.tar.gz") +md5sums=('6ce0da3cceadb6420d4c3c5bb69f64db') + +build() { + cd "${srcdir}/Test-Requires-$pkgver" + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + perl Makefile.PL + make + make test + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} diff --git a/abs/core/perl_modules/perl-test-warn/PKGBUILD b/abs/core/perl_modules/perl-test-warn/PKGBUILD new file mode 100644 index 0000000..1b5626d --- /dev/null +++ b/abs/core/perl_modules/perl-test-warn/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 70452 2012-05-07 13:45:39Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Firmicus <francois.archlinux.org> + +pkgname=perl-test-warn +pkgver=0.24 +pkgrel=1 +pkgdesc="Perl extension to test methods for warnings " +arch=(any) +url="http://search.cpan.org/~CHORNY/Test-Warn" +license=('GPL' 'PerlArtistic') +depends=('perl-tree-dag-node' 'perl-sub-uplevel>=0.12' 'perl>=5.10.0') +options=('!emptydirs') +source=(http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/Test-Warn-$pkgver.tar.gz) +md5sums=('a27990b62f8fd0aa290bb617ae0157a5') + +build() { + cd $srcdir/Test-Warn-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/Test-Warn-$pkgver + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/abs/core/perl_modules/perl-tree-dag-node/PKGBUILD b/abs/core/perl_modules/perl-tree-dag-node/PKGBUILD new file mode 100644 index 0000000..f5c7216 --- /dev/null +++ b/abs/core/perl_modules/perl-tree-dag-node/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 65974 2012-02-22 14:07:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-tree-dag-node +pkgver=1.06 +pkgrel=3 +pkgdesc="base class for trees" +arch=('any') +url="http://search.cpan.org/dist/Tree-DAG_Node" +license=('GPL' 'PerlArtistic') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/C/CO/COGENT/Tree-DAG_Node-$pkgver.tar.gz) +md5sums=('3b006f128bd1d8961fc57c466ffa05f2') + +build() { + cd $srcdir/Tree-DAG_Node-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/abs/core/perl_modules/perl-try-tiny/PKGBUILD b/abs/core/perl_modules/perl-try-tiny/PKGBUILD new file mode 100644 index 0000000..f70a01e --- /dev/null +++ b/abs/core/perl_modules/perl-try-tiny/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57540 2011-10-30 17:10:04Z juster $ + +pkgname=perl-try-tiny +pkgver=0.11 +pkgrel=1 +pkgdesc="minimal try/catch with proper localization of \$@" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +makedepends=('perl-extutils-makemaker') +checkdepends=('perl-test-simple') +url=https://metacpan.org/release/Try-Tiny +source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-${pkgver}.tar.gz") +md5sums=(4d2c8ff385ac3513edf4c042dd0eacbe) +sha512sums=(42a98d0996e4195b1618e99080f67791ec9b09c8c4de669aafcbe75c609718d700a6831dd5a68d8f7bda563c29ce3a8495bbf548b8d38a155471875889d8c701) +_distdir="${srcdir}/Try-Tiny-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-uri/PKGBUILD b/abs/core/perl_modules/perl-uri/PKGBUILD index ec8f2c5..7f18b32 100644 --- a/abs/core/perl_modules/perl-uri/PKGBUILD +++ b/abs/core/perl_modules/perl-uri/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 140684 2011-10-18 03:20:44Z eric $ # Maintainer: eric <eric@archlinux.org> # Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-uri _realname=URI -pkgver=1.35 -pkgrel=3 -pkgdesc="Perl Module: form Resource Identifiers (absolute and relative)" -arch=(i686 x86_64) -license=('PerlArtistic') +pkgver=1.59 +pkgrel=1 +pkgdesc="Uniform Resource Identifiers (absolute and relative)" +arch=('any') url="http://search.cpan.org/dist/${_realname}/" +license=('PerlArtistic') depends=('perl>=5.10.0') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-$pkgver.tar.gz) -replaces=('uri') -provides=('uri') -md5sums=('1a933b1114c41a25587ee59ba8376f7c') +provides=('perl-uri-escape=3.30') +options=('!emptydirs') +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-$pkgver.tar.gz) +md5sums=('fecebf8fa20e2d26ea4a1649c095e96e') build() { - cd $startdir/src/${_realname}-$pkgver + cd "${srcdir}/${_realname}-$pkgver" # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-www-mechanize/PKGBUILD b/abs/core/perl_modules/perl-www-mechanize/PKGBUILD index 9bbd409..ea4e61b 100644 --- a/abs/core/perl_modules/perl-www-mechanize/PKGBUILD +++ b/abs/core/perl_modules/perl-www-mechanize/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD,v 1.11 2008/03/24 16:16:28 sergej Exp $ -# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> +# $Id: PKGBUILD 66104 2012-02-23 01:05:44Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-www-mechanize -pkgver=1.34 -pkgrel=2 +pkgver=1.72 +pkgrel=1 pkgdesc="Automates web page form & link interaction" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~PETDANCE/WWW-Mechanize" +arch=(any) +url="http://search.cpan.org/dist/WWW-Mechanize" license=('GPL' 'PerlArtistic') -depends=('perl-libwww' 'perl-html-parser' 'perl-uri') +depends=('perl-libwww' 'perl-html-parser' 'perl-uri' 'perl-http-response-encoding' + 'perl-http-server-simple' 'perl-test-warn' 'perl-html-form') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/P/PE/PETDANCE/WWW-Mechanize-$pkgver.tar.gz) -md5sums=('77a5c025b9a722b62884b7740b8133f9') +source=(http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/WWW-Mechanize-$pkgver.tar.gz) +md5sums=('231709669de7d912185b91e454206532') build() { - cd $startdir/src/WWW-Mechanize-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/WWW-Mechanize-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-www-robotrules/PKGBUILD b/abs/core/perl_modules/perl-www-robotrules/PKGBUILD new file mode 100644 index 0000000..790cf73 --- /dev/null +++ b/abs/core/perl_modules/perl-www-robotrules/PKGBUILD @@ -0,0 +1,49 @@ +# Packager: Justin "juster" Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 150764 2012-02-21 20:29:03Z juster $ + +pkgname=perl-www-robotrules +pkgver=6.02 +pkgrel=1 +pkgdesc="database of robots.txt-derived permissions" +arch=(any) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.1' 'perl-uri>=1.10') +conflicts=('perl-libwww<6') +url=https://metacpan.org/release/WWW-RobotRules +source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-${pkgver}.tar.gz") +md5sums=(b7186e8b8b3701e70c22abf430742403) +sha512sums=(781a2fc90e4efed901a91ecf4f2aaac2684409c6a75a8434ff140654838bb05d11f8fa760642e20eee96450d3ced6815a4dab11a4245bc8120c69ca68ab49e44) +_distdir="${srcdir}/WWW-RobotRules-${pkgver}" + +build() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make +) + +check() +( + export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test +) + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/abs/core/perl_modules/perl-xml-dom/PKGBUILD b/abs/core/perl_modules/perl-xml-dom/PKGBUILD index ab6e8a5..07e39f2 100644 --- a/abs/core/perl_modules/perl-xml-dom/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-dom/PKGBUILD @@ -1,23 +1,27 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: François Charette <firmicus ατ gmx δοτ net> +# Maintainer: kfgz <kfgz at interia pl> +# Contributor: François Charette <firmicus at gmx dot net> pkgname=perl-xml-dom pkgver=1.44 -pkgrel=5 +pkgrel=7 pkgdesc="Implements Level 1 of W3's DOM" arch=('i686' 'x86_64') -url="http://search.cpan.org/~TJMATHER/XML-DOM" +url="http://search.cpan.org/dist/XML-DOM" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0' 'perlxml>=2.30' 'perl-xml-regexp' 'libxml-perl>=0.07' 'perl-libwww') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-DOM-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-DOM-${pkgver}.tar.gz) md5sums=('1ec2032a06e5762984f7a332c199c205') build() { - cd $startdir/src/XML-DOM-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd ${srcdir}/XML-DOM-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/XML-DOM-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-xml-namespacesupport/PKGBUILD b/abs/core/perl_modules/perl-xml-namespacesupport/PKGBUILD index a0950d8..a641a81 100644 --- a/abs/core/perl_modules/perl-xml-namespacesupport/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-namespacesupport/PKGBUILD @@ -1,23 +1,31 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id: PKGBUILD 143952 2011-11-30 22:08:16Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-namespacesupport -pkgver=1.09 -pkgrel=3 +pkgver=1.11 +pkgrel=2 pkgdesc="Generic namespace helpers (ported from SAX2)" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~RBERJON/XML-NamespaceSupport" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +arch=('any') +url="http://search.cpan.org/dist/XML-NamespaceSupport" +license=('GPL') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/R/RB/RBERJON/XML-NamespaceSupport-$pkgver.tar.gz) -md5sums=('b0867d7b599d8a63ba630fa6227936fe') +source=("http://www.cpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-${pkgver}.tar.gz") +md5sums=('222cca76161cd956d724286d36b607da') build() { - cd $startdir/src/XML-NamespaceSupport-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/XML-NamespaceSupport-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/XML-NamespaceSupport-${pkgver}" + + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-xml-parser/PKGBUILD b/abs/core/perl_modules/perl-xml-parser/PKGBUILD index 962dc0b..3e2a9db 100644 --- a/abs/core/perl_modules/perl-xml-parser/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99293 2010-11-13 20:13:13Z andrea $ +# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,29 +6,32 @@ pkgname=perl-xml-parser _realname=XML-Parser -pkgver=2.40 +pkgver=2.41 pkgrel=3 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -replaces=('perlxml') depends=('perl' 'expat') +replaces=('perlxml') provides=("perlxml=${pkgver}") options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz") -md5sums=('c66e9adba003d0667cc40115ccd837a5') - - +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") +md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') build() { cd "${srcdir}/${_realname}-${pkgver}" - + # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make } +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + package() { cd "${srcdir}/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" @@ -37,4 +40,3 @@ package() { find "${pkgdir}" -name perllocal.pod -delete find "${pkgdir}" -name .packlist -delete } - diff --git a/abs/core/perl_modules/perl-xml-regexp/PKGBUILD b/abs/core/perl_modules/perl-xml-regexp/PKGBUILD index e785a85..639ee87 100644 --- a/abs/core/perl_modules/perl-xml-regexp/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-regexp/PKGBUILD @@ -3,21 +3,29 @@ pkgname=perl-xml-regexp pkgver=0.03 -pkgrel=3 +pkgrel=7 pkgdesc="Regular expressions for XML tokens" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~TJMATHER/XML-RegExp" +arch=('any') +url="http://search.cpan.org/dist/XML-RegExp" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-RegExp-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-RegExp-${pkgver}.tar.gz") md5sums=('5826b24e0d05714e25c2bb04e1f1c09b') build() { - cd $startdir/src/XML-RegExp-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd XML-RegExp-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd XML-RegExp-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-xml-sax-base/PKGBUILD b/abs/core/perl_modules/perl-xml-sax-base/PKGBUILD new file mode 100644 index 0000000..7e3ae07 --- /dev/null +++ b/abs/core/perl_modules/perl-xml-sax-base/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143954 2011-11-30 22:11:53Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Hunt <lazy at brandnewmath dot com> + +pkgname=perl-xml-sax-base +pkgver=1.08 +pkgrel=2 +pkgdesc="Base class SAX Drivers and Filters" +arch=('any') +url="http://search.cpan.org/dist/XML-SAX-Base" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$pkgver.tar.gz") +md5sums=('38c8c3247dfd080712596118d70dbe32') + +build() { + cd $srcdir/XML-SAX-Base-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd $srcdir/XML-SAX-Base-$pkgver + make test +} + +package() { + cd $srcdir/XML-SAX-Base-$pkgver + make install DESTDIR=$pkgdir + + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/abs/core/perl_modules/perl-xml-sax/PKGBUILD b/abs/core/perl_modules/perl-xml-sax/PKGBUILD index 2a59677..394b72f 100644 --- a/abs/core/perl_modules/perl-xml-sax/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-sax/PKGBUILD @@ -1,33 +1,37 @@ -# $Id: PKGBUILD 67354 2010-02-06 14:10:53Z giovanni $ +# $Id: PKGBUILD 143956 2011-11-30 22:15:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-sax -pkgver=0.96 -pkgrel=2 -pkgdesc="Simple API for XML " -arch=('i686' 'x86_64') +pkgver=0.99 +pkgrel=3 +pkgdesc="Simple API for XML" +arch=('any') url="http://search.cpan.org/dist/XML-SAX" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'perl-xml-namespacesupport>=0.03') +depends=('perl' 'perl-xml-sax-base' 'perl-xml-namespacesupport') options=('!emptydirs') install=perl-xml-sax.install -source=("http://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-$pkgver.tar.gz" 'perl-xml-sax.patch') -md5sums=('bdcd4119a62505184e211e9dfaef0ab1' - 'b8ad2da4195ac0eede28dfaed4d874c3') +source=("http://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-$pkgver.tar.gz" + 'perl-xml-sax.patch') +md5sums=('290f5375ae87fdebfdb5bc3854019f24' + 'f114c4aad3221d3e7d8314d13b84a869') build() { - cd $srcdir - - patch -p0 < perl-xml-sax.patch || return 1 cd $srcdir/XML-SAX-$pkgver + patch -Np1 -i "${srcdir}/perl-xml-sax.patch" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 +check() { + cd $srcdir/XML-SAX-$pkgver + make test } + package() { cd $srcdir/XML-SAX-$pkgver - make install DESTDIR=$pkgdir || return 1 + make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.install b/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.install index 7b1e1f2..464fdfe 100644 --- a/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.install +++ b/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.install @@ -9,7 +9,3 @@ if [ ! -r /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini ]; then perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" &>/dev/null fi } - -op=$1 -shift -$op $* diff --git a/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.patch b/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.patch index b2db7d2..880468b 100644 --- a/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.patch +++ b/abs/core/perl_modules/perl-xml-sax/perl-xml-sax.patch @@ -1,9 +1,10 @@ ---- XML-SAX-0.96/Makefile.PL.orig 2008-08-04 23:07:21.000000000 +0200 -+++ XML-SAX-0.96/Makefile.PL 2008-12-09 11:52:24.806540909 +0100 -@@ -12,42 +12,3 @@ +--- a/Makefile.PL 2011-09-04 23:37:48.000000000 +0200 ++++ b/Makefile.PL 2011-10-07 18:12:50.000000000 +0200 +@@ -12,43 +12,3 @@ + 'XML::NamespaceSupport' => 0.03, }, ); - +- -sub MY::install { - package MY; - my $script = shift->SUPER::install(@_); diff --git a/abs/core/perl_modules/perl-xml-twig/PKGBUILD b/abs/core/perl_modules/perl-xml-twig/PKGBUILD index b20735d..b8be295 100644 --- a/abs/core/perl_modules/perl-xml-twig/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-twig/PKGBUILD @@ -1,28 +1,33 @@ -# $Id$ +# $Id: PKGBUILD 162138 2012-06-22 05:50:38Z eric $ # Maintainer: damir <damir@archlinux.org> # Maintainer/Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-xml-twig _realname=XML-Twig -pkgver=3.34 -pkgrel=3 +pkgver=3.40 +pkgrel=1 pkgdesc="A module for easy processing of XML" arch=('any') url="http://search.cpan.org/dist/${_realname}/" license=('GPL' 'PerlArtistic') -depends=('perl-xml-parser>=2.23' 'perl-text-iconv' 'perl>=5.12.0') +depends=('perl-xml-parser' 'perl-text-iconv' 'perl') +checkdepends=('perl-libwww' 'perl-test-pod' 'perl-xml-simple' 'perl-html-tree') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MI/MIROD/${_realname}-${pkgver}.tar.gz) -md5sums=('88a24e3e09b2fc1e252f7662d1291f9a') +source=("http://www.cpan.org/authors/id/M/MI/MIROD/${_realname}-${pkgver}.tar.gz") +sha1sums=('37fec67bd2c60d53e861f13a64c1c9e0426858c2') build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL -y INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/abs/core/perl_modules/perl-yaml-syck/PKGBUILD b/abs/core/perl_modules/perl-yaml-syck/PKGBUILD index ab63f2e..1b3f73a 100644 --- a/abs/core/perl_modules/perl-yaml-syck/PKGBUILD +++ b/abs/core/perl_modules/perl-yaml-syck/PKGBUILD @@ -1,38 +1,37 @@ -# $Id$ +# $Id: PKGBUILD 160567 2012-06-02 10:28:42Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.17 -pkgrel=1 +pkgver=1.20 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AV/AVAR/${_realname}-$pkgver.tar.gz) -md5sums=('f788529ad4b2c2fd037ccdfd5e7a88ab') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) +md5sums=('8f6d04ee5817b8479e1234264a8d458d') build() { - cd ${srcdir}/${_realname}-$pkgver + cd "${srcdir}/${_realname}-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-$pkgver" make test } package() { - cd ${srcdir}/${_realname}-$pkgver - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" # license. - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index 394f495..19e1b66 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -1,187 +1,347 @@ +# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + pkgbase=php -pkgname=('php' 'php-cgi' 'php-pear') -pkgver=5.3.3 -pkgrel=8 -_suhosinver=${pkgver}-0.9.10 -pkgdesc='A high-level scripting language' +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.4.5 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -backup=('etc/php/php.ini') -install=php.install -depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre') -#makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' \ -# 'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \ -# 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \ -# 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7') - -makedepends=('mysql' 'libpng' 'libjpeg' 'sqlite3' 'libmcrypt' 'libtool' \ - 'freetype2' 'libjpeg' 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' \ - 'gdbm' 'db>=4.8.26') -options=('emptydirs') -source=("http://museum.php.net/php5/${pkgname}-${pkgver}.tar.bz2" \ - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \ - 'php.ini' 'apache.conf') +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') +md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724' + '0b0bc7a917fc592bdf11dcd3c5c255e9' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + '6d46667e00d65933ec0c958279c0a803' + '825e580dd5708d959b50944afa1b12b6' + 'f56b5bb7e93c802ae8519182fbea3387' + '86c73d481f3099e740e602869bacf637' + 'c60343df74f8e1afb13b084d5c0e47ed') build() { - phpconfig="--srcdir=${srcdir}/${pkgbase}-${pkgver} \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --without-pear \ - " - - phpextensions="--with-openssl=shared \ - --with-zlib=shared \ - --enable-bcmath=shared \ - --with-bz2=shared \ - --enable-calendar=shared \ - --with-curl=shared \ - --enable-dba=shared \ - --without-db2 \ - --without-db3 \ - --with-db4=shared \ - --with-gdbm=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --with-gd=shared \ - --enable-gd-native-ttf \ - --with-jpeg-dir=shared,/usr \ - --with-png-dir=shared,/usr \ - --with-gettext=shared \ - --without-imap \ - --without-imap-ssl \ - --without-ldap \ - --enable-mbstring=shared \ - --with-mcrypt=shared \ - --with-mysql=shared \ - --with-mysql-sock=/tmp/mysql.sock \ - --with-mysql=shared \ - --with-mysqli=shared \ - --without-unixODBC \ - --enable-pdo=shared \ - --with-pdo-mysql=shared \ - --with-pdo-sqlite=shared \ - --without-pdo-odbc \ - --without-pdo-pgsql \ - --with-sqlite=shared \ - --without-pgsql \ - --enable-shmop=shared \ - --without-snmp \ - --enable-soap=shared \ - --enable-sqlite-utf8=shared \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --without-tidy \ - --with-xsl=shared \ - --enable-zip=shared \ - --enable-posix=shared \ - --enable-sockets=shared \ - --enable-xml \ - --enable-session=shared \ - --with-regex=php \ - --with-pcre-regex=/usr \ - --enable-mbstring=all \ - --enable-mbregex \ - --enable-json=shared \ - --with-iconv=shared \ - --with-xmlrpc=shared \ - --without-pspell \ - --with-freetype-dir=shared,/usr \ - " - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --config-cache \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --disable-rpath \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-mbstring \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=/usr \ + --with-gd=shared \ + --with-gdbm \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl \ + --with-imap=shared \ + --with-jpeg-dir=/usr \ + --with-vpx-dir=/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=/usr \ + --with-pspell=shared \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR cd ${srcdir}/${pkgbase}-${pkgver} - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1 + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch # php - mkdir ${srcdir}/build-php - cd ${srcdir}/build-php - ln -s ../${pkgbase}-${pkgver}/configure + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure ./configure ${phpconfig} \ --disable-cgi \ --with-readline \ --enable-pcntl \ - ${phpextensions} || return 1 - make || return 1 + ${phpextensions} + make # cgi and fcgi - cp -a ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed ./configure ${phpconfig} \ - --disable-cli \ - --enable-cgi \ - ${phpextensions} || return 1 - make || return 1 - - # pear - cp -a ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear \ - ${phpextensions} - make || return 1 + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make } +# check() { +# cd ${srcdir}/build-php +# make test +# } + package_php() { - pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'openssl') - replaces=('php') - provides=('php') - backup=('etc/php/php.ini') + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') cd ${srcdir}/build-php - make INSTALL_ROOT=${pkgdir} install || return 1 - install -d -m755 ${pkgdir}/usr/share/pear - # fix broken link - ln -sf phar.phar $pkgdir/usr/bin/phar - # install php.ini - install -D -m644 ${srcdir}/php.ini ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ - # remove static modules - rm -f ${pkgdir}/usr/lib/php/modules/*.a - # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include } package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php' 'pcre' 'libxml2') + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + install='php-fpm.install' + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d + install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf + install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h } package_php-pear() { - pkgdesc='PHP Extension and Application Repository' - depends=('php' 'bash') - backup=('etc/php/pear.conf') - - cd ${srcdir}/build-pear - make install-pear INSTALL_ROOT=${pkgdir} || return 1 - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') -} -md5sums=('21ceeeb232813c10283a5ca1b4c87b48' - 'b66b27c43b1332400ef8982944c3b95b' - '25bf81e701f7914a3d8472a5636640e7' - '96ca078be6729b665be8a865535a97bf') + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make install-pear INSTALL_ROOT=${pkgdir} + rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry} +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite') + pkgdesc='sqlite module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog deleted file mode 100644 index 754dc7c..0000000 --- a/abs/core/php/__changelog +++ /dev/null @@ -1,15 +0,0 @@ -modified php.ini -set base dir to /data/srv/httpd/htdocs -added /data/srv/tmp to basedir -added /usr/share/mythtv/mythweather/scripts/ -send errors to stderr -change .install file, timezone is modified on install -php.ini -jm - remove open_basedir - -split package into "php" "php-cgi" and "php-pear" -mh -php-pear replaces PearLog -mh - -php.ini: mysql.default_socket = /var/run/mysqld/mysqld.sock Ref #753 -mh - -php.install: Change mysql.default_socket diff --git a/abs/core/php/apache.conf b/abs/core/php/apache.conf index 86344c8..c3ca0aa 100644 --- a/abs/core/php/apache.conf +++ b/abs/core/php/apache.conf @@ -3,7 +3,11 @@ <IfModule dir_module> <IfModule php5_module> DirectoryIndex index.php index.html - AddHandler application/x-httpd-php .php - AddHandler application/x-httpd-php-source .phps + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> </IfModule> -</IfModule>
\ No newline at end of file +</IfModule> diff --git a/abs/core/php/db4-test.patch b/abs/core/php/db4-test.patch deleted file mode 100644 index 2c0cb14..0000000 --- a/abs/core/php/db4-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure 2010-07-21 12:53:06.000000000 +0200 -+++ configure 2010-10-22 09:21:54.077666560 +0200 -@@ -30742,7 +30742,7 @@ - #include "confdefs.h" - - #include "$THIS_INCLUDE" --#if DB_VERSION_MINOR != 1 || (DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) -+#if DB_VERSION_MAJOR == 5 || DB_VERSION_MINOR != 1 || (DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) - yes - #endif - diff --git a/abs/core/php/logrotate.d.php-fpm b/abs/core/php/logrotate.d.php-fpm new file mode 100644 index 0000000..ac2d92a --- /dev/null +++ b/abs/core/php/logrotate.d.php-fpm @@ -0,0 +1,8 @@ +/var/log/php-fpm.log { + missingok + notifempty + delaycompress + postrotate + kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/abs/core/php/php-fpm.conf.in.patch b/abs/core/php/php-fpm.conf.in.patch new file mode 100644 index 0000000..0b17182 --- /dev/null +++ b/abs/core/php/php-fpm.conf.in.patch @@ -0,0 +1,52 @@ +--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = /run/php-fpm/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written +@@ -140,7 +140,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -151,9 +152,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -442,7 +443,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/abs/core/php/php-fpm.install b/abs/core/php/php-fpm.install new file mode 100644 index 0000000..41fc37c --- /dev/null +++ b/abs/core/php/php-fpm.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/php-fpm ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/abs/core/php/php-fpm.service b/abs/core/php/php-fpm.service new file mode 100644 index 0000000..e29f7c2 --- /dev/null +++ b/abs/core/php/php-fpm.service @@ -0,0 +1,13 @@ +[Unit] +Description=FastCGI Process Manager for PHP +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/php-fpm/php-fpm.pid +PrivateTmp=true +ExecStart=/usr/sbin/php-fpm +ExecReload=/bin/kill -USR2 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/php/php-fpm.tmpfiles b/abs/core/php/php-fpm.tmpfiles new file mode 100644 index 0000000..801e74f --- /dev/null +++ b/abs/core/php/php-fpm.tmpfiles @@ -0,0 +1 @@ +d /run/php-fpm 755 root root diff --git a/abs/core/php/php.ini b/abs/core/php/php.ini deleted file mode 100644 index 50413b9..0000000 --- a/abs/core/php/php.ini +++ /dev/null @@ -1,1304 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;; -; About php.ini ; -;;;;;;;;;;;;;;;;;;; -; This file controls many aspects of PHP's behavior. In order for PHP to -; read it, it must be named 'php.ini'. PHP looks for it in the current -; working directory, in the path designated by the environment variable -; PHPRC, and in the path that was defined in compile time (in that order). -; The path in which the php.ini file is looked for can be overridden using -; the -c argument in command line mode. -; -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. -; -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. -; -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). -; -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT -; -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. -; -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: -; -; foo = ; sets foo to an empty string -; foo = none ; sets foo to an empty string -; foo = "none" ; sets foo to the string 'none' -; -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. -; -; -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; This is the recommended, PHP 5-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_long_arrays = Off [Performance] -; Disables registration of the older (and deprecated) long predefined array -; variables ($HTTP_*_VARS). Instead, use the superglobals that were -; introduced in PHP 4.1.0 -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $_ENV. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP suppresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. -; - short_open_tag = Off [Portability] -; Using short tags is discouraged when developing code meant for redistribution -; since short tags may not be supported on the target server. - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -engine = On - -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - -; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized. -; NOTE: Using short tags should be avoided when developing applications or -; libraries that are meant for redistribution, or deployment on PHP -; servers which are not under your control, because short tags may not -; be supported on the target server. For portable, redistributable code, -; be sure not to use short tags. -short_open_tag = On - -; Allow ASP-style <% %> tags. -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -y2k_compliance = On - -; Output buffering allows you to send header lines (including cookies) even -; after you send body content, at the price of slowing PHP's output layer a -; bit. You can enable output buffering during runtime by calling the output -; buffering functions. You can also enable output buffering for all files by -; setting this directive to On. If you wish to limit the size of the buffer -; to a certain size - you can use a maximum number of bytes instead of 'On', as -; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "mb_output_handler", character -; encoding will be transparently converted to the specified encoding. -; Setting any output handler automatically turns on output buffering. -; Note: People who wrote portable scripts should not depend on this ini -; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script -; is doing. -; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. -;output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. -zlib.output_compression = Off -;zlib.output_compression_level = -1 - -; You cannot specify additional output handlers if zlib.output_compression -; is activated here. This setting does the same as output_handler but in -; a different order. -;zlib.output_handler = - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -implicit_flush = Off - -; The unserialize callback function will be called (with the undefined class' -; name as parameter), if the unserializer finds an undefined class -; which should be instantiated. -; A warning appears if the specified function is not defined, or if the -; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a -; callback-function. -unserialize_callback_func= - -; When floats & doubles are serialized store serialize_precision significant -; digits after the floating point. The default value ensures that when floats -; are decoded with unserialize, the data will remain the same. -serialize_precision = 100 - -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = Off - -; -; Safe Mode -; -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; including files from this directory and its subdirectories. -; (directory must also be in include_path or full path must -; be used when including) -safe_mode_include_dir = - -; When safe_mode is on, only executables located in the safe_mode_exec_dir -; will be allowed to be executed via the exec family of functions. -safe_mode_exec_dir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -;open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive:/etc:/myth:/media - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_functions = - -; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; <span style="color: ???????"> would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long request, which may end up -; being interrupted by the user or a browser timing out. -; ignore_user_abort = On - -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; realpath_cache_size=16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; realpath_cache_ttl=120 - -; -; Misc -; -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -expose_php = Off - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -max_execution_time = 30 ; Maximum execution time of each script, in seconds -max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -;max_input_nesting_level = 64 ; Maximum input variable nesting level -memory_limit = 64M ; Maximum amount of memory a script may consume (32MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices and coding standards warnings -; -error_reporting = E_ALL & ~E_NOTICE -; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors, except coding standards warnings -; -error_reporting = E_ALL - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. -; -; possible values for display_errors: -; -; Off - Do not display any errors -; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) -; On or stdout - Display errors to STDOUT (default) -; -; To output errors to STDERR with CGI/CLI: -display_errors = "stderr" -; -; Default -; -;display_errors = on - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. -display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. -log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. -ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -report_memleaks = Off - -;report_zend_debug = 0 - -; Store the last error/warning message in $php_errormsg (boolean). -track_errors = Off - -; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. -;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. -; Note: Never use this feature for production boxes. -;docref_root = "/phpmanual/" -;docref_ext = .html - -; String to output before an error message. -;error_prepend_string = "<font color=ff0000>" - -; String to output after an error message. -;error_append_string = "</font>" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog. -error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. -variables_order = "GPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. -register_argc_argv = Off - -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -auto_globals_jit = On - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; Magic quotes -; - -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. -auto_prepend_file = -auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -include_path = ".:/usr/share/pear" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -doc_root = - -; The directory under which PHP opens the script using /~username used only -; if nonempty. -user_dir = - -; Directory in which the loadable extensions (modules) reside. -extension_dir = "/usr/lib/php/modules/" - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -enable_dl = Off - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. -; cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; cgi.redirect_status_env = ; - -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting -; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; cgi.fix_pathinfo=1 - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; fastcgi.impersonate = 1; - -; Disable logging through FastCGI connection -; fastcgi.logging = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -;cgi.rfc2616_headers = 0 - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -allow_url_fopen = on - -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -allow_url_include = on - -; Define the anonymous ftp password (your email address) -;from="john@doe.com" - -; Define the User-Agent string -; user_agent="PHP" - -; Default timeout for socket based streams (seconds) -default_socket_timeout = 60 - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, under UNIX: -; -; extension=msql.so -; -; Note that it should be the name of the module only; no directory information -; needs to go here. Specify the location of the extension with the -; extension_dir directive above. - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Date] -; Defines the default timezone used by the date functions -;date.timezone = - -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 - -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - -[Pcre] -;PCRE library backtracking limit. -;pcre.backtrack_limit=100000 - -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the -;stack size limit imposed by the Operating System). -;pcre.recursion_limit=100000 - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -define_syslog_variables = Off - -[mail function] -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -;sendmail_path = - -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = - -[SQL] -sql.safe_mode = Off - -[ODBC] -;odbc.default_db = Not yet implemented -;odbc.default_user = Not yet implemented -;odbc.default_pw = Not yet implemented - -; Allow or prevent persistent links. -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -odbc.defaultlrl = 4096 - -; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. -; See the documentation on odbc_binmode and odbc_longreadlen for an explanation -; of uodbc.defaultlrl and uodbc.defaultbinmode -odbc.defaultbinmode = 1 - -[MySQL] -; Allow or prevent persistent links. -mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysql.default_socket = /var/run/mysqld/mysqld.sock - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysql.default_password = - -; Maximum time (in seconds) for connect timeout. -1 means no limit -mysql.connect_timeout = 60 - -; Trace mode. When trace_mode is active (=On), warnings for table/index scans and -; SQL-Errors will be displayed. -mysql.trace_mode = Off - -[MySQLi] - -; Maximum number of links. -1 means no limit. -mysqli.max_links = -1 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - -[mSQL] -; Allow or prevent persistent links. -msql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -msql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -msql.max_links = -1 - -[OCI8] -; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) -;oci8.privileged_connect = Off - -; Connection: The maximum number of persistent OCI8 connections per -; process. Using -1 means no limit. -;oci8.max_persistent = -1 - -; Connection: The maximum number of seconds a process is allowed to -; maintain an idle persistent connection. Using -1 means idle -; persistent connections will be maintained forever. -;oci8.persistent_timeout = -1 - -; Connection: The number of seconds that must pass before issuing a -; ping during oci_pconnect() to check the connection validity. When -; set to 0, each oci_pconnect() will cause a ping. Using -1 disables -; pings completely. -;oci8.ping_interval = 60 - -; Tuning: This option enables statement caching, and specifies how -; many statements to cache. Using 0 disables statement caching. -;oci8.statement_cache_size = 20 - -; Tuning: Enables statement prefetching and sets the default number of -; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 - -; Compatibility. Using On means oci_close() will not close -; oci_connect() and oci_new_connect() connections. -;oci8.old_oci_close_semantics = Off - -[PostgresSQL] -; Allow or prevent persistent links. -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -pgsql.max_links = -1 - -; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. -pgsql.ignore_notice = 0 - -; Log PostgreSQL backends Noitce message or not. -; Unless pgsql.ignore_notice=0, module cannot log notice message. -pgsql.log_notice = 0 - -[Sybase] -; Allow or prevent persistent links. -sybase.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybase.max_links = -1 - -;sybase.interface_file = "/usr/sybase/interfaces" - -; Minimum error severity to display. -sybase.min_error_severity = 10 - -; Minimum message severity to display. -sybase.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -; If on, this will cause PHP to automatically assign types to results according -; to their Sybase type, instead of treating them all as strings. This -; compatibility mode will probably not stay around forever, so try applying -; whatever necessary changes to your code, and turn it off. -sybase.compatability_mode = Off - -[Sybase-CT] -; Allow or prevent persistent links. -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybct.max_links = -1 - -; Minimum server message severity to display. -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -sybct.min_client_severity = 10 - -[bcmath] -; Number of decimal digits for all bcmath functions. -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Informix] -; Default host for ifx_connect() (doesn't apply in safe mode). -ifx.default_host = - -; Default user for ifx_connect() (doesn't apply in safe mode). -ifx.default_user = - -; Default password for ifx_connect() (doesn't apply in safe mode). -ifx.default_password = - -; Allow or prevent persistent links. -ifx.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ifx.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ifx.max_links = -1 - -; If on, select statements return the contents of a text blob instead of its id. -ifx.textasvarchar = 0 - -; If on, select statements return the contents of a byte blob instead of its id. -ifx.byteasvarchar = 0 - -; Trailing blanks are stripped from fixed-length char columns. May help the -; life of Informix SE users. -ifx.charasvarchar = 0 - -; If on, the contents of text and byte blobs are dumped to a file instead of -; keeping them in memory. -ifx.blobinfile = 0 - -; NULL's are returned as empty strings, unless this is set to 1. In that case, -; NULL's are returned as string 'NULL'. -ifx.nullformat = 0 - -[Session] -; Handler used to store/retrieve data. -session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. -; -; As of PHP 4.0.1, you can define the path as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -session.save_path = "/tmp" - -; Whether to use cookies. -session.use_cookies = 1 - -;session.cookie_secure = - -; This option enables administrators to make their users invulnerable to -; attacks which involve passing session ids in URLs; defaults to 0. -; session.use_only_cookies = 1 - -; Name of the session (used as cookie name). -session.name = PHPSESSID - -; Initialize session on request startup. -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -session.cookie_path = / - -; The domain for which the cookie is valid. -session.cookie_domain = - -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = - -; Handler used to serialize data. php is the standard serializer of PHP. -session.serialize_handler = php - -; Define the probability that the 'garbage collection' process is started -; on every session initialization. -; The probability is calculated by using gc_probability/gc_divisor, -; e.g. 1/100 means there is a 1% chance that the GC process starts -; on each request. - -session.gc_probability = 1 -session.gc_divisor = 1000 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, albeit register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. - -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -session.referer_check = - -; How many bytes to read from the file. -session.entropy_length = 0 - -; Specified here to create the session id. -session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. -session.cache_limiter = nocache - -; Document expires after n minutes. -session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -session.use_trans_sid = 0 - -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," -session.hash_bits_per_character = 5 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden <input> field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Connect timeout -;mssql.connect_timeout = 5 - -; Query timeout -;mssql.timeout = 60 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -; Specify how datetime and datetim4 columns are returned -; On => Returns data converted to SQL server settings -; Off => Returns values as YYYY-MM-DD hh:mm:ss -;mssql.datetimeconvert = On - -; Use NT authentication when connecting to the server -mssql.secure_connection = Off - -; Specify max number of processes. -1 = library default -; msdlib defaults to 25 -; FreeTDS defaults to 4096 -;mssql.max_procs = -1 - -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - -[COM] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = -; allow Distributed-COM calls -;com.allow_dcom = true -; autoregister constants of a components typlib on com_load() -;com.autoregister_typelib = true -; register constants casesensitive -;com.autoregister_casesensitive = false -; show warnings on duplicate constant registrations -;com.autoregister_verbose = true - -[mbstring] -; language for internal character representation. -;mbstring.language = Japanese - -; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) -;mbstring.internal_encoding = EUC-JP - -; http input encoding. -;mbstring.http_input = auto - -; http output encoding. mb_output_handler must be -; registered as output buffer to function -;mbstring.http_output = SJIS - -; enable automatic encoding translation according to -; mbstring.internal_encoding setting. Input chars are -; converted to internal encoding by setting this to On. -; Note: Do _not_ use automatic encoding translation for -; portable libs/applications. -;mbstring.encoding_translation = Off - -; automatic encoding detection order. -; auto means -;mbstring.detect_order = auto - -; substitute_character used when character cannot be converted -; one from another -;mbstring.substitute_character = none; - -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -;mbstring.func_overload = 0 - -; enable strict encoding detection. -;mbstring.strict_encoding = Off - -[FrontBase] -;fbsql.allow_persistent = On -;fbsql.autocommit = On -;fbsql.show_timestamp_decimals = Off -;fbsql.default_database = -;fbsql.default_database_password = -;fbsql.default_host = -;fbsql.default_password = -;fbsql.default_user = "_SYSTEM" -;fbsql.generate_warnings = Off -;fbsql.max_connections = 128 -;fbsql.max_links = 128 -;fbsql.max_persistent = -1 -;fbsql.max_results = 128 - -[gd] -; Tell the jpeg decode to libjpeg warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -;gd.jpeg_ignore_warning = 0 - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -soap.wsdl_cache_enabled=1 -; Sets the directory name where SOAP extension will put cache files. -soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -soap.wsdl_cache_ttl=86400 - - -; available extensions -; -;extension=bcmath.so -;extension=bz2.so -;extension=calendar.so -;extension=curl.so -;extension=dba.so -;extension=dbase.so -;extension=exif.so -;extension=ftp.so -;extension=gd.so -extension=gettext.so -;extension=iconv.so -;extension=imap.so -;extension=json.so -;extension=ldap.so -;extension=mcrypt.so -;extension=mime_magic.so -extension=mysql.so -;extension=mysqli.so -;extension=ncurses.so -;extension=odbc.so -;extension=openssl.so -;extension=pdo.so -;extension=pdo_mysql.so -;extension=pdo_odbc.so -;extension=pdo_pgsql.so -;extension=pdo_sqlite.so -;extension=pgsql.so -extension=posix.so -;extension=pspell.so -extension=session.so -;extension=shmop.so -;extension=snmp.so -;extension=soap.so -;extension=sockets.so -;extension=sqlite.so -;extension=sysvmsg.so -;extension=sysvsem.so -;extension=sysvshm.so -;extension=tidy.so -;extension=xmlrpc.so -;extension=xsl.so -;extension=zip.so -extension=zlib.so - - -; Local Variables: -; tab-width: 4 -; End: diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch new file mode 100644 index 0000000..bbaae21 --- /dev/null +++ b/abs/core/php/php.ini.patch @@ -0,0 +1,122 @@ +--- php.ini-production 2012-03-29 06:17:59.000000000 +0200 ++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200 +@@ -305,7 +305,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -702,7 +702,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -725,7 +725,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -859,51 +859,47 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/abs/core/php/php.install b/abs/core/php/php.install deleted file mode 100644 index b040032..0000000 --- a/abs/core/php/php.install +++ /dev/null @@ -1,75 +0,0 @@ -post_install() { - # change mysql.default_socket for mythweb - sed -i 's/^mysql.default_socket.*$/mysql.default_socket = \/var\/run\/mysqld\/mysqld.sock/g' /etc/php/php.ini - if [ -f /etc/systemconfig ] - then - . /etc/systemconfig - if [ -f /etc/php/php.ini ] - then - sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini - fi - fi -} - -pre_upgrade() { - # we moved php.ini from /etc/ to /etc/php - # lets save the old file before pacman deletes it. - # can be removed later - if [ -f /etc/php.ini ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ];then - echo 'Backing up old php.ini...' - mv /etc/php.ini /etc/php.ini.pacsave.tmp - fi -} - -post_upgrade() { - post_install - echo ' - ==> Review your php.ini - - Your php installation has been updated. You should review your current - php.ini and check any upstream changes according to the default - configuration which can be found at php.ini.pacnew. - ' - # if we upgraded from an installation with old config layout, move the old - # php.ini to the right place and inform the user about the changes. - # can be removed later - if [ -f /etc/php.ini.pacsave.tmp ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ]; then - echo 'Restoring old php.ini...' - mv /etc/php/php.ini /etc/php/php.ini.pacnew - mv /etc/php.ini.pacsave.tmp /etc/php/php.ini - if [ -f /etc/systemconfig ] - then - . /etc/systemconfig - if [ -f /etc/php/php.ini ] - then - sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini - fi - fi - echo 'Updating extension dir...' - sed -i -e 's/#extension_dir = "/usr/lib/php/20060613/"/#extension_dir = "/usr/lib/php/modules/"#g' /etc/php/php.ini - echo ' - ==> Location of php.ini has changed - - A previous configuration was found at /etc/php.ini. PHP stores its - configuration at /etc/php/ now. Your old php.ini was moved to - /etc/php/php.ini. You should merge your old file with the - default one that can be found at /etc/php/php.ini.pacnew. - - Make sure to enable the modules you need. A lot of them are shared - objects now and not statically built into php. - - External modules store their configuration in /etc/php/conf.d/. PHP - scans that directory for any ini files. - ' - fi - # be nice to [testing] users and update php.ini to fix bug #8141. - # can be removed later - if [ $(vercmp '5.2.4-3' $2) -eq 0 ]; then - echo 'Updating extension dir...' - sed -i -e 's/#extension_dir = "/usr/lib/php/extensions/"/#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini - fi -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/abs/core/php/rc.d.php-fpm b/abs/core/php/rc.d.php-fpm new file mode 100644 index 0000000..47f0886 --- /dev/null +++ b/abs/core/php/rc.d.php-fpm @@ -0,0 +1,144 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /run/php-fpm/php-fpm.pid` + + wait_for_pid removed /run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /run/php-fpm/php-fpm.pid` + + wait_for_pid removed /run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/abs/core/pinentry/PKGBUILD b/abs/core/pinentry/PKGBUILD new file mode 100644 index 0000000..072a2b2 --- /dev/null +++ b/abs/core/pinentry/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 160802 2012-06-06 10:36:53Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=pinentry +pkgver=0.8.1 +pkgrel=4 +pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/aegypten2" +depends=('ncurses' 'libcap>=2.16') +makedepends=('gtk2' 'qt') +optdepends=('gtk2: for gtk2 backend' + 'qt: for qt4 backend') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz + qt4-pinentry-window.patch) +install=pinentry.install + +build() { + cd $srcdir/$pkgname-$pkgver + #fix: https://bugs.archlinux.org/task/29998 + patch -Np1 -i ../qt4-pinentry-window.patch + for file in qt4/*.moc; do + /usr/bin/moc ${file/.moc/.h} > ${file} + done + ./configure --prefix=/usr \ + --enable-pinentry-curses \ + --disable-pinentry-gtk \ + --disable-pinentry-qt \ + --enable-pinentry-gtk2 \ + --enable-pinentry-qt4 \ + --enable-fallback-curses + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} +md5sums=('81f99904daee5331eb6738408bb024b6' + '450b8713fe42f1bd93311ef84767c3d8') diff --git a/abs/core/pinentry/pinentry.install b/abs/core/pinentry/pinentry.install new file mode 100644 index 0000000..eed2c71 --- /dev/null +++ b/abs/core/pinentry/pinentry.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(pinentry.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/abs/core/pinentry/qt4-pinentry-window.patch b/abs/core/pinentry/qt4-pinentry-window.patch new file mode 100644 index 0000000..8f9faae --- /dev/null +++ b/abs/core/pinentry/qt4-pinentry-window.patch @@ -0,0 +1,28 @@ +From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Tue, 1 Feb 2011 14:42:27 +0100 +Subject: [PATCH] Fix qt4 pinentry window created in the background + +This is probably just a workaround. Proper fix is being investigated. +See: +https://bugzilla.redhat.com/show_bug.cgi?id=589532 +http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background +--- + qt4/pinentrydialog.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp +index 541baf4..d634eb6 100644 +--- a/qt4/pinentrydialog.cpp ++++ b/qt4/pinentrydialog.cpp +@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) + SetForegroundWindow( w->winId() ); + #endif + w->raise(); +- w->activateWindow(); + } + + QPixmap icon( QStyle::StandardPixmap which ) +-- +1.7.3.5 + diff --git a/abs/core/pixman/PKGBUILD b/abs/core/pixman/PKGBUILD index 4c748a1..ca06c0a 100644 --- a/abs/core/pixman/PKGBUILD +++ b/abs/core/pixman/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 87575 2010-08-17 07:05:01Z jgc $ +# $Id: PKGBUILD 162772 2012-06-30 07:29:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=pixman -pkgver=0.20.0 +pkgver=0.26.2 pkgrel=1 -pkgdesc="Pixman library" +pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('1daf014714cc29147726abada12359345d156705') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('512ec766a911142b901157ba581f6e75') diff --git a/abs/core/pkg-config/PKGBUILD b/abs/core/pkg-config/PKGBUILD index 9c671df..a235d17 100644 --- a/abs/core/pkg-config/PKGBUILD +++ b/abs/core/pkg-config/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 85540 2010-07-15 04:44:14Z allan $ +# $Id: PKGBUILD 163491 2012-07-13 12:30:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=pkg-config -pkgver=0.25 -pkgrel=2 +pkgver=0.27 +pkgrel=1 pkgdesc="A system for managing library compile/link flags" arch=('i686' 'x86_64') url="http://pkgconfig.freedesktop.org/wiki/" license=('GPL') groups=('base-devel') -depends=('glibc') +depends=('glib2') provides=("pkgconfig=${pkgver}") conflicts=('pkgconfig') replaces=('pkgconfig') -source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz - autoconf-2.66.patch) -md5sums=('a3270bab3f4b69b7dc6dbdacbcae9745' - '0fbfc1a5088f792bbeec7b5090e449f1') +source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) +md5sums=('3a4c9feab14b6719afd8904945d9b4e4') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/autoconf-2.66.patch ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/abs/core/pkg-config/autoconf-2.66.patch b/abs/core/pkg-config/autoconf-2.66.patch deleted file mode 100644 index 14cabdf..0000000 --- a/abs/core/pkg-config/autoconf-2.66.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 ---- pkg-config-0.25-old//pkg.m4 2009-12-07 06:39:02.000000000 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/abs/core/poppler/PKGBUILD b/abs/core/poppler/PKGBUILD new file mode 100644 index 0000000..d1e213e --- /dev/null +++ b/abs/core/poppler/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 163501 2012-07-13 16:26:14Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.20.2 +pkgrel=1 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://poppler.freedesktop.org/" +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) +md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' + '9dc64c254a31e570507bdd4ad4ba629a') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.ac + + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + LANG=en_US.UTF8 make check +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + conflicts=("poppler-qt3<${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'glib2') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* + rm -f "${pkgdir}/usr/bin/poppler-glib-demo" +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/abs/core/popt/PKGBUILD b/abs/core/popt/PKGBUILD index 5905959..96b9026 100644 --- a/abs/core/popt/PKGBUILD +++ b/abs/core/popt/PKGBUILD @@ -1,42 +1,32 @@ -# $Id: PKGBUILD 80029 2010-05-10 17:03:30Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=popt pkgver=1.16 -pkgrel=2 +pkgrel=5 pkgdesc="A commandline option parser" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64') url="http://rpm5.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('3743beefa3dd6247a73f8f7a32c14c33') +source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - # move libs in /lib - install -Dm755 ${pkgdir}/usr/lib/libpopt.so.0.0.0 \ - ${pkgdir}/lib/libpopt.so.0.0.0 || return 1 - - rm ${pkgdir}/usr/lib/libpopt.so* || return 1 - ln -sf /lib/libpopt.so ${pkgdir}/usr/lib/libpopt.so - ln -sf libpopt.so.0 ${pkgdir}/lib/libpopt.so - ln -sf libpopt.so.0.0.0 ${pkgdir}/lib/libpopt.so.0 - - # install license - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1 + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/poweroff-scripts/PKGBUILD b/abs/core/poweroff-scripts/PKGBUILD index af2fcd4..f15cddf 100644 --- a/abs/core/poweroff-scripts/PKGBUILD +++ b/abs/core/poweroff-scripts/PKGBUILD @@ -10,7 +10,7 @@ replaces=() backup=() install=poweroff-scripts.install source=(halt.script reboot.script poweroff.script shutdown.script) -arch=('i686') +arch=('i686' 'x86_64') build() { install -d $pkgdir/sbin/ diff --git a/abs/core/ppl/PKGBUILD b/abs/core/ppl/PKGBUILD index ee5979a..daa1196 100644 --- a/abs/core/ppl/PKGBUILD +++ b/abs/core/ppl/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 87232 2010-08-11 12:07:18Z allan $ +# $Id: PKGBUILD 162899 2012-07-03 10:44:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: ezzetabi <ezzetabi at gawab dot com> pkgname=ppl -pkgver=0.11 +pkgver=1.0 pkgrel=1 pkgdesc="A modern library for convex polyhedra and other numerical abstractions." arch=('i686' 'x86_64') -url="http://www.cs.unipr.it/ppl" +url="http://bugseng.com/products/ppl" license=('GPL3') depends=('gmp>=5.0') options=('!docs' '!libtool') -source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz) -md5sums=('ba527ec0ffc830ce16fad8a4195a337e') +source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) +md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c' + '5f490df826c76fed296060ca8fca4eb5') build() { cd $srcdir/ppl-$pkgver ./configure --prefix=/usr --enable-interfaces="c,cxx" make +} + +check() { + cd $srcdir/ppl-$pkgver make check } @@ -25,3 +30,4 @@ package() { cd $srcdir/ppl-$pkgver make DESTDIR=$pkgdir install } + diff --git a/abs/core/ppl/ppl-0.10.2-gmp-5.0.patch b/abs/core/ppl/ppl-0.10.2-gmp-5.0.patch deleted file mode 100644 index 4d6964a..0000000 --- a/abs/core/ppl/ppl-0.10.2-gmp-5.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 -index 60cecdc..15acb18 100644 ---- a/m4/ac_check_gmp.m4 -+++ b/m4/ac_check_gmp.m4 -@@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #GMP version 4.1.3 or higher is required - #endif - -+#ifndef BITS_PER_MP_LIMB -+#define BITS_PER_MP_LIMB GMP_LIMB_BITS -+#endif -+ - int - main() { - std::string header_version; -@@ -97,11 +101,11 @@ main() { - return 1; - } - -- if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS -- || GMP_LIMB_BITS != mp_bits_per_limb) { -+ if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB -+ || BITS_PER_MP_LIMB != mp_bits_per_limb) { - std::cerr - << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" -- << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" -+ << "header gives " << BITS_PER_MP_LIMB << ";\n" - << "library gives " << mp_bits_per_limb << ".\n" - << "This probably means you are on a bi-arch system and\n" - << "you are compiling with the wrong header or linking with\n" diff --git a/abs/core/ppp/PKGBUILD b/abs/core/ppp/PKGBUILD index fcf8032..33c7ecc 100644 --- a/abs/core/ppp/PKGBUILD +++ b/abs/core/ppp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66522 2010-01-31 13:12:49Z thomas $ +# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=1 -pkgdesc="A daemon which implements the PPP protocol for dial-up networking" -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" +arch=(i686 x86_64) url="http://www.samba.org/ppp/" license=('custom:GPL/BSD') groups=('base') @@ -34,7 +34,7 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57' '8d1be5af8e46393ba6eb273377831e38') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # fix CFLAGS # -D_GNU_SOURCE is needed for IPv6 to work apparently export CFLAGS="$CFLAGS -D_GNU_SOURCE" @@ -51,25 +51,30 @@ build() { # Enable Microsoft proprietary Callback Control Protocol sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux + # Fix build error with recent kernels + rm include/linux/if_pppol2tp.h + ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/usr install || return 1 - install -D -m644 ${srcdir}/options ${pkgdir}/etc/ppp/options || return 1 - install -D -m755 ${srcdir}/ip-up ${pkgdir}/etc/ppp/ip-up || return 1 - install -D -m755 ${srcdir}/ip-down ${pkgdir}/etc/ppp/ip-down || return 1 - install -d -m755 ${pkgdir}/etc/ppp/ip-up.d || return 1 - install -d -m755 ${pkgdir}/etc/ppp/ip-down.d || return 1 - install -m755 ${srcdir}/ip-up.d.dns.sh ${pkgdir}/etc/ppp/ip-up.d/00-dns.sh || return 1 - install -m755 ${srcdir}/ip-down.d.dns.sh ${pkgdir}/etc/ppp/ip-down.d/00-dns.sh || return 1 - install -D -m755 ${srcdir}/pon ${pkgdir}/usr/bin/pon || return 1 - install -D -m755 ${srcdir}/poff ${pkgdir}/usr/bin/poff || return 1 - install -D -m755 ${srcdir}/plog ${pkgdir}/usr/sbin/plog || return 1 - install -D -m600 etc.ppp/pap-secrets ${pkgdir}/etc/ppp/pap-secrets || return 1 - install -D -m600 etc.ppp/chap-secrets ${pkgdir}/etc/ppp/chap-secrets || return 1 - install -D -m755 ${srcdir}/ppp ${pkgdir}/etc/rc.d/ppp || return 1 - install -D -m644 ${srcdir}/pon.1 ${pkgdir}/usr/share/man/man1/pon.1 || return 1 - install -d -m755 ${pkgdir}/etc/ppp/peers || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/usr" install + install -D -m644 ../options "${pkgdir}/etc/ppp/options" + install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up" + install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down" + install -d -m755 "${pkgdir}/etc/ppp/ip-up.d" + install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" + install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" + install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" + install -D -m755 ../pon "${pkgdir}/usr/bin/pon" + install -D -m755 ../poff "${pkgdir}/usr/bin/poff" + install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" + install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" + install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" + install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" + install -d -m755 "${pkgdir}/etc/ppp/peers" + chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so } diff --git a/abs/core/procps-ng/PKGBUILD b/abs/core/procps-ng/PKGBUILD new file mode 100644 index 0000000..60eea9e --- /dev/null +++ b/abs/core/procps-ng/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 163561 2012-07-15 23:10:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=procps-ng +pkgver=3.3.3 +pkgrel=3 +pkgdesc="Utilities for monitoring your system and processes on your system" +arch=('i686' 'x86_64') +url="http://gitorious.org/procps" +license=('GPL' 'LGPL') +groups=('base') +depends=('ncurses') +conflicts=('procps') +provides=('procps') +replaces=('procps') +backup=('etc/sysctl.conf') +options=('!libtool') +source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} + sysctl.conf) +sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' + 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') + +build() { + cd "${srcdir}/procps-procps" + echo ${pkgver} > .tarball-version + ./autogen.sh + ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib + make +} + +package() { + cd "${srcdir}/procps-procps" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" +} diff --git a/abs/core/procps-ng/sysctl.conf b/abs/core/procps-ng/sysctl.conf new file mode 100644 index 0000000..baddd90 --- /dev/null +++ b/abs/core/procps-ng/sysctl.conf @@ -0,0 +1,46 @@ +# /etc/sysctl.conf - Configuration file for setting system variables +# See sysctl.conf (5) for information. + +# you can have the CD-ROM close when you use it, and open +# when you are done. +#dev.cdrom.autoeject = 1 +#dev.cdrom.autoclose = 1 + +# protection from the SYN flood attack +net.ipv4.tcp_syncookies = 1 + +# see the evil packets in your log files +#net.ipv4.conf.all.log_martians = 1 + +# if not functioning as a router, there is no need to accept redirects or source routes +#net.ipv4.conf.all.accept_redirects = 0 +#net.ipv4.conf.all.accept_source_route = 0 +#net.ipv6.conf.all.accept_redirects = 0 +#net.ipv6.conf.all.accept_source_route = 0 + +# Disable packet forwarding +net.ipv4.ip_forward = 0 +net.ipv6.conf.all.forwarding = 0 + +# Enable IPv6 Privacy Extensions +net.ipv6.conf.default.use_tempaddr = 2 +net.ipv6.conf.all.use_tempaddr = 2 + +# sets the port range used for outgoing connections +#net.ipv4.ip_local_port_range = 32768 61000 + +# Swapping too much or not enough? Disks spinning up when you'd +# rather they didn't? Tweak these. +#vm.vfs_cache_pressure = 100 +#vm.laptop_mode = 0 +#vm.swappiness = 60 + +#kernel.printk_ratelimit_burst = 10 +#kernel.printk_ratelimit = 5 +#kernel.panic_on_oops = 0 + +# Reboot 600 seconds after a panic +#kernel.panic = 600 + +# Disable SysRq key (note: console security issues) +kernel.sysrq = 0 diff --git a/abs/core/psmisc/ChangeLog b/abs/core/psmisc/ChangeLog deleted file mode 100644 index d9fa6df..0000000 --- a/abs/core/psmisc/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -2010-09-06 Eric Belanger <eric@archlinux.org> - - * psmisc 22.13-1 - * Upstream update - -2010-08-03 Eric Belanger <eric@archlinux.org> - - * psmisc 22.12-1 - * Upstream update - * Updated psmisc.checkregs.fix.patch - -2010-04-30 Eric Belanger <eric@archlinux.org> - - * psmisc 22.11-1 - * Upstream update - -2010-01-12 Eric Belanger <eric@archlinux.org> - - * psmisc 22.10-1 - * Upstream update - -2009-07-31 Eric Belanger <eric@archlinux.org> - - * psmisc 22.8-1 - * Upstream update - -2009-05-14 Eric Belanger <eric@archlinux.org> - - * psmisc 22.7-1 - * Upstream update - -2009-04-30 Eric Belanger <eric@archlinux.org> - - * psmisc 22.6-2.1 - * Added peekfd in x86_64 package (close FS#14514) - -2008-10-19 Eric Belanger <eric@archlinux.org> - - * Updated url - * Added ChangeLog diff --git a/abs/core/psmisc/PKGBUILD b/abs/core/psmisc/PKGBUILD index 0508bcc..28e7909 100644 --- a/abs/core/psmisc/PKGBUILD +++ b/abs/core/psmisc/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 90063 2010-09-07 03:39:08Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 162759 2012-06-29 18:27:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc -pkgver=22.13 +pkgver=22.19 pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') -depends=('glibc' 'ncurses') -changelog=ChangeLog +depends=('ncurses') source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -md5sums=('e2c339e6b65b730042084023784a729e') -sha1sums=('5d53c8bb5a279176be3515c07d833cdf116dd516') +sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } package() { diff --git a/abs/core/pth/PKGBUILD b/abs/core/pth/PKGBUILD new file mode 100644 index 0000000..8ba1b84 --- /dev/null +++ b/abs/core/pth/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 146737 2012-01-16 22:52:42Z dreisner $ +# Maintainer: damir <damir@archlinux.org> + +pkgname=pth +pkgver=2.0.7 +pkgrel=4 +pkgdesc="The GNU Portable Threads." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/pth/" +license=('LGPL') +depends=('glibc' 'awk') +options=('!libtool' '!makeflags') +source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig}) +sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee' + '8cb16dffbf15ba92bda8d08918eaf5995642fc38') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --disable-static \ + --enable-shared \ + --with-pic + + sed -i "s|awk=''|awk=/bin/awk|g" shtool # "Cannot find a reasonable Awk" + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=${pkgdir} install +} diff --git a/abs/core/python2/ChangeLog b/abs/core/python2/ChangeLog deleted file mode 100644 index 2d5c46a..0000000 --- a/abs/core/python2/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2008-12-07 Allan McRae <allan@archlinux.org> - * python 2.6.1-1 - * upstream update - * fix gdbm related build error - * fix modulator/pynche launchers - -2008-10-27 Allan McRae <allan@archlinux.org> - * python 2.6-2 - * patched to use internal expat
\ No newline at end of file diff --git a/abs/core/python2/PKGBUILD b/abs/core/python2/PKGBUILD index da78268..0273175 100644 --- a/abs/core/python2/PKGBUILD +++ b/abs/core/python2/PKGBUILD @@ -1,75 +1,84 @@ -# $Id: PKGBUILD 75257 2010-04-01 05:30:58Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.6.6 -pkgrel=5 -_pybasever=2.6 +pkgver=2.7.3 +pkgrel=2 +_pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') -url="http://www.python.org" -depends=('db>=5.1' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3') -makedepends=('tk>=8.5.0') -optdepends=('tk: for IDLE, pynche and modulator') -provides=('python2' 'python' 'python-elementtree' 'python-ctypes') -replaces=('python' 'python-elementtree' 'python-ctypes') -source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - python-2.6-internal-expat.patch - python-2.6-db-4.8.patch - modulator-launcher - pynche-launcher) +url="http://www.python.org/" +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') +makedepends=('tk') +optdepends=('tk: for IDLE') +conflicts=('python<3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) +sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') build() { - cd ${srcdir}/Python-${pkgver} + cd "${srcdir}/Python-${pkgver}" - patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch || return 1 + # Temporary workaround for FS#22322 + # See http://bugs.python.org/issue10835 for upstream report + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c - #http://bugs.python.org/issue6949 - patch -Np0 -i ${srcdir}/python-2.6-db-4.8.patch || return 1 + # Enable built-in SQLite module to load extensions (fix FS#22122) + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* export OPT="${CFLAGS}" - ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode + ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ + --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm - make || return 1 + make } + package() { - cd ${srcdir}/Python-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" altinstall maninstall - rm ${pkgdir}/usr/bin/python - ln -sf python${_pybasever} ${pkgdir}/usr/bin/python - ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2 + ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" + ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" ln -sf ../../libpython${_pybasever}.so \ - ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so + "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + + mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" - # Install the tools - #modulator - sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/modulator-launcher - install -m755 ${srcdir}/modulator-launcher ${pkgdir}/usr/bin/modulator - cp -r Tools/modulator ${pkgdir}/usr/lib/python${_pybasever}/site-packages/ + # some useful "stuff" + install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" + install -m755 Tools/scripts/{README,*py} \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" - #pynche - sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/pynche-launcher - install -m755 ${srcdir}/pynche-launcher ${pkgdir}/usr/bin/pynche - rm -f Tools/pynche/*.pyw - cp -r Tools/pynche ${pkgdir}/usr/lib/python${_pybasever}/site-packages/ + # fix conflicts with python + mv "${pkgdir}"/usr/bin/idle{,2} + mv "${pkgdir}"/usr/bin/pydoc{,2} + mv "${pkgdir}"/usr/bin/2to3{,-2.7} - #gettext - install -m755 Tools/i18n/pygettext.py ${pkgdir}/usr/bin/ - install -m755 Tools/i18n/msgfmt.py ${pkgdir}/usr/bin/ + # clean up #!s + find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - mkdir -p ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts - install -m644 Tools/scripts/README ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/ - install -m755 Tools/scripts/*py ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/ + # clean-up reference to build directory + sed -i "s#${srcdir}/Python-${pkgver}:##" \ + "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" # license - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('cf4e6881bb84a7ce6089e4a307f71f14' - '993800dbcc0c4f199c1ceee998a06e71' - '10eb5449ead95b9cb13eae9f9a65894e' - 'b4a531570415280dc406c8d5c1fa8d83' - '9f731b9033db285132a3524fb36409e7') diff --git a/abs/core/python2/modulator-launcher b/abs/core/python2/modulator-launcher deleted file mode 100644 index ba46e93..0000000 --- a/abs/core/python2/modulator-launcher +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec /usr/lib/python%%PYBASEVER%%/site-packages/modulator/modulator.py diff --git a/abs/core/python2/pynche-launcher b/abs/core/python2/pynche-launcher deleted file mode 100644 index a4338a7..0000000 --- a/abs/core/python2/pynche-launcher +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -/usr/lib/python%%PYBASEVER%%/site-packages/pynche/pynche - diff --git a/abs/core/python2/python-2.6-db-4.8.patch b/abs/core/python2/python-2.6-db-4.8.patch deleted file mode 100644 index 2032f92..0000000 --- a/abs/core/python2/python-2.6-db-4.8.patch +++ /dev/null @@ -1,123 +0,0 @@ -Index: setup.py -=================================================================== ---- setup.py (revision 74955) -+++ setup.py (working copy) -@@ -695,7 +695,7 @@ - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 7) -+ max_db_ver = (4, 8) - min_db_ver = (3, 3) - db_setup_debug = False # verbose debug prints from this script? - -Index: Modules/_bsddb.c -=================================================================== ---- Modules/_bsddb.c (revision 74955) -+++ Modules/_bsddb.c (working copy) -@@ -215,7 +215,11 @@ - #define DB_BUFFER_SMALL ENOMEM - #endif - -+#if (DBVER < 48) -+#define DB_GID_SIZE DB_XIDDATASIZE -+#endif - -+ - /* --------------------------------------------------------------------- */ - /* Structure definitions */ - -@@ -4501,7 +4505,11 @@ - DBTxnObject *txn; - #define PREPLIST_LEN 16 - DB_PREPLIST preplist[PREPLIST_LEN]; -+#if (DBVER < 48) - long retp; -+#else -+ u_int32_t retp; -+#endif - - CHECK_ENV_NOT_CLOSED(self); - -@@ -4522,7 +4530,7 @@ - flags=DB_NEXT; /* Prepare for next loop pass */ - for (i=0; i<retp; i++) { - gid=PyBytes_FromStringAndSize((char *)(preplist[i].gid), -- DB_XIDDATASIZE); -+ DB_GID_SIZE); - if (!gid) { - Py_DECREF(list); - return NULL; -@@ -5047,6 +5055,7 @@ - } - - -+#if (DBVER < 48) - static PyObject* - DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs) - { -@@ -5068,6 +5077,7 @@ - RETURN_IF_ERR(); - RETURN_NONE(); - } -+#endif - - static PyObject* - DBEnv_set_verbose(DBEnvObject* self, PyObject* args) -@@ -5947,9 +5957,9 @@ - if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size)) - return NULL; - -- if (gid_size != DB_XIDDATASIZE) { -+ if (gid_size != DB_GID_SIZE) { - PyErr_SetString(PyExc_TypeError, -- "gid must be DB_XIDDATASIZE bytes long"); -+ "gid must be DB_GID_SIZE bytes long"); - return NULL; - } - -@@ -6539,8 +6549,10 @@ - #endif - {"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none, METH_VARARGS}, - {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS}, -+#if (DBVER < 48) - {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server, - METH_VARARGS||METH_KEYWORDS}, -+#endif - {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS}, - #if (DBVER >= 42) - {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS}, -@@ -7089,6 +7101,7 @@ - ADD_INT(d, DB_MAX_PAGES); - ADD_INT(d, DB_MAX_RECORDS); - -+#if (DBVER < 48) - #if (DBVER >= 42) - ADD_INT(d, DB_RPCCLIENT); - #else -@@ -7096,7 +7109,11 @@ - /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */ - _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); - #endif -+#endif -+ -+#if (DBVER < 48) - ADD_INT(d, DB_XA_CREATE); -+#endif - - ADD_INT(d, DB_CREATE); - ADD_INT(d, DB_NOMMAP); -@@ -7113,7 +7130,13 @@ - ADD_INT(d, DB_INIT_TXN); - ADD_INT(d, DB_JOINENV); - -+#if (DBVER >= 48) -+ ADD_INT(d, DB_GID_SIZE); -+#else - ADD_INT(d, DB_XIDDATASIZE); -+ /* Allow new code to work in old BDB releases */ -+ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE); -+#endif - - ADD_INT(d, DB_RECOVER); - ADD_INT(d, DB_RECOVER_FATAL); diff --git a/abs/core/python2/python-2.6-internal-expat.patch b/abs/core/python2/python-2.6-internal-expat.patch deleted file mode 100644 index 86252ab..0000000 --- a/abs/core/python2/python-2.6-internal-expat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- setup.py 2008-04-22 12:12:24.613554757 +0300 -+++ setup.py 2008-04-22 12:13:09.276544063 +0300 -@@ -1035,18 +1035,15 @@ - # - # More information on Expat can be found at www.libexpat.org. - # -- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat') -- define_macros = [ -- ('HAVE_EXPAT_CONFIG_H', '1'), -- ] -+ # Use system expat -+ expatinc = '/usr/include' -+ define_macros = [] - - exts.append(Extension('pyexpat', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['pyexpat.c', -- 'expat/xmlparse.c', -- 'expat/xmlrole.c', -- 'expat/xmltok.c', - ], - )) - -@@ -1058,6 +1055,7 @@ - exts.append(Extension('_elementtree', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['_elementtree.c'], - )) - diff --git a/abs/core/python2/python.install b/abs/core/python2/python.install deleted file mode 100644 index f00a943..0000000 --- a/abs/core/python2/python.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - cat << _EOF - -==> Python requires "tk" to use IDLE, pynche and modulator - -_EOF -} - -post_upgrade() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/python2/python2.6-set_wakeup_fd4.patch b/abs/core/python2/python2.6-set_wakeup_fd4.patch deleted file mode 100644 index b945a26..0000000 --- a/abs/core/python2/python2.6-set_wakeup_fd4.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- python/trunk/Modules/signalmodule.c 2007/12/10 23:00:12 59460 -+++ python/trunk/Modules/signalmodule.c 2007/12/19 19:41:06 59574 -@@ -12,6 +12,8 @@ - - #include <signal.h> - -+#include <sys/stat.h> -+ - #ifndef SIG_ERR - #define SIG_ERR ((PyOS_sighandler_t)(-1)) - #endif -@@ -75,6 +77,8 @@ - PyObject *func; - } Handlers[NSIG]; - -+static sig_atomic_t wakeup_fd = -1; -+ - /* Speed up sigcheck() when none tripped */ - static volatile sig_atomic_t is_tripped = 0; - -@@ -128,6 +132,8 @@ - cleared in PyErr_CheckSignals() before .tripped. */ - is_tripped = 1; - Py_AddPendingCall(checksignals_witharg, NULL); -+ if (wakeup_fd != -1) -+ write(wakeup_fd, "\0", 1); - #ifdef WITH_THREAD - } - #endif -@@ -267,6 +273,50 @@ - anything else -- the callable Python object used as a handler"); - - -+static PyObject * -+signal_set_wakeup_fd(PyObject *self, PyObject *args) -+{ -+ struct stat buf; -+ int fd, old_fd; -+ if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd)) -+ return NULL; -+#ifdef WITH_THREAD -+ if (PyThread_get_thread_ident() != main_thread) { -+ PyErr_SetString(PyExc_ValueError, -+ "set_wakeup_fd only works in main thread"); -+ return NULL; -+ } -+#endif -+ if (fd != -1 && fstat(fd, &buf) != 0) { -+ PyErr_SetString(PyExc_ValueError, "invalid fd"); -+ return NULL; -+ } -+ old_fd = wakeup_fd; -+ wakeup_fd = fd; -+ return PyLong_FromLong(old_fd); -+} -+ -+PyDoc_STRVAR(set_wakeup_fd_doc, -+"set_wakeup_fd(fd) -> fd\n\ -+\n\ -+Sets the fd to be written to (with '\\0') when a signal\n\ -+comes in. A library can use this to wakeup select or poll.\n\ -+The previous fd is returned.\n\ -+\n\ -+The fd must be non-blocking."); -+ -+/* C API for the same, without all the error checking */ -+int -+PySignal_SetWakeupFd(int fd) -+{ -+ int old_fd = wakeup_fd; -+ if (fd < 0) -+ fd = -1; -+ wakeup_fd = fd; -+ return old_fd; -+} -+ -+ - /* List of functions defined in the module */ - static PyMethodDef signal_methods[] = { - #ifdef HAVE_ALARM -@@ -274,11 +324,12 @@ - #endif - {"signal", signal_signal, METH_VARARGS, signal_doc}, - {"getsignal", signal_getsignal, METH_VARARGS, getsignal_doc}, -+ {"set_wakeup_fd", signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc}, - #ifdef HAVE_PAUSE - {"pause", (PyCFunction)signal_pause, - METH_NOARGS,pause_doc}, - #endif -- {"default_int_handler", signal_default_int_handler, -+ {"default_int_handler", signal_default_int_handler, - METH_VARARGS, default_int_handler_doc}, - {NULL, NULL} /* sentinel */ - }; diff --git a/abs/core/python_modules/__changelog b/abs/core/python_modules/__changelog new file mode 100644 index 0000000..4a02fe3 --- /dev/null +++ b/abs/core/python_modules/__changelog @@ -0,0 +1 @@ +removed python from requirement --jm diff --git a/abs/core/python_modules/dbus-python/PKGBUILD b/abs/core/python_modules/dbus-python/PKGBUILD deleted file mode 100644 index 91b80d3..0000000 --- a/abs/core/python_modules/dbus-python/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 87863 2010-08-18 14:30:02Z ibiru $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=dbus-python -pkgver=0.83.1 -pkgrel=3 -pkgdesc="Python bindings for DBUS" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-glib>=0.82' 'python2>=2.6.6') -makedepends=('pkg-config' 'docutils') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('5fdf3970aa0c00020289de7ba8f3be18') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} - diff --git a/abs/core/python_modules/gitpython/PKGBUILD b/abs/core/python_modules/gitpython/PKGBUILD index 5b4d975..9c72ac0 100644 --- a/abs/core/python_modules/gitpython/PKGBUILD +++ b/abs/core/python_modules/gitpython/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Jon Bergli Heier <snakebite@jvnv.net> pkgname=gitpython -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="A python library used to interact with Git repositories" arch=('any') @@ -8,13 +8,13 @@ url="http://gitorious.org/git-python" license=('BSD') depends=('python2' 'git' 'python-gitdb') conflicts=('gitpython-git') -source=("http://pypi.python.org/packages/source/G/GitPython/GitPython-${pkgver}.tar.gz") -md5sums=('98f9a4e33574065660b7257fa93d707d') +source=("http://pypi.python.org/packages/source/G/GitPython/GitPython-${pkgver}.RC1.tar.gz") build() { - cd "$srcdir/GitPython-$pkgver" + cd "$srcdir/GitPython-$pkgver.RC1" python2 setup.py install --root="$pkgdir/" --optimize=1 || return 1 install -D -m 644 LICENSE "$pkgdir"/usr/share/licenses/gitpython/LICENSE } # vim:set ts=2 sw=2 et: +md5sums=('849082fe29adc653a3621465213cab96') diff --git a/abs/core/python_modules/mysql-python/PKGBUILD b/abs/core/python_modules/mysql-python/PKGBUILD index f9fcd0d..4c1b043 100644 --- a/abs/core/python_modules/mysql-python/PKGBUILD +++ b/abs/core/python_modules/mysql-python/PKGBUILD @@ -1,28 +1,20 @@ -# $Id: PKGBUILD 89788 2010-09-04 05:19:02Z remy $ +# $Id: PKGBUILD 151041 2012-02-24 14:12:17Z pierre $ +# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: damir <damir@archlinux.org> pkgname=mysql-python pkgver=1.2.3 -pkgrel=5 +pkgrel=3 pkgdesc="MySQL support for Python" arch=("i686" "x86_64") -url="http://sourceforge.net/projects/mysql-python" +url="http://mysql-python.sourceforge.net/" license=('GPL2') -depends=('python2>=2.3' 'python2<2.7' 'libmysqlclient>=5.1.59') -makedepends=('mysql>=5.1.59' 'setuptools') +depends=('python2' 'libmysqlclient') +makedepends=('mysql' 'python2-distribute') source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz") - -build() { - - /bin/true - -} +md5sums=('215eddb6d853f6f4be5b4afc4154292f') package() { - cd ${srcdir}/MySQL-python-${pkgver} - python2 setup.py install --root=${pkgdir} || return 1 - + python2 setup.py install --root=${pkgdir} --optimize=1 } - -md5sums=('215eddb6d853f6f4be5b4afc4154292f') diff --git a/abs/core/python_modules/pygobject/PKGBUILD b/abs/core/python_modules/pygobject/PKGBUILD deleted file mode 100644 index 09e4e6d..0000000 --- a/abs/core/python_modules/pygobject/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 92839 2010-10-01 13:19:30Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pygobject -pkgver=2.26.0 -pkgrel=3 -pkgdesc="Python bindings for GObject" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('python2' 'glib2>=2.26.0' 'pycairo>=1.8.10' 'gobject-introspection>=0.9.6') -source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/2.26/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool') -url="http://www.pygtk.org/" -sha256sums=('5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" -} - diff --git a/abs/core/python_modules/pygobject2/PKGBUILD b/abs/core/python_modules/pygobject2/PKGBUILD new file mode 100644 index 0000000..0f03bda --- /dev/null +++ b/abs/core/python_modules/pygobject2/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=pygobject2 +pkgname=(python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=6 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +makedepends=( 'python2') +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python2-fix-type.patch + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --disable-introspection + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr --disable-introspection + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" +# depends=('glib2' 'pygobject2-devel' 'python') + replaces=('py3gobject') + provides=("py3gobject=$pkgver") + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python2') + replaces=('pygobject') + provides=("pygobject=$pkgver") + + cd "${srcdir}/python2-build" + make DESTDIR="${pkgdir}" install + + find "$pkgdir"/usr/share/pygobject -name '*.py' | \ + xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # Split devel stuff + mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} + + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv xsl "$pkgdir/usr/share/pygobject/" +} diff --git a/abs/core/python_modules/pygobject2/__changelog b/abs/core/python_modules/pygobject2/__changelog new file mode 100644 index 0000000..92b1ef7 --- /dev/null +++ b/abs/core/python_modules/pygobject2/__changelog @@ -0,0 +1 @@ +remove python3 diff --git a/abs/core/python_modules/pygobject2/python2-fix-type.patch b/abs/core/python_modules/pygobject2/python2-fix-type.patch new file mode 100644 index 0000000..78e7ddf --- /dev/null +++ b/abs/core/python_modules/pygobject2/python2-fix-type.patch @@ -0,0 +1,50 @@ +From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Mon, 12 Mar 2012 16:44:14 -0400 +Subject: gio-types.defs: change some enums to flags + +These flags types were originally incorrectly handled in glib as being +enums. That bug was fixed, but they're still enums here, leading to +warnings about the mismatch. + +Change them to flags. + +https://bugzilla.gnome.org/show_bug.cgi?id=668522 +--- + gio/gio-types.defs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gio-types.defs b/gio/gio-types.defs +index 331e0bc..7eee5c8 100644 +--- a/gio/gio-types.defs ++++ b/gio/gio-types.defs +@@ -526,7 +526,7 @@ + ) + ) + +-(define-enum MountMountFlags ++(define-flags MountMountFlags + (in-module "gio") + (c-name "GMountMountFlags") + (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") +@@ -545,7 +545,7 @@ + ) + ) + +-(define-enum DriveStartFlags ++(define-flags DriveStartFlags + (in-module "gio") + (c-name "GDriveStartFlags") + (gtype-id "G_TYPE_DRIVE_START_FLAGS") +@@ -770,7 +770,7 @@ + ) + ) + +-(define-enum SocketMsgFlags ++(define-flags SocketMsgFlags + (in-module "gio") + (c-name "GSocketMsgFlags") + (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") +-- +1.7.9.1 + diff --git a/abs/core/python_modules/pygobject2/python3-fix-build.patch b/abs/core/python_modules/pygobject2/python3-fix-build.patch new file mode 100644 index 0000000..4cb8cfe --- /dev/null +++ b/abs/core/python_modules/pygobject2/python3-fix-build.patch @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <icq@gnome.org> +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 diff --git a/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch new file mode 100644 index 0000000..f5bc0e7 --- /dev/null +++ b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9 diff --git a/abs/core/python_modules/pygtk/PKGBUILD b/abs/core/python_modules/pygtk/PKGBUILD index 73e9fd5..e82fdbe 100644 --- a/abs/core/python_modules/pygtk/PKGBUILD +++ b/abs/core/python_modules/pygtk/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 94310 2010-10-06 15:16:23Z ibiru $ +# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=pygtk -pkgver=2.22.0 -pkgrel=4 +pkgver=2.24.0 +pkgrel=3 pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') -depends=('libglade>=2.6.4' 'pycairo>=1.8.10' 'pygobject>=2.21.5') -makedepends=('python-numpy') -optdepends=('python-numpy') +depends=('libglade' 'python2-cairo' 'pygobject') +makedepends=('python2-numpy' 'pygobject2-devel') +optdepends=('python2-numpy') options=('!libtool') url="http://www.pygtk.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/pygtk/2.22/${pkgname}-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 python27.patch) -sha256sums=('4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8' +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') build() { cd "${srcdir}/${pkgname}-${pkgver}" + #https://bugzilla.gnome.org/show_bug.cgi?id=623965 patch -Np1 -i "${srcdir}/python27.patch" - ./configure --prefix=/usr - make || return 1 + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py + make DESTDIR="${pkgdir}" install install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" + + sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py } diff --git a/abs/core/python_modules/pyqt/PKGBUILD b/abs/core/python_modules/pyqt/PKGBUILD index 8488d62..669bc4c 100644 --- a/abs/core/python_modules/pyqt/PKGBUILD +++ b/abs/core/python_modules/pyqt/PKGBUILD @@ -1,34 +1,39 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt -pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgname=('pyqt-common' 'python2-pyqt') +pkgver=4.9.4 pkgrel=2 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') -makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' - 'python-opengl' 'qt-assistant-compat' 'qtwebkit') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') +makedepends=('qt' 'python2-sip' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-pyuic4.patch') +md5sums=('a0b6a820633366365af5124ddbd059c7' + '097651aea0bafded5abdfd6d62afd2ad') build() { - cd "${srcdir}" + # FS#30728 + cd "${srcdir}"/PyQt-x11-gpl-${pkgver} + patch -p1 -i "${srcdir}"/fix-pyuic4.patch + cd .. + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - python configure.py \ - --confirm-license \ - --qsci-api + #cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + #python configure.py \ + # --confirm-license \ + # --qsci-api # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + #find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - make + #make ### Python2 version ### cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" @@ -43,36 +48,52 @@ build() { make } +package_pyqt-common(){ + pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" + + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + make -C pyrcc DESTDIR="${pkgdir}" install + make -C pylupdate DESTDIR="${pkgdir}" install + make -C designer INSTALL_ROOT="${pkgdir}" install + + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api +} + package_pyqt(){ - pkgdesc="A set of Python bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip') + pkgdesc="A set of Python 3.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python-qt') - provides=('python-qt') - + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } package_python2-pyqt(){ - pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'dbus-python') + pkgdesc="A set of Python 2.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python2-qt') provides=('python2-qt') cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Provided by pyqt - rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} - rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so - rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api + # Fix conflicts with pyqt + mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } diff --git a/abs/core/python_modules/pyqt/__changelog b/abs/core/python_modules/pyqt/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/python_modules/pyqt/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/python_modules/pyqt/fix-pyuic4.patch b/abs/core/python_modules/pyqt/fix-pyuic4.patch new file mode 100644 index 0000000..2173443 --- /dev/null +++ b/abs/core/python_modules/pyqt/fix-pyuic4.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# User Phil Thompson <phil at riverbankcomputing.com> +# Date 2012-07-13 13:39:28 +0100 +# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a +# Parent fd0f3da9d79ca9858d10a20c15fb85456cb832d7 +Fixed a regression in pyuic's handling of custom widgets. + +diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py +--- a/pyuic/uic/Compiler/qobjectcreator.py ++++ b/pyuic/uic/Compiler/qobjectcreator.py +@@ -1,6 +1,6 @@ + ############################################################################# + ## +-## Copyright (C) 2011 Riverbank Computing Limited. ++## Copyright (C) 2012 Riverbank Computing Limited. + ## Copyright (C) 2006 Thorsten Marek. + ## All right reserved. + ## +@@ -100,7 +100,6 @@ + assert widgetClass not in self._widgets + self._widgets[widgetClass] = (baseClass, module) + +- + def _resolveBaseclass(self, baseClass): + try: + for x in range(0, 10): +@@ -114,19 +113,17 @@ + except KeyError: + raise ValueError("unknown baseclass %s" % baseClass) + +- + def search(self, cls): + try: +- self._usedWidgets.add(cls) + baseClass = self._resolveBaseclass(self._widgets[cls][0]) + DEBUG("resolved baseclass of %s: %s" % (cls, baseClass)) +- +- return type(cls, (baseClass,), +- {"module" : ""}) +- + except KeyError: + return None + ++ self._usedWidgets.add(cls) ++ ++ return type(cls, (baseClass, ), {"module" : ""}) ++ + def _writeImportCode(self): + imports = {} + for widget in self._usedWidgets: +diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py +--- a/pyuic/uic/objcreator.py ++++ b/pyuic/uic/objcreator.py +@@ -102,19 +102,26 @@ + self._modules.append(self._customWidgets) + + def createQObject(self, classname, *args, **kwargs): +- # Handle scoped names, typically static factory methods. +- parts = classname.split('.') +- factory = self.findQObjectType(parts[0]) ++ # Handle regular and custom widgets. ++ factory = self.findQObjectType(classname) + +- if factory is not None: +- for part in parts[1:]: +- factory = getattr(factory, part, None) +- if factory is None: +- break +- else: +- return self._cpolicy.instantiate(factory, *args, **kwargs) ++ if factory is None: ++ # Handle scoped names, typically static factory methods. ++ parts = classname.split('.') + +- raise NoSuchWidgetError(classname) ++ if len(parts) > 1: ++ factory = self.findQObjectType(parts[0]) ++ ++ if factory is not None: ++ for part in parts[1:]: ++ factory = getattr(factory, part, None) ++ if factory is None: ++ break ++ ++ if factory is None: ++ raise NoSuchWidgetError(classname) ++ ++ return self._cpolicy.instantiate(factory, *args, **kwargs) + + def invoke(self, rname, method, args=()): + return self._cpolicy.invoke(rname, method, args) diff --git a/abs/core/python_modules/pyrex/PKGBUILD b/abs/core/python_modules/pyrex/PKGBUILD index 11a7344..d3e12b3 100644 --- a/abs/core/python_modules/pyrex/PKGBUILD +++ b/abs/core/python_modules/pyrex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89621 2010-09-02 16:28:29Z remy $ +# $Id: PKGBUILD 150429 2012-02-17 16:29:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Arjan timmerman <arjan@soulfly.nl> @@ -15,8 +15,12 @@ depends=('python2') source=(http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-${pkgver}.tar.gz) md5sums=('515dee67d15d4393841e2d60e8341947') -build() { +build( ) { cd "${srcdir}/Pyrex-${pkgver}" - python2 setup.py install --root="${pkgdir}" --prefix=/usr || return 1 + python2 setup.py build } +package() { + cd "${srcdir}/Pyrex-${pkgver}" + python2 setup.py install --root="${pkgdir}" --prefix=/usr +} diff --git a/abs/core/python_modules/python-async/PKGBUILD b/abs/core/python_modules/python-async/PKGBUILD index a9dc8d5..1d6a945 100644 --- a/abs/core/python_modules/python-async/PKGBUILD +++ b/abs/core/python_modules/python-async/PKGBUILD @@ -15,3 +15,4 @@ build() { python2 setup.py install --root="$pkgdir/" || return 1 } # vim:set ts=2 sw=2 et: +md5sums=('6f0e2ced1fe85f8410b9bde11be08587') diff --git a/abs/core/python_modules/python-decorator/PKGBUILD b/abs/core/python_modules/python-decorator/PKGBUILD index 5e2e8f5..5b9d85f 100644 --- a/abs/core/python_modules/python-decorator/PKGBUILD +++ b/abs/core/python_modules/python-decorator/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Pierre Chapuis <catwell at archlinux dot us> pkgname=python-decorator -pkgver=3.2.0 -pkgrel=3 +pkgver=3.3.2 +pkgrel=1 pkgdesc='Python Decorator module' arch=('any') url='http://pypi.python.org/pypi/decorator' @@ -11,8 +11,6 @@ license=('BSD') depends=('python2') source=("http://pypi.python.org/packages/source/d/decorator/decorator-${pkgver}.tar.gz" 'LICENSE.txt') -md5sums=('6208cd51365083c168ab3a04426a646b' - '0ca76d2c707f09dbb04acc425ea1a08b') build() { cd decorator-${pkgver} @@ -28,3 +26,5 @@ package() { install -D -m644 ${srcdir}/LICENSE.txt \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } +md5sums=('446f5165af67eb0fcd8fd28abd259e86' + '0ca76d2c707f09dbb04acc425ea1a08b') diff --git a/abs/core/python_modules/python-decorator/__changelog b/abs/core/python_modules/python-decorator/__changelog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/core/python_modules/python-decorator/__changelog diff --git a/abs/core/python_modules/python-distribute/PKGBUILD b/abs/core/python_modules/python-distribute/PKGBUILD new file mode 100644 index 0000000..5627eb7 --- /dev/null +++ b/abs/core/python_modules/python-distribute/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 159385 2012-05-22 22:16:56Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sebastien Binet <binet@farnsworth> +pkgbase=python-distribute +pkgname=('python2-distribute') +pkgver=0.6.27 +pkgrel=1 +pkgdesc="Easily build and distribute Python packages" +arch=('any') +license=('PSF') +url="http://pypi.python.org/pypi/distribute" +makedepends=('python2') +source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz + distribute-python2_and_3.patch) +sha1sums=('cebaaf91938581cb8c4a2f708f2b3e770232d3a5' + '9c19c12edac507b0f76696d282b9831c4b653a7e') +build() { + cd "${srcdir}" + + pushd distribute-${pkgver} + patch -Np1 -i ../distribute-python2_and_3.patch + popd + + cp -a distribute-${pkgver}{,-python2} + + ## Build python 3 module + cd distribute-${pkgver} + # python setup.py build +# python setup.py test + + # Build python 2 module + cd ../distribute-${pkgver}-python2 + + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py + + python2 setup.py build +# python2 setup.py test +} + +package_python-distribute() { + # depends=('python>=3.2') + + cd "${srcdir}/distribute-${pkgver}" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} + +package_python2-distribute() { + depends=('python2>=2.7') + provides=('setuptools') + conflicts=('setuptools') + + cd "${srcdir}/distribute-${pkgver}-python2" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} diff --git a/abs/core/python_modules/python-distribute/__changelog b/abs/core/python_modules/python-distribute/__changelog new file mode 100644 index 0000000..a995e3a --- /dev/null +++ b/abs/core/python_modules/python-distribute/__changelog @@ -0,0 +1 @@ +remove python diff --git a/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch b/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch new file mode 100644 index 0000000..2c51100 --- /dev/null +++ b/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch @@ -0,0 +1,36 @@ +diff -Naur distribute-0.6.27.ori/distribute.egg-info/entry_points.txt distribute-0.6.27/distribute.egg-info/entry_points.txt +--- distribute-0.6.27.ori/distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400 ++++ distribute-0.6.27/distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400 +@@ -11,6 +11,8 @@ + install_egg_info = setuptools.command.install_egg_info:install_egg_info + alias = setuptools.command.alias:alias + easy_install = setuptools.command.easy_install:easy_install ++easy_install-2.7 = setuptools.command.easy_install:main ++easy_install-3.2 = setuptools.command.easy_install:main + install_scripts = setuptools.command.install_scripts:install_scripts + bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst + bdist_egg = setuptools.command.bdist_egg:bdist_egg +diff -Naur distribute-0.6.27.ori/distribute_setup.py distribute-0.6.27/distribute_setup.py +--- distribute-0.6.27.ori/distribute_setup.py 2012-05-18 15:45:03.000000000 -0400 ++++ distribute-0.6.27/distribute_setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -299,8 +299,7 @@ + log.warn('Could not find the install location') + return + pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1]) +- setuptools_file = 'setuptools-%s-py%s.egg-info' % \ +- (SETUPTOOLS_FAKED_VERSION, pyver) ++ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION + pkg_info = os.path.join(placeholder, setuptools_file) + if os.path.exists(pkg_info): + log.warn('%s already exists', pkg_info) +diff -Naur distribute-0.6.27.ori/setup.py distribute-0.6.27/setup.py +--- distribute-0.6.27.ori/setup.py 2012-05-18 15:19:51.000000000 -0400 ++++ distribute-0.6.27/setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -100,6 +100,7 @@ + finally: + f.close() + ++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]] + + # if we are installing Distribute using "python setup.py install" + # we need to get setuptools out of the way diff --git a/abs/core/python_modules/python-iplib/PKGBUILD b/abs/core/python_modules/python-iplib/PKGBUILD index 39d0b55..05f798d 100755 --- a/abs/core/python_modules/python-iplib/PKGBUILD +++ b/abs/core/python_modules/python-iplib/PKGBUILD @@ -4,12 +4,11 @@ pkgver=1.1 pkgrel=3 pkgdesc="IPlib is a Python module useful to convert amongst many different notations and to manage couples of address/netmask in the CIDR notation." url="http://www.pymedia.org" -arch=('i686') +arch=('i686' 'x86_64') license=('GPL') depends=('python2') #makedepends=('python2>=2.3') source=(http://erlug.linux.it/~da/soft/iplib/iplib-1.1.tar.gz) -md5sums=('3437ddbfc1986b2d06e7f4a0724ac5a0') build() { cd ${srcdir}/${_libname}-${pkgver} @@ -23,3 +22,4 @@ build() { xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" } +md5sums=('3437ddbfc1986b2d06e7f4a0724ac5a0') diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD index df85c69..e12b716 100644 --- a/abs/core/python_modules/python-lxml/PKGBUILD +++ b/abs/core/python_modules/python-lxml/PKGBUILD @@ -1,30 +1,49 @@ -# $Id$ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Guillem Rieu <guillemr@gmx.net> - -pkgname=python-lxml -pkgver=2.3 -pkgrel=1 +# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $ +# Maintainer: + +pkgname=('python2-lxml') +pkgver=2.3.4 +pkgrel=2 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') -license=('BSD' 'GPL' 'custom') -url="http://codespeak.net/lxml" -depends=('python2' 'libxslt') -optdepends=("beautiful-soup: support for parsing not well formed HTML") -conflicts=('lxml') -replaces=('lxml') -source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz") -md5sums=('a245a015fd59b63e220005f263e1682a') - -package() { - cd ${srcdir}/lxml-$pkgver +license=('BSD' 'custom') +url="http://lxml.de/" +makedepends=('python2' 'libxslt') +source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) +sha1sums=('90a226d8a2ee38de47fc3351445dab6df0e33a20' + '7962be7794d7f4c87d2fce0104c27990f48f1ce1') + +check() { + cd "${srcdir}"/lxml-$pkgver + make PYTHON=python2 test + #make PYTHON=python test +} + +package_python2-lxml() { + depends=('python2' 'libxslt') + optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') + cd "${srcdir}"/lxml-$pkgver python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt - install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt +} + +package_python-lxml() { + depends=('python' 'libxslt') + + cd "${srcdir}"/lxml-$pkgver + python setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt } diff --git a/abs/core/python_modules/python-lxml/__changelog b/abs/core/python_modules/python-lxml/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/python_modules/python-lxml/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/python_modules/python-m2crypto/PKGBUILD b/abs/core/python_modules/python-m2crypto/PKGBUILD index 8d74cbe..010da5c 100644 --- a/abs/core/python_modules/python-m2crypto/PKGBUILD +++ b/abs/core/python_modules/python-m2crypto/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-m2crypto -pkgver=0.20.2 -pkgrel=4 +pkgver=0.21.1 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" - 'openssl1.patch') -md5sums=('6c24410410d6eb1920ea43f77a93613a' - '80a707ad6610f2871efdf40658e30364') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') build() { cd "${srcdir}/M2Crypto-${pkgver}" - patch -Np0 -i ${srcdir}/openssl1.patch python2 setup.py build } diff --git a/abs/core/python_modules/python-netifaces/PKGBUILD b/abs/core/python_modules/python-netifaces/PKGBUILD index 258a9c2..481de96 100644 --- a/abs/core/python_modules/python-netifaces/PKGBUILD +++ b/abs/core/python_modules/python-netifaces/PKGBUILD @@ -2,7 +2,7 @@ #Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> pkgname=python-netifaces _orig_name=netifaces -pkgver=0.5 +pkgver=0.8 pkgrel=3 pkgdesc="Portable module to access network interface information in Python." depends=('python2') @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') url="http://alastairs-place.net/netifaces/" license=('MIT') provides=('netifaces' 'python-netifaces') -source=("http://alastairs-place.net/2007/03/netifaces/${_orig_name}-${pkgver}.tar.gz") +source=("http://alastairs-place.net/projects/netifaces/${_orig_name}-${pkgver}.tar.gz") build() { cd "${srcdir}/${_orig_name}-${pkgver}" python2 setup.py install --root "${pkgdir}" || return 1 @@ -20,5 +20,5 @@ build() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/README" || return 1 } -md5sums=('ea662a4b4c7db5d1631cc33bf68eb030') +md5sums=('e57e5983f4c286fac5f8068fbfc5c873') diff --git a/abs/core/python_modules/python-nose/PKGBUILD b/abs/core/python_modules/python-nose/PKGBUILD index e48c434..5d36e01 100644 --- a/abs/core/python_modules/python-nose/PKGBUILD +++ b/abs/core/python_modules/python-nose/PKGBUILD @@ -1,26 +1,45 @@ -# $Id: $ -# Maintainer: +# $Id: PKGBUILD 144082 2011-12-03 05:50:51Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> - -pkgname=python-nose -pkgver=0.11.3 +pkgbase=python-nose +pkgname=('python2-nose' ) +pkgver=1.1.2 pkgrel=3 pkgdesc="A discovery-based unittest extension" arch=('any') url="http://www.somethingaboutorange.com/mrl/projects/nose/" license=('LGPL2') -depends=('setuptools') -source=("http://www.somethingaboutorange.com/mrl/projects/nose/nose-${pkgver}.tar.gz") -md5sums=('7f1dc53750811f78bedef9e14a4bc5a5') +source=("http://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz") +makedepends=( 'python2' 'python2-distribute' ) +md5sums=('144f237b615e23f21f6a50b2183aa817') build() { - cd "${srcdir}/nose-${pkgver}" + cd "$srcdir/nose-$pkgver" sed -i -e "s:man/man1:share/man/man1:g" setup.py + cp -R $srcdir/nose-$pkgver $srcdir/nose2-$pkgver +} + +package_python-nose() { + depends=('python' 'python-distribute') + cd "$srcdir/nose-$pkgver" + python setup.py install --prefix=/usr --root=${pkgdir} + mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests3" } -package() { - cd "${srcdir}/nose-${pkgver}" - python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1 +package_python2-nose() { + depends=('python2' 'python2-distribute') + cd "$srcdir/nose2-$pkgver" + python2 setup.py install --prefix=/usr --root=${pkgdir} + mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests2" + rm -rf $pkgdir/usr/share } +package_python-nose-doc(){ + pkgdesc="Nose documentation and examples" + cd "$srcdir/nose-$pkgver/doc" + make html + mkdir -p "$pkgdir/usr/share/doc/python-nose" + cp -r .build/html "$pkgdir/usr/share/doc/python-nose" + cp -r ../examples "$pkgdir/usr/share/doc/python-nose" +} diff --git a/abs/core/python_modules/python-nose/__changelog b/abs/core/python_modules/python-nose/__changelog new file mode 100644 index 0000000..0802ff6 --- /dev/null +++ b/abs/core/python_modules/python-nose/__changelog @@ -0,0 +1 @@ +removed python diff --git a/abs/core/python_modules/python-numpy/PKGBUILD b/abs/core/python_modules/python-numpy/PKGBUILD index 57b41f5..8c9c6be 100644..100755 --- a/abs/core/python_modules/python-numpy/PKGBUILD +++ b/abs/core/python_modules/python-numpy/PKGBUILD @@ -1,36 +1,61 @@ -# $Id: PKGBUILD 95257 2010-10-17 20:17:04Z ibiru $ +# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -pkgname=python-numpy -pkgver=1.5.0 -pkgrel=3 +pkgbase=python-numpy +pkgname=('python2-numpy') +pkgver=1.6.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://numpy.scipy.org/" -depends=('lapack' 'python2') -makedepends=('python-nose' 'gcc-fortran') -optdepends=('python-nose: test suite') +makedepends=('lapack' 'python2' 'python2-distribute' 'gcc-fortran' 'python2-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('3a8bfdc434df782d647161c48943ee09') +md5sums=('2bce18c08fc4fce461656f0f4dd9103e') build() { - cd "${srcdir}/numpy-${pkgver}" + cd "${srcdir}" + cp -a numpy-${pkgver} numpy-py2-${pkgver} export Atlas=None export LDFLAGS="$LDFLAGS -shared" + + echo "Building Python2" + cd "${srcdir}/numpy-py2-${pkgver}" python2 setup.py config_fc --fcompiler=gnu95 build + + #echo "Building Python3" + #cd "${srcdir}/numpy-${pkgver}" + #python setup.py config_fc --fcompiler=gnu95 build } -package() { - cd "${srcdir}/numpy-${pkgver}" - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" +package_python2-numpy() { + depends=('lapack' 'python2') + optdepends=('python-nose: testsuite') + + cd "${srcdir}/numpy-py2-${pkgver}" + python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find $pkgdir -name '*.py') + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + $(find ${pkgdir} -name '*.py') +} + +package_python-numpy() { + depends=('lapack' 'python') + provides=("python3-numpy=${pkgver}") + replaces=('python3-numpy') + conflicts=('python3-numpy') + + cd "${srcdir}/numpy-${pkgver}" + python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 + + install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/" } diff --git a/abs/core/python_modules/python-numpy/__changelog b/abs/core/python_modules/python-numpy/__changelog new file mode 100644 index 0000000..3bc4789 --- /dev/null +++ b/abs/core/python_modules/python-numpy/__changelog @@ -0,0 +1 @@ +remove python3 support diff --git a/abs/core/python_modules/python-opengl/PKGBUILD b/abs/core/python_modules/python-opengl/PKGBUILD index e4ff382..57f77fd 100644 --- a/abs/core/python_modules/python-opengl/PKGBUILD +++ b/abs/core/python_modules/python-opengl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89543 2010-09-01 17:18:01Z remy $ +# $Id: PKGBUILD 150966 2012-02-24 10:19:17Z pierre $ # Contributor: Josh Taylor <joshtaylor.mail@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -14,18 +14,14 @@ arch=('any') depends=('python2' 'tk' 'freeglut' 'setuptools') provides=('pyopengl' 'python-pyopengl') conflicts=('pyopengl' 'python-pyopengl') -source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz - 'LICENSE') +source=("http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz" + 'LICENSE') md5sums=('221d4a6a0928fcfeef26751370ec5f52' '0b53c508a63e5dbaf44cdfb0fa103b3a') -build() { - /bin/true -} - package() { cd ${srcdir}/PyOpenGL-${pkgver} - python2 setup.py install --root=${pkgdir} || return 1 + python2 setup.py install --root=${pkgdir} install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index e00fa93..4374e09 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,11 +1,11 @@ pkgname=python-parted __pkgname=pyparted pkgver=3.8 -pkgrel=4 +pkgrel=1 pkgdesc="Python bindings for libparted" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python2' 'parted=>3.0' 'python-decorator') +depends=('python2' 'parted>=3.1' 'python-decorator') options=('!libtool') source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) url="https://fedorahosted.org/pyparted/" diff --git a/abs/core/python_modules/python-pexpect/PKGBUILD b/abs/core/python_modules/python-pexpect/PKGBUILD index 80874a1..09ddb51 100644 --- a/abs/core/python_modules/python-pexpect/PKGBUILD +++ b/abs/core/python_modules/python-pexpect/PKGBUILD @@ -1,17 +1,24 @@ -# Maintainer: Aaron Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 69520 2012-04-17 21:14:19Z ebelanger $ +# Maintainer: +# Contributor: Aaron Schaefer <aaron@elasticdog.com> + pkgname=python-pexpect -pkgver=2.3 -pkgrel=5 +pkgver=2.4 +pkgrel=1 pkgdesc='A pure Python Expect-like module' -arch=('i686' 'x86_64') +arch=('any') url='http://pexpect.sourceforge.net/' license=('MIT') depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pexpect/pexpect-$pkgver.tar.gz") -md5sums=('bf107cf54e67bc6dec5bea1f3e6a65c3') +source=("http://pypi.python.org/packages/source/p/pexpect/pexpect-$pkgver.tar.gz") +md5sums=('fe82d69be19ec96d3a6650af947d5665') + +package() { + cd "$srcdir/pexpect-$pkgver" + + # python2 fix + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' FSM.py -build() { - cd $startdir/src/pexpect-$pkgver - python2 setup.py install --root=$startdir/pkg || return 1 - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/core/python_modules/python-pycurl/PKGBUILD b/abs/core/python_modules/python-pycurl/PKGBUILD index 84da9ef..9b70523 100644 --- a/abs/core/python_modules/python-pycurl/PKGBUILD +++ b/abs/core/python_modules/python-pycurl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 150558 2012-02-18 14:39:59Z pierre $ +# Maintainer: +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: kontrast <kontr4st@gmail.com> pkgname=python-pycurl pkgver=7.19.0 -pkgrel=7 +pkgrel=6 pkgdesc="A Python interface to libcurl" arch=('i686' 'x86_64') url="http://pycurl.sourceforge.net" @@ -17,7 +17,6 @@ source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz") md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b') package() { - cd ${srcdir}/pycurl-${pkgver} + cd "${srcdir}"/pycurl-${pkgver} python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr } - diff --git a/abs/core/python_modules/python2-cairo/PKGBUILD b/abs/core/python_modules/python2-cairo/PKGBUILD new file mode 100644 index 0000000..0f2fb14 --- /dev/null +++ b/abs/core/python_modules/python2-cairo/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=python2-cairo +pkgver=1.10.0 +pkgrel=1 +pkgdesc="Python2 bindings for the cairo graphics library" +arch=('i686' 'x86_64') +license=('LGPL' 'MPL') +depends=('python2' 'cairo') +options=('!libtool') +provides=("pycairo=${pkgver}") +conflicts=('pycairo') +replaces=('pycairo') +source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2) +url="http://www.cairographics.org/pycairo" +md5sums=('20337132c4ab06c1146ad384d55372c5') + +build() { + cd "${srcdir}/py2cairo-${pkgver}" + sed -i 's:bin/env python:bin/env python2:' waf + python2 ./waf --version + pushd .waf-* + popd + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr + PYTHON=/usr/bin/python2 ./waf build +} + +package() { + cd "${srcdir}/py2cairo-${pkgver}" + PYTHON=/usr/bin/python2 ./waf install --destdir="${pkgdir}" +} diff --git a/abs/core/python_modules/urlgrabber/PKGBUILD b/abs/core/python_modules/urlgrabber/PKGBUILD index ccd0d62..f82aa85 100644 --- a/abs/core/python_modules/urlgrabber/PKGBUILD +++ b/abs/core/python_modules/urlgrabber/PKGBUILD @@ -1,18 +1,18 @@ +# $Id: PKGBUILD 66686 2012-02-27 11:56:32Z cbrannon $ +# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Pat Rondon <pmr@@patrondon.org> pkgname=urlgrabber pkgver=3.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level cross-protocol url-grabber and Python library" url="http://urlgrabber.baseurl.org/" license=('LGPL') -arch=('i686' 'x86_64') -depends=('python2') -provides=(python-urlgrabber) -source=("${url}/download/urlgrabber-${pkgver}.tar.gz") -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --prefix=${pkgdir}/usr || return 1 +arch=(any) +depends=(python2 python-pycurl) +source=(http://$pkgname.baseurl.org/download/$pkgname-$pkgver.tar.gz) - find "$pkgdir/" -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" -} +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + } md5sums=('00c8359bf71062d0946bacea521f80b4') diff --git a/abs/core/qt/.qmake.vars b/abs/core/qt/.qmake.vars deleted file mode 100644 index 74936a5..0000000 --- a/abs/core/qt/.qmake.vars +++ /dev/null @@ -1,6 +0,0 @@ -styles += cde mac motif plastique cleanlooks windows -decorations += default windows styled -mouse-drivers += pc -gfx-drivers += linuxfb -mouse-drivers += linuxtp -kbd-drivers += tty diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD index 9c2d93f..2508aa0 100644 --- a/abs/core/qt/PKGBUILD +++ b/abs/core/qt/PKGBUILD @@ -1,143 +1,136 @@ -# $Id$ +# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.7.3 -pkgrel=3 +pkgver=4.8.2 +pkgrel=2 arch=('i686' 'x86_64') -url='http://qt.nokia.com/' +url='http://qt-project.org/' license=('GPL3' 'LGPL') -makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'gtk2') + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' + 'mysql' 'unixodbc' 'gtk2' ) options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" +_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" +source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'qtbug-16292.patch') -md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'improve-cups-support.patch' + 'fix-assistant-crash.patch') +md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'dc7ed8c2e8c68a175f7f05a34dccc937') + 'c439c7731c25387352d8453ca7574971' + 'e9c11e4606b7f55ae405e3e76f863dc1') build() { - unset QMAKESPEC - export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + cd "${srcdir}"/${_pkgfqn} - # FS#24601 - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + # (FS#28381) (KDEBUG#180051) + patch -p1 -i "${srcdir}"/improve-cups-support.patch + + patch -p1 -i "${srcdir}"/fix-assistant-crash.patch - cd $srcdir/$_pkgfqn + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - # Already fixed upstream - patch -p1 -i "${srcdir}"/qtbug-16292.patch - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf - sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -largefile \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -xmlpatterns \ - -no-phonon \ - -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -no-rpath \ - -no-cups \ - -openssl-linked \ - -silent \ - -optimized-qmake \ - -dbus \ - -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib - make + ./configure -v -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make } package_qt() { pkgdesc='A cross-platform application and UI framework' - depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') install='qt.install' - - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png - install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png - install -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install - # install license addition - install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } package_qt-private-headers(){ pkgdesc="Qt private headers for development" depends=("qt=${pkgver}") - install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} for i in QtCore QtDeclarative QtGui QtScript; do - cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ - ${pkgdir}/usr/include/${i}/ + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ done for i in corelib declarative gui script; do - cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ done } diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog index 2abf977..5e878fe 100644 --- a/abs/core/qt/__changelog +++ b/abs/core/qt/__changelog @@ -1 +1,2 @@ -remove cups support +remove cups support, postgresql libs +libfbclient diff --git a/abs/core/qt/fix-assistant-crash.patch b/abs/core/qt/fix-assistant-crash.patch new file mode 100644 index 0000000..67bbbc4 --- /dev/null +++ b/abs/core/qt/fix-assistant-crash.patch @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 ++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 +@@ -944,8 +944,7 @@ + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } + diff --git a/abs/core/qt/improve-cups-support.patch b/abs/core/qt/improve-cups-support.patch new file mode 100644 index 0000000..e0305e1 --- /dev/null +++ b/abs/core/qt/improve-cups-support.patch @@ -0,0 +1,84 @@ +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 +@@ -569,6 +569,32 @@ + void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) + { + options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); ++ ++ if (cups) { ++ const ppd_option_t* duplex = cups->ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ options.duplexShort->setChecked(true); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ options.duplexLong->setChecked(true); ++ else ++ options.noDuplex->setChecked(true); ++ } ++ ++ if (cups->currentPPD()) { ++ // set default color ++ if (cups->currentPPD()->color_device) ++ options.color->setChecked(true); ++ else ++ options.grayscale->setChecked(true); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups->ppdOption("Collate"); ++ if (collate) ++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); ++ } + } + #endif + +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 +@@ -627,6 +627,44 @@ + && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { + setOutputFormat(QPrinter::PdfFormat); + } ++ ++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) ++ // fill in defaults from ppd file ++ QCUPSSupport cups; ++ ++ int printernum = -1; ++ for (int i = 0; i < cups.availablePrintersCount(); i++) { ++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) ++ printernum = i; ++ } ++ if (printernum >= 0) { ++ cups.setCurrentPrinter(printernum); ++ ++ const ppd_option_t* duplex = cups.ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ setDuplex(DuplexShortSide); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ setDuplex(DuplexLongSide); ++ else ++ setDuplex(DuplexNone); ++ } ++ ++ if (cups.currentPPD()) { ++ // set default color ++ if (cups.currentPPD()->color_device) ++ setColorMode(Color); ++ else ++ setColorMode(GrayScale); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups.ppdOption("Collate"); ++ if (collate) ++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); ++ } ++#endif + } + + /*! diff --git a/abs/core/qt/qt.install b/abs/core/qt/qt.install index 81ce5c4..5495fb1 100644 --- a/abs/core/qt/qt.install +++ b/abs/core/qt/qt.install @@ -1,12 +1,12 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/abs/core/qt/qtbug-16292.patch b/abs/core/qt/qtbug-16292.patch deleted file mode 100644 index 9728e28..0000000 --- a/abs/core/qt/qtbug-16292.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 -From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> -Date: Tue, 15 Feb 2011 11:19:26 +0100 -Subject: [PATCH] Fix crash in KPackageKit - -QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex -after calling QTreeView::indexRowSizeHint(). - -Same thing inside QTreeView::indexRowSizeHint(), since -QHeaderView::count() will call -QAbstractItemViewPrivate::executePostedLayout() which may invalidate -all the QModelIndex. - -Reviewed-by: Olivier -Task-number: QTBUG-16292 ---- - src/gui/itemviews/qtreeview.cpp | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index f1f3236..c0573bb 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - - int start = -1; - int end = -1; -+ int indexRow = index.row(); - int count = d->header->count(); - bool emptyHeader = (count == 0); - QModelIndex parent = index.parent(); -@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); - if (d->header->isSectionHidden(logicalColumn)) - continue; -- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); -+ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); - if (idx.isValid()) { - QWidget *editor = d->editorForIndex(idx).editor; - if (editor && d->persistent.contains(editor)) { -@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const - if (viewItems.isEmpty()) - return 0; - const QModelIndex &index = viewItems.at(item).index; -+ if (!index.isValid()) -+ return 0; - int height = viewItems.at(item).height; -- if (height <= 0 && index.isValid()) { -+ if (height <= 0) { - height = q_func()->indexRowSizeHint(index); - viewItems[item].height = height; - } -- if (!index.isValid() || height < 0) -- return 0; -- return height; -+ return qMax(height, 0); - } - - --- -1.6.1 - diff --git a/abs/core/qt3/PKGBUILD b/abs/core/qt3/PKGBUILD index 131cbb1..cdd4ac7 100644 --- a/abs/core/qt3/PKGBUILD +++ b/abs/core/qt3/PKGBUILD @@ -1,59 +1,65 @@ -# $Id: PKGBUILD 4788 2008-07-10 10:21:45Z pierre $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> +# $Id: PKGBUILD 149356 2012-02-07 05:40:02Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + pkgname=qt3 -pkgver=3.3.8 -pkgrel=9 -pkgdesc="The QT gui toolkit." -arch=(i686 x86_64) -license=('GPL') +pkgver=3.3.8b +pkgrel=1 +epoch=1 +pkgdesc="The QT3 gui toolkit" +arch=('i686' 'x86_64') url="http://www.trolltech.com/products/qt/index.html" -pkgfqn=qt-x11-free-${pkgver} +license=('GPL') +depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' + 'libxrandr' 'libmng') +makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') +optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +options=('!libtool') install=qt.install -depends=('libpng' 'libjpeg' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' \ - 'libxft' 'libxrandr') -makedepends=('mysql' 'postgresql>=8.2.3' 'sqlite3' 'unixodbc' 'libmng') -source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt.profile \ - qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \ - qt-font-default-subst.diff mysql.patch) -options=(!libtool) -md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' - 'f72d1eb4eb49b9a9467c1f6035194266' - 'f2a2dbdbfee9422c90efc3ef3f86197c' - 'c8937968e9807b3cdcdf0505728d99ce' - 'f6b3b39040f2b8f19ba1cf1445468c28' - '9370d82e85f2c799335ed0dcc1d53189' - '7d40ed1bd40d33d8b9b27a2076a5d22a') +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz + qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 + eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' + 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' + '3d19510c46016a1a211d97bf8f82b01498b1b33c' + '33418e5b117458af23c72cdbffc0c339bc34bdc4' + '116afa0e737bdf27ea27f9b3653aeb56db9ec151' + '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' + '1346320614f6f86fbeb10b9fbad721dea29f5b61' + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo build() { unset QMAKESPEC - export QTDIR=$startdir/src/$pkgfqn + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - cd $startdir/src/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do - patch -Np0 -i $i || return 1 + patch -p0 -i $i done # apply other qt patches and one security fix from debian/gentoo for i in ../qt-patches/*; do - patch -Np1 -i $i || return 1 + patch -p1 -i $i done - # fix utf8 bug - patch -Np0 -i ../utf8-bug-qt3.diff || return 1 - # fix asia fonts - patch -Np0 -i ../qt-font-default-subst.diff || return 1 - # fix segfaults on exit when using mysql DB driver - patch -Np0 -i ../mysql.patch || return 1 + # fix CJK font/chars select error (FS#11245) + patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff + # fix build problem against new unixODBC + patch -p1 -i "${srcdir}"/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i "${srcdir}"/gcc-4.6.patch + + patch -p0 -i "${srcdir}"/qt3-png15.patch # start compiling qt sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix rm -rf doc/html examples tutorial sed -i "s|sub-tutorial sub-examples||" Makefile sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure @@ -65,37 +71,54 @@ build() { else unset ARCH fi - ./configure -prefix /opt/qt -platform linux-g++$ARCH \ - -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \ - -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \ - -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc} + ./configure -prefix /opt/qt \ + -platform linux-g++$ARCH \ + -system-zlib \ + -qt-gif \ + -release \ + -shared \ + -sm \ + -nis \ + -thread \ + -stl \ + -system-lib{png,jpeg,mng} \ + -no-g++-exceptions \ + -plugin-sql-{mysql,psql,sqlite,odbc} # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" $startdir/src/$pkgfqn/tools/designer/uilib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - cd $startdir/src/$pkgfqn - make -C qmake || return 1 - cd $startdir/src/$pkgfqn/plugins/src/sqldrivers/mysql - $startdir/src/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd $startdir/src/$pkgfqn/plugins/src/sqldrivers/psql - $startdir/src/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + cd "${srcdir}"/qt-x11-free-${pkgver} + make -C qmake + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - cd $startdir/src/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} # fix the broken makefiles #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install - rm -rf $startdir/pkg/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L$startdir/src/$pkgfqn/lib ||g" $startdir/pkg/opt/qt/lib/*.prl - install -D -m755 qmake/qmake $startdir/pkg/opt/qt/bin/qmake - install -D -m755 $startdir/qt.profile $startdir/pkg/etc/profile.d/qt3.sh - rm -f $startdir/pkg/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + make +} + +package() { + cd "${srcdir}"/qt-x11-free-${pkgver} + make INSTALL_ROOT="${pkgdir}" install + rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} + sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl + install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake + install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh + ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config + rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH # install man pages - mkdir -p $startdir/pkg/opt/qt/man - cp -r $startdir/src/$pkgfqn/doc/man/{man1,man3} $startdir/pkg/opt/qt/man/ + install -d -m755 "${pkgdir}"/opt/qt/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf } diff --git a/abs/core/qt3/eastern_asian_languagues.diff b/abs/core/qt3/eastern_asian_languagues.diff new file mode 100644 index 0000000..7c25eef --- /dev/null +++ b/abs/core/qt3/eastern_asian_languagues.diff @@ -0,0 +1,39 @@ +--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 ++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 +@@ -966,20 +966,22 @@ + + #ifdef Q_WS_X11 + if (script == QFont::Han) { +- // modify script according to locale +- static QFont::Script defaultHan = QFont::UnknownScript; +- if (defaultHan == QFont::UnknownScript) { +- QCString locale = setlocale(LC_ALL, NULL); +- if (locale.contains("ko")) +- defaultHan = QFont::Han_Korean; +- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) +- defaultHan = QFont::Han_TraditionalChinese; +- else if (locale.contains("zh")) +- defaultHan = QFont::Han_SimplifiedChinese; +- else +- defaultHan = QFont::Han_Japanese; +- } +- script = defaultHan; ++ // modify script according to locale ++ static QFont::Script defaultHan; ++ QCString locale = setlocale(LC_ALL, NULL); ++ ++ if (locale.contains("ko")) ++ defaultHan = QFont::Han_Korean; ++ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) ++ defaultHan = QFont::Han_TraditionalChinese; ++ else if (locale.contains("zh")) ++ defaultHan = QFont::Han_SimplifiedChinese; ++ else if (locale.contains("ja")) ++ defaultHan = QFont::Han_Japanese; ++ else ++ defaultHan = QFont::Han; // don't change ++ ++ script = defaultHan; + } + #endif + diff --git a/abs/core/qt3/gcc-4.6.patch b/abs/core/qt3/gcc-4.6.patch new file mode 100644 index 0000000..bcbffce --- /dev/null +++ b/abs/core/qt3/gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/abs/core/qt3/mysql.patch b/abs/core/qt3/mysql.patch deleted file mode 100644 index 5f61edc..0000000 --- a/abs/core/qt3/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/sql/drivers/mysql/qsql_mysql.cpp -+++ src/sql/drivers/mysql/qsql_mysql.cpp -@@ -37,7 +37,6 @@ - #include "qsql_mysql.h" - #include <private/qsqlextension_p.h> - --#include <qapplication.h> - #include <qdatetime.h> - #include <qvaluevector.h> - #include <qsqlrecord.h> -@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() - } - - ///////////////////////////////////////////////////////// --static void qServerEnd() --{ --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID >= 40000 -- mysql_server_end(); --# endif // MYSQL_VERSION_ID --#endif // Q_NO_MYSQL_EMBEDDED --} - - static void qServerInit() - { -@@ -366,9 +357,7 @@ static void qServerInit() - qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); - # endif - } -- qAddPostRoutine(qServerEnd); - init = TRUE; -- - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - } -@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() - QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); - delete ext; - } -+#ifndef Q_NO_MYSQL_EMBEDDED -+# if MYSQL_VERSION_ID > 40000 -+ mysql_server_end(); -+# endif -+#endif - } - - bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/abs/core/qt3/qt-copy-kde-patches.tar.bz2 b/abs/core/qt3/qt-copy-kde-patches.tar.bz2 Binary files differindex 19d8999..519f717 100644 --- a/abs/core/qt3/qt-copy-kde-patches.tar.bz2 +++ b/abs/core/qt3/qt-copy-kde-patches.tar.bz2 diff --git a/abs/core/qt3/qt-font-default-subst.diff b/abs/core/qt3/qt-font-default-subst.diff deleted file mode 100644 index 3e286f7..0000000 --- a/abs/core/qt3/qt-font-default-subst.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- src/kernel/qfontdatabase_x11.cpp -+++ src/kernel/qfontdatabase_x11.cpp -@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese){ -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } -@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c - FcPatternPrint(pattern); - #endif - -+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use -+ // FcFontMatch/Sort here we have to do it manually. - FcConfigSubstitute(0, pattern, FcMatchPattern); -+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); -+ - // qDebug("1: pattern contains:"); - // FcPatternPrint(pattern); - -@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c - value.u.s = (const FcChar8 *)cs.data(); - FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); - } --#ifdef FONT_MATCH_DEBUG -- printf("final pattern contains:\n"); -- FcPatternPrint(pattern); --#endif - } - - if (script != QFont::Unicode) { -@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese) { -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } - -+#ifdef FONT_MATCH_DEBUG -+ printf("final pattern contains:\n"); -+ FcPatternPrint(pattern); -+#endif -+ - QFontEngine *fe = 0; - - for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { ---- src/kernel/qfontdatabase.cpp -+++ src/kernel/qfontdatabase.cpp -@@ -554,7 +554,7 @@ static const unsigned short sample_chars - // GeometricSymbols, - { 0x2500, 0x0 }, - // MiscellaneousSymbols, -- { 0x2640, 0x0 }, -+ { 0x2640, 0x2714, 0x0 }, - // EnclosedAndSquare, - { 0x2460, 0x0 }, - // Braille, diff --git a/abs/core/qt3/qt-odbc.patch b/abs/core/qt3/qt-odbc.patch new file mode 100644 index 0000000..6f21e3c --- /dev/null +++ b/abs/core/qt3/qt-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER diff --git a/abs/core/qt3/qt-patches.tar.bz2 b/abs/core/qt3/qt-patches.tar.bz2 Binary files differindex 4e46465..3f4aee1 100644 --- a/abs/core/qt3/qt-patches.tar.bz2 +++ b/abs/core/qt3/qt-patches.tar.bz2 diff --git a/abs/core/qt3/qt.install b/abs/core/qt3/qt.install index 4e2d6b6..6d042da 100644 --- a/abs/core/qt3/qt.install +++ b/abs/core/qt3/qt.install @@ -1,24 +1,12 @@ post_install() { - if ! [ `grep '/opt/qt/lib' etc/ld.so.conf` ]; then - echo "/opt/qt/lib" >>etc/ld.so.conf - sbin/ldconfig -r . - fi - echo "INFORMATION:" - echo "Documentation is seperated it's called qt3-doc" + post_remove } post_upgrade() { - /bin/true + post_remove } -pre_remove() { - cat etc/ld.so.conf | grep -v '/opt/qt/lib' >/tmp/.pacqt - mv /tmp/.pacqt etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . +post_remove() { + # this can be removed in future versions + sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf } - -op=$1 -shift - -$op $* diff --git a/abs/core/qt3/qt3-png15.patch b/abs/core/qt3/qt3-png15.patch new file mode 100644 index 0000000..e64fea3 --- /dev/null +++ b/abs/core/qt3/qt3-png15.patch @@ -0,0 +1,212 @@ +$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ + +--- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 ++++ src/kernel/qpngio.cpp +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <zlib.h> + + + #ifdef Q_OS_TEMP +@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + 0, 0, 0); + ++ png_colorp info_ptr_palette = NULL; ++ int info_ptr_num_palette = 0; ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); ++ } ++ ++ png_bytep info_ptr_trans_alpha = NULL; ++ int info_ptr_num_trans = 0; ++ png_color_16p info_ptr_trans_color = NULL; ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { ++ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); ++ } ++ ++ + if ( color_type == PNG_COLOR_TYPE_GRAY ) { + // Black & White or 8-bit grayscale +- if ( bit_depth == 1 && info_ptr->channels == 1 ) { ++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { + png_set_invert_mono( png_ptr ); + png_read_update_info( png_ptr, info_ptr ); + if (!image.create( width, height, 1, 2, QImage::BigEndian )) +@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr_trans_color->gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct + } + } else if ( color_type == PNG_COLOR_TYPE_PALETTE + && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) +- && info_ptr->num_palette <= 256 ) ++ && info_ptr_num_palette <= 256 ) + { + // 1-bit and 8-bit color + if ( bit_depth != 1 ) +@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct + png_read_update_info( png_ptr, info_ptr ); + png_get_IHDR(png_ptr, info_ptr, + &width, &height, &bit_depth, &color_type, 0, 0, 0); +- if (!image.create(width, height, bit_depth, info_ptr->num_palette, ++ if (!image.create(width, height, bit_depth, info_ptr_num_palette, + QImage::BigEndian)) + return; + int i = 0; + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { + image.setAlphaBuffer( TRUE ); +- while ( i < info_ptr->num_trans ) { ++ while ( i < info_ptr_num_trans ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, ++ info_ptr_trans_alpha[i] + ) + ); + i++; + } + } +- while ( i < info_ptr->num_palette ) { ++ while ( i < info_ptr_num_palette ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, + 0xff + ) + ); +@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q + + png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); + ++#warning XXXtnn not too sure about this ++/* ++according to png.h, channels is only used on read, not writes, so we ++should be able to comment this out. ++ + info_ptr->channels = + (image.depth() == 32) + ? (image.hasAlphaBuffer() ? 4 : 3) + : 1; ++*/ + + png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), + image.depth() == 1 ? 1 : 8 /* per channel */, +@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q + : PNG_COLOR_TYPE_RGB + : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); + ++ png_color_8 sig_bit; ++ sig_bit.red = 8; ++ sig_bit.green = 8; ++ sig_bit.blue = 8; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + +- //png_set_sBIT(png_ptr, info_ptr, 8); +- info_ptr->sig_bit.red = 8; +- info_ptr->sig_bit.green = 8; +- info_ptr->sig_bit.blue = 8; + + if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) + png_set_packswap(png_ptr); +@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); + int* trans = new int[num_palette]; + int num_trans = 0; ++ png_colorp info_ptr_palette = NULL; ++ int tmp; ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); + for (int i=0; i<num_palette; i++) { + QRgb rgb=image.color(i); +- info_ptr->palette[i].red = qRed(rgb); +- info_ptr->palette[i].green = qGreen(rgb); +- info_ptr->palette[i].blue = qBlue(rgb); ++ info_ptr_palette[i].red = qRed(rgb); ++ info_ptr_palette[i].green = qGreen(rgb); ++ info_ptr_palette[i].blue = qBlue(rgb); + if (image.hasAlphaBuffer()) { + trans[i] = rgb >> 24; + if (trans[i] < 255) { +@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q + } + } + } ++ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); + if (num_trans) { + copy_trans = new png_byte[num_trans]; + for (int i=0; i<num_trans; i++) +@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q + } + + if ( image.hasAlphaBuffer() ) { +- info_ptr->sig_bit.alpha = 8; ++ png_color_8p sig_bit; ++ png_get_sBIT(png_ptr, info_ptr, &sig_bit); ++ sig_bit->alpha = 8; ++ png_set_sBIT(png_ptr, info_ptr, sig_bit); + } + + // Swap ARGB to RGBA (normal PNG format) before saving on +@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn + consumer->frameDone(QPoint(offx,offy),r); + consumer->end(); + state = FrameStart; +- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us ++ unused_data = png_process_data_pause(png, 0); + } + + #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/abs/core/qt3/utf8-bug-qt3.diff b/abs/core/qt3/utf8-bug-qt3.diff deleted file mode 100644 index 43e84a9..0000000 --- a/abs/core/qt3/utf8-bug-qt3.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- src/codecs/qutfcodec.cpp -+++ src/codecs/qutfcodec.cpp -@@ -154,6 +154,7 @@ - - class QUtf8Decoder : public QTextDecoder { - uint uc; -+ uint min_uc; - int need; - bool headerDone; - public: -@@ -167,8 +168,9 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uchar ch; -+ int error = -1; - for (int i=0; i<len; i++) { -- ch = *chars++; -+ ch = chars[i]; - if (need) { - if ( (ch&0xc0) == 0x80 ) { - uc = (uc << 6) | (ch & 0x3f); -@@ -182,6 +184,8 @@ - *qch++ = QChar(high); - *qch++ = QChar(low); - headerDone = TRUE; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ *qch++ = QChar::replacement; - } else { - if (headerDone || QChar(uc) != QChar::byteOrderMark) - *qch++ = uc; -@@ -190,6 +194,7 @@ - } - } else { - // error -+ i = error; - *qch++ = QChar::replacement; - need = 0; - } -@@ -200,12 +205,21 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::replacement; - } - } - } ---- src/tools/qstring.cpp -+++ src/tools/qstring.cpp -@@ -5805,6 +5805,7 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -5822,6 +5823,12 @@ - unsigned short low = uc%0x400 + 0xdc00; - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = QChar(0xdbff); -+ *qch++ = QChar(0xde00+((uchar)utf8[i])); - } else { - *qch++ = uc; - } -@@ -5844,14 +5851,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); diff --git a/abs/core/qtwebkit/PKGBUILD b/abs/core/qtwebkit/PKGBUILD new file mode 100644 index 0000000..8c289f4 --- /dev/null +++ b/abs/core/qtwebkit/PKGBUILD @@ -0,0 +1,106 @@ +# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qtwebkit +pkgver=2.2.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://trac.webkit.org/wiki/QtWebKit' +pkgdesc='An open source web browser engine (Qt port)' +license=('LGPL2.1' 'GPL3') +depends=('qt' 'gstreamer0.10-base') +makedepends=('python2' 'mesa' 'gperf') +conflicts=('qt<4.8') +_qtver=4.8.2 +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" + "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" + 'glibc.patch' + 'fix-build.patch') +sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' + '33c83272ed8110180ee6e7e3733e68cc513e2802' + '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' + 'c6dfb001b0412a8adfcb7f1f565a24314a753448') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver}-source + + patch -p1 -i "${srcdir}"/glibc.patch + patch -p1 -i "${srcdir}"/fix-build.patch + + # move headers + mv include Source/ + + cd Source + qmake + cd ../ + + make -C Source + + # Build the QWebView plugin (FS#27914) + cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + qmake + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver}-source + make INSTALL_ROOT="${pkgdir}" -C Source install + + cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install +} + +_source() { + local _current_dir=$(pwd) + local _tmp=$(mktemp -d --tmpdir) + + cd _tmp + git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git + + # fetch the make-package.py script + git clone git://qt.gitorious.org/qtwebkit/tools.git + + # create the qtwebkit tarball + cd qtwebkit + git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + ../tools/make-package.py + python2 ../tools/make-package.py + + mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ + + cd .. + + # create the qwebview plugin tarball + mkdir qwebview-${_qtver} + cd qwebview-${_qtver} + wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz + tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz + mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ + cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ + ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ + + cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" +TEMPLATE = subdirs +CONFIG += ordered + +REQUIRES = !CONFIG(static,shared|static) +contains(QT_CONFIG, webkit): SUBDIRS += qwebview +EOF + + cat > $(_tmp)/header.txt <<"EOF" +INCLUDEPATH += ../../../Source/include +LIBS += -L../../../Source/lib + +EOF + + cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ + ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri + + tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source + + mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + + rm -rf ${_tmp} +} diff --git a/abs/core/qtwebkit/fix-build.patch b/abs/core/qtwebkit/fix-build.patch new file mode 100644 index 0000000..46313bb --- /dev/null +++ b/abs/core/qtwebkit/fix-build.patch @@ -0,0 +1,36 @@ +diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri +--- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror 2012-05-22 09:30:37.000000000 -0500 ++++ qtwebkit-2.2.2-source/Source/WebKit.pri 2012-05-22 09:51:42.126610618 -0500 +@@ -102,7 +102,7 @@ CONFIG -= warn_on + + # Treat warnings as errors on x86/Linux/GCC + linux-g++* { +- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror ++ #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror + + greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { + if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { + +diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri +--- webkit-qtwebkit/Source/common.pri.me 2012-01-24 14:51:49.000000000 +0100 ++++ webkit-qtwebkit/Source/common.pri 2012-01-24 14:52:01.000000000 +0100 +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 +diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h diff --git a/abs/core/qtwebkit/glibc.patch b/abs/core/qtwebkit/glibc.patch new file mode 100644 index 0000000..bd7cb94 --- /dev/null +++ b/abs/core/qtwebkit/glibc.patch @@ -0,0 +1,339 @@ +diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am +--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100 +@@ -438,7 +438,6 @@ javascriptcore_sources += \ + Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ + Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ + Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ +- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ + Source/JavaScriptCore/wtf/HashCountedSet.h \ + Source/JavaScriptCore/wtf/HashFunctions.h \ + Source/JavaScriptCore/wtf/HashIterators.h \ +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100 +@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL + g_list_free(ptr); + } + +-template <> void freeOwnedGPtr<GCond>(GCond* ptr) +-{ +- if (ptr) +- g_cond_free(ptr); +-} +- +-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr) +-{ +- if (ptr) +- g_mutex_free(ptr); +-} +- + template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr) + { + if (ptr) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100 +@@ -35,8 +35,6 @@ namespace WTF { + template <typename T> inline void freeOwnedGPtr(T* ptr); + template<> void freeOwnedGPtr<GError>(GError*); + template<> void freeOwnedGPtr<GList>(GList*); +-template<> void freeOwnedGPtr<GCond>(GCond*); +-template<> void freeOwnedGPtr<GMutex>(GMutex*); + template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*); + template<> void freeOwnedGPtr<GDir>(GDir*); + +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100 +@@ -39,7 +39,6 @@ typedef void* gpointer; + typedef struct _GAsyncResult GAsyncResult; + typedef struct _GCancellable GCancellable; + typedef struct _GCharsetConverter GCharsetConverter; +-typedef struct _GCond GCond; + typedef struct _GDir GDir; + typedef struct _GdkAtom* GdkAtom; + typedef struct _GdkCursor GdkCursor; +@@ -52,7 +51,6 @@ typedef struct _GFile GFile; + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 2011-12-21 12:52:25.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp 2011-12-21 12:52:28.000000000 +0100 +@@ -1,248 +0,0 @@ +-/* +- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. +- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 3. Neither the name of Apple Inc. ("Apple") nor the names of +- * its contributors may be used to endorse or promote products derived +- * from this software without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "config.h" +-#include "Threading.h" +- +-#if !USE(PTHREADS) +- +-#include "CurrentTime.h" +-#include "HashMap.h" +-#include "MainThread.h" +-#include "RandomNumberSeed.h" +-#include <wtf/StdLibExtras.h> +- +-#include <glib.h> +-#include <limits.h> +- +-namespace WTF { +- +-typedef HashMap<ThreadIdentifier, GThread*> ThreadMap; +- +-static Mutex* atomicallyInitializedStaticMutex; +- +-static Mutex& threadMapMutex() +-{ +- DEFINE_STATIC_LOCAL(Mutex, mutex, ()); +- return mutex; +-} +- +-void initializeThreading() +-{ +- if (!g_thread_supported()) +- g_thread_init(NULL); +- ASSERT(g_thread_supported()); +- +- if (!atomicallyInitializedStaticMutex) { +- atomicallyInitializedStaticMutex = new Mutex; +- threadMapMutex(); +- initializeRandomNumberGenerator(); +- } +-} +- +-void lockAtomicallyInitializedStaticMutex() +-{ +- ASSERT(atomicallyInitializedStaticMutex); +- atomicallyInitializedStaticMutex->lock(); +-} +- +-void unlockAtomicallyInitializedStaticMutex() +-{ +- atomicallyInitializedStaticMutex->unlock(); +-} +- +-static ThreadMap& threadMap() +-{ +- DEFINE_STATIC_LOCAL(ThreadMap, map, ()); +- return map; +-} +- +-static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ThreadMap::iterator i = threadMap().begin(); +- for (; i != threadMap().end(); ++i) { +- if (i->second == thread) +- return i->first; +- } +- +- return 0; +-} +- +-static ThreadIdentifier establishIdentifierForThread(GThread*& thread) +-{ +- ASSERT(!identifierByGthreadHandle(thread)); +- +- MutexLocker locker(threadMapMutex()); +- +- static ThreadIdentifier identifierCount = 1; +- +- threadMap().add(identifierCount, thread); +- +- return identifierCount++; +-} +- +-static GThread* threadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- return threadMap().get(id); +-} +- +-static void clearThreadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ASSERT(threadMap().contains(id)); +- +- threadMap().remove(id); +-} +- +-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) +-{ +- GThread* thread; +- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { +- LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); +- return 0; +- } +- +- ThreadIdentifier threadID = establishIdentifierForThread(thread); +- return threadID; +-} +- +-void initializeCurrentThreadInternal(const char*) +-{ +-} +- +-int waitForThreadCompletion(ThreadIdentifier threadID, void** result) +-{ +- ASSERT(threadID); +- +- GThread* thread = threadForIdentifier(threadID); +- +- void* joinResult = g_thread_join(thread); +- if (result) +- *result = joinResult; +- +- clearThreadForIdentifier(threadID); +- return 0; +-} +- +-void detachThread(ThreadIdentifier) +-{ +-} +- +-ThreadIdentifier currentThread() +-{ +- GThread* currentThread = g_thread_self(); +- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) +- return id; +- return establishIdentifierForThread(currentThread); +-} +- +-void yield() +-{ +- g_thread_yield(); +-} +- +-Mutex::Mutex() +- : m_mutex(g_mutex_new()) +-{ +-} +- +-Mutex::~Mutex() +-{ +-} +- +-void Mutex::lock() +-{ +- g_mutex_lock(m_mutex.get()); +-} +- +-bool Mutex::tryLock() +-{ +- return g_mutex_trylock(m_mutex.get()); +-} +- +-void Mutex::unlock() +-{ +- g_mutex_unlock(m_mutex.get()); +-} +- +-ThreadCondition::ThreadCondition() +- : m_condition(g_cond_new()) +-{ +-} +- +-ThreadCondition::~ThreadCondition() +-{ +-} +- +-void ThreadCondition::wait(Mutex& mutex) +-{ +- g_cond_wait(m_condition.get(), mutex.impl().get()); +-} +- +-bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) +-{ +- // Time is in the past - return right away. +- if (absoluteTime < currentTime()) +- return false; +- +- // Time is too far in the future for g_cond_timed_wait - wait forever. +- if (absoluteTime > INT_MAX) { +- wait(mutex); +- return true; +- } +- +- int timeSeconds = static_cast<int>(absoluteTime); +- int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0); +- +- GTimeVal targetTime; +- targetTime.tv_sec = timeSeconds; +- targetTime.tv_usec = timeMicroseconds; +- +- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); +-} +- +-void ThreadCondition::signal() +-{ +- g_cond_signal(m_condition.get()); +-} +- +-void ThreadCondition::broadcast() +-{ +- g_cond_broadcast(m_condition.get()); +-} +- +- +-} +- +-#endif // !USE(PTHREADS) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100 +@@ -44,8 +44,6 @@ + + #if USE(PTHREADS) + #include <pthread.h> +-#elif PLATFORM(GTK) +-#include "GOwnPtr.h" + #endif + + #if PLATFORM(QT) +@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri + typedef void* PlatformReadWriteLock; + #endif + typedef pthread_cond_t PlatformCondition; +-#elif PLATFORM(GTK) +-typedef GOwnPtr<GMutex> PlatformMutex; +-typedef void* PlatformReadWriteLock; // FIXME: Implement. +-typedef GOwnPtr<GCond> PlatformCondition; + #elif PLATFORM(QT) + typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; + typedef void* PlatformReadWriteLock; // FIXME: Implement. diff --git a/abs/core/randrproto/PKGBUILD b/abs/core/randrproto/PKGBUILD index 7775b7f..6d1ebe2 100644 --- a/abs/core/randrproto/PKGBUILD +++ b/abs/core/randrproto/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 29287 2009-03-07 18:43:12Z jgc $ +# $Id: PKGBUILD 151246 2012-02-25 09:54:20Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=randrproto -pkgver=1.3.1 -pkgrel=1 +pkgver=1.3.2 +pkgrel=2 pkgdesc="X11 RandR extension wire protocol" -arch=('i686' 'x86_64') +arch=('any') license=('custom') url="http://xorg.freedesktop.org/" +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('55d4b1a09fc8e645d9674a452ae151988caabad1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -md5sums=('a5c244c36382b0de39b2828cea4b651d') diff --git a/abs/core/readline/PKGBUILD b/abs/core/readline/PKGBUILD index 24126df..037b7e1 100644 --- a/abs/core/readline/PKGBUILD +++ b/abs/core/readline/PKGBUILD @@ -1,35 +1,44 @@ -# $Id: PKGBUILD 82724 2010-06-16 04:51:23Z allan $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline -_patchlevel=002 #prepare for some patches -pkgver=6.1.$_patchlevel -pkgrel=2 +_basever=6.2 +_patchlevel=004 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=1 pkgdesc="GNU readline library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" license=('GPL') depends=('glibc' 'ncurses') -backup=("etc/inputrc") -source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz +backup=('etc/inputrc') +options=('!emptydirs') +install=readline.install +source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} inputrc) if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$_patchlevel; p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$(printf "%03d" $p)) + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) done fi -md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3' - 'e5fc955f56d9fa5beb871f3279b8fa8b' - 'c642f2e84d820884b0bf9fd176bc6c3f' - '1a76781a1ea734e831588285db7ec9b1') +md5sums=('67948acb2ca081f23359d0256e9a271c' + '928f7d248320a65e43c2dc427e99582b' + '58d54966c1191db45973cb3191ac621a' + '83287d52a482f790dfb30ec0a8746669' + '8e6a51e2e0e6e45a82752e3692c111ac' + '0665020ea118e8434bd145fb71f452cc' + '285361ca6d48c51ae2428157e174e812' + 'c9d5d79718856e711667dede87cb7622' + '4437205bb1462f5f32e4812b8292c675' + 'c08e787f50579ce301075c523fa660a4' + '7e39cad1d349b8ae789e4fc33dbb235f') build() { - cd ${srcdir}/${pkgname}-6.1 - for p in ../readline61-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} || return 1 + cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) done # Remove RPATH from shared objects (FS#14366) @@ -38,19 +47,13 @@ build() { # build with -fPIC for x86_64 (FS#15634) [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --libdir=/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info - make SHLIB_LIBS=-lncurses || return 1 - make DESTDIR=${pkgdir} install || return 1 - - mkdir -p ${pkgdir}/etc - install -m644 ../inputrc ${pkgdir}/etc/inputrc || return 1 - #FHS recommends only shared libs in /lib - mkdir -p $pkgdir/usr/lib - mv $pkgdir/lib/*.a $pkgdir/usr/lib + ./configure --prefix=/usr + make SHLIB_LIBS=-lncurses +} - # to make the linker find the shared lib and fix compile issues - cd ${pkgdir}/usr/lib - ln -sv /lib/libreadline.so . - ln -sv /lib/libhistory.so . +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc } diff --git a/abs/core/readline/inputrc b/abs/core/readline/inputrc index 6ad9dd9..fd13a67 100644 --- a/abs/core/readline/inputrc +++ b/abs/core/readline/inputrc @@ -34,7 +34,3 @@ $if mode=emacs "\e[H": beginning-of-line "\e[F": end-of-line $endif - -# Include user-specific configuration -$include ~/.inputrc - diff --git a/abs/core/readline/readline.install b/abs/core/readline/readline.install index 0d40c51..06b646f 100644 --- a/abs/core/readline/readline.install +++ b/abs/core/readline/readline.install @@ -1,18 +1,13 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(history.info readline.info rluserman.info) -post_install() { +post_upgrade() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } -post_upgrade() { - post_install $1 - echo ">> You can safely ignore any \"cannot open shared object\" errors you see above" -} - pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do diff --git a/abs/core/recordproto/PKGBUILD b/abs/core/recordproto/PKGBUILD index ea83e7b..fb5cdc9 100644 --- a/abs/core/recordproto/PKGBUILD +++ b/abs/core/recordproto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97545 2010-10-31 15:40:50Z jgc $ +# $Id: PKGBUILD 154138 2012-03-23 17:19:40Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=recordproto -pkgver=1.14.1 +pkgver=1.14.2 pkgrel=1 pkgdesc="X11 Record extension wire protocol" arch=('any') @@ -10,13 +10,16 @@ url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('14acb36540814bfe5d3caf47311b72a3bf1322bd') +sha1sums=('1f48c4b0004d8b133efd0498e8d88d68d3b9199c') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/reiserfsprogs/PKGBUILD b/abs/core/reiserfsprogs/PKGBUILD index 1e20cc2..ca73bf4 100644 --- a/abs/core/reiserfsprogs/PKGBUILD +++ b/abs/core/reiserfsprogs/PKGBUILD @@ -1,24 +1,34 @@ -# $Id: PKGBUILD 48336 2009-08-01 14:36:12Z jgc $ +# $Id: PKGBUILD 142934 2011-11-18 14:00:58Z pierre $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs pkgver=3.6.21 -pkgrel=2 +pkgrel=4 pkgdesc="Reiserfs utilities" -arch=(i686 x86_64) -url=http://www.kernel.org/pub/linux/utils/fs/reiserfs/README +arch=('i686' 'x86_64') +url="http://www.kernel.org/" license=('GPL') groups=('base') -depends=('util-linux-ng>=2.16') -source=(http://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-${pkgver}.tar.bz2) +depends=('util-linux-ng') +source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") md5sums=('0639cefac8f8150536cfa7531c2aa2d2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sbindir=/sbin || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sbindir=/sbin + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s reiserfsck "${pkgdir}/sbin/fsck.reiserfs" ln -s mkreiserfs "${pkgdir}/sbin/mkfs.reiserfs" } diff --git a/abs/core/resourceproto/PKGBUILD b/abs/core/resourceproto/PKGBUILD index 83da309..9cf222b 100644 --- a/abs/core/resourceproto/PKGBUILD +++ b/abs/core/resourceproto/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 151336 2012-02-25 14:40:00Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=resourceproto -pkgver=1.1.0 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc="X11 Resource extension wire protocol" -arch=(i686 x86_64) +arch=('any') url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +license=('custom') +makedepends=('xorg-util-macros') +source=("${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('9ff9bb9243b0474330959dc3853973523c9dd9ce') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('84795594b3ebd2ee2570cf93340d152c') diff --git a/abs/core/rpcbind/PKGBUILD b/abs/core/rpcbind/PKGBUILD index 81d6254..75cb398 100644 --- a/abs/core/rpcbind/PKGBUILD +++ b/abs/core/rpcbind/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 86473 2010-08-02 07:44:00Z tpowa $ +# $Id: PKGBUILD 157234 2012-04-26 13:06:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=rpcbind pkgver=0.2.0 -pkgrel=2 +pkgrel=8 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64) depends=('bash' 'glibc' 'libtirpc') @@ -11,20 +12,35 @@ license=('custom') replaces=('portmap') source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 rpcbind-sunrpc.patch + rpcbind.service rpcbind) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' + 'd2615f4c0d58f154aab6e294997ac9be' '78a963654f57cbb209e228884767836e') build() { cd $srcdir/$pkgname-$pkgver # patch for iana services file patch -Np1 -i ../rpcbind-sunrpc.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + # install missing man page - https://bugs.archlinux.org/task/21271 + install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ # install daemon install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind + # install systemd service file + install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service # install license install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING } diff --git a/abs/core/rpcbind/rpcbind.service b/abs/core/rpcbind/rpcbind.service new file mode 100644 index 0000000..418ba1e --- /dev/null +++ b/abs/core/rpcbind/rpcbind.service @@ -0,0 +1,11 @@ +[Unit] +Description=RPC Bind +Requires=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/rsync/PKGBUILD b/abs/core/rsync/PKGBUILD deleted file mode 100644 index 23fb9d0..0000000 --- a/abs/core/rsync/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -pkgname=rsync -pkgver=3.0.7 -pkgrel=1 -pkgdesc="A file transfer program to keep remote files in sync" -arch=('i686' 'x86_64') -url="http://samba.anu.edu.au/rsync/" -license=('GPL3') -depends=('acl') -backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') -source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \ - rsyncd.conf rsyncd rsync.xinetd) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./prepare-source || return 1 - ./configure --prefix=/usr --with-included-popt \ - --enable-acl-support --enable-xattr-support || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -D -m 755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd || return 1 - install -D -m 644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf || return 1 - install -D -m 644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync || return 1 -} -md5sums=('b53525900817cf1ba7ad3a516ab5bfe9' - '4395c0591638349b1a7aeaaa4da1f03a' - '9de4d03d49f4b5c73ffd67d452716a49' - 'ea3e9277dc908bc51f9eddc0f6b935c1') diff --git a/abs/core/rsync/__changelog b/abs/core/rsync/__changelog deleted file mode 100644 index e07c296..0000000 --- a/abs/core/rsync/__changelog +++ /dev/null @@ -1 +0,0 @@ -update to 3.0.7 diff --git a/abs/core/rsync/rsyncd.conf b/abs/core/rsync/rsyncd.conf deleted file mode 100644 index f7161f3..0000000 --- a/abs/core/rsync/rsyncd.conf +++ /dev/null @@ -1,16 +0,0 @@ -uid = nobody -gid = nobody -use chroot = no -max connections = 4 -syslog facility = local5 -pid file = /var/run/rsyncd.pid - -[ftp] - path = /home/ftp - comment = ftp area - -#[cvs] -# path = /data/cvs -# comment = CVS repository (requires authentication) -# auth users = tridge, susan -# secrets file = /etc/rsyncd.secrets diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 5ea3587..1750341 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -19,7 +19,7 @@ replaces=('syslog-ng') groups=('base') options=('strip' 'zipman' '!libtool') -install=('rsyslog.install') +#install=('rsyslog.install') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.conf.d' 'rsyslog.conf.linhes' log_care.sh) diff --git a/abs/core/run-parts/PKGBUILD b/abs/core/run-parts/PKGBUILD index 73c3598..00ed2fc 100644 --- a/abs/core/run-parts/PKGBUILD +++ b/abs/core/run-parts/PKGBUILD @@ -1,14 +1,16 @@ -# $Id$ +# $Id: PKGBUILD 162908 2012-07-03 17:24:27Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.0.2 +pkgver=4.3.2 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22') build() { cd $srcdir/debianutils-$pkgver @@ -20,5 +22,7 @@ package() { cd $srcdir/debianutils-$pkgver install -D -m755 run-parts $pkgdir/usr/bin/run-parts install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + for l in po4a/*/run-parts.8; do + install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 + done } -md5sums=('bb96bc981174c97ad825816ed118d297') diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9e73603..8957212 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -11,7 +11,7 @@ replaces=() backup=('etc/runit/1.local' 'etc/runit/3.local') install=runit.install source=(fbsplash-runit.sh) -arch=('i686') +arch=('i686' 'x86_64') build() { rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $startdir/src diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD index acd4126..23559c3 100644 --- a/abs/core/runit/PKGBUILD +++ b/abs/core/runit/PKGBUILD @@ -11,7 +11,7 @@ replaces=() backup=() #install=runit.install source=(http://smarden.org/runit/$pkgname-$pkgver.tar.gz add_service.sh remove_service.sh) -arch=('i686') +arch=('i686' 'x86_64') build() { cd $srcdir/admin/$pkgname-$pkgver/src diff --git a/abs/core/sdl/PKGBUILD b/abs/core/sdl/PKGBUILD index 5f3bcc0..9e3b3e3 100644 --- a/abs/core/sdl/PKGBUILD +++ b/abs/core/sdl/PKGBUILD @@ -1,33 +1,31 @@ -# $Id: PKGBUILD 82982 2010-06-20 08:19:40Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 147154 2012-01-23 14:30:05Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sdl -pkgver=1.2.14 -pkgrel=6 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('LGPL') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'esound' 'mesa') +makedepends=('alsa-lib' 'mesa' ) options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' + sdl-1.2.14-disable-mmx.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') + 'e5c16b7611f62c7cb25f0534eff68852') build() { cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch + patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --disable-esd \ - --with-x --disable-rpath + --with-x --disable-rpath --disable-static make } diff --git a/abs/core/sdl/__changelog b/abs/core/sdl/__changelog deleted file mode 100644 index 7556af0..0000000 --- a/abs/core/sdl/__changelog +++ /dev/null @@ -1 +0,0 @@ -disable esd diff --git a/abs/core/sdl/sdl-1.2.14-disable-mmx.patch b/abs/core/sdl/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 0000000..1bb6e0e --- /dev/null +++ b/abs/core/sdl/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, diff --git a/abs/core/sdl/sdl-1.2.14-fix-disappearing-cursor.patch b/abs/core/sdl/sdl-1.2.14-fix-disappearing-cursor.patch deleted file mode 100644 index fcd3c31..0000000 --- a/abs/core/sdl/sdl-1.2.14-fix-disappearing-cursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: SDL-1.2.14/src/video/x11/SDL_x11events.c -=================================================================== ---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -@@ -444,8 +444,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, diff --git a/abs/core/sdl/sdl-1.2.14-joystick-crash.diff b/abs/core/sdl/sdl-1.2.14-joystick-crash.diff deleted file mode 100644 index 949e18b..0000000 --- a/abs/core/sdl/sdl-1.2.14-joystick-crash.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix crash with joystick detection. -Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c -=================================================================== ---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500 -+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500 -@@ -700,7 +700,7 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ int values[6]; - - if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) - continue; diff --git a/abs/core/sed/PKGBUILD b/abs/core/sed/PKGBUILD index a7063f5..5e268d0 100644 --- a/abs/core/sed/PKGBUILD +++ b/abs/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77816 2010-04-18 08:52:19Z allan $ +# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.1 -pkgrel=2 +pkgrel=4 pkgdesc="GNU stream editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/sed" @@ -13,16 +13,22 @@ groups=('base') depends=('acl' 'sh') makedepends=('gettext') install=sed.install -source=(ftp://ftp.gnu.org/pub/gnu/sed/$pkgname-$pkgver.tar.gz) -md5sums=('f0fd4d7da574d4707e442285fd2d3b86') +source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('f0fd4d7da574d4707e442285fd2d3b86' + '91871b227dbf0916e019ba1fb0fbfdf3') build() { - cd $srcdir/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/abs/core/setuptools/PKGBUILD b/abs/core/setuptools/PKGBUILD deleted file mode 100644 index ccf0941..0000000 --- a/abs/core/setuptools/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 16826 2008-10-22 12:40:52Z douglas $ -# Maintainer: simo <simo@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Todd Maynard <arch@toddmaynard.com> - -pkgname=setuptools -pkgver=0.6c11 -pkgrel=2 -pkgdesc="setuptools is a collection of enhancements to the Python distutils" -license=('PSF') -arch=('i686' 'x86_64') -url="http://peak.telecommunity.com/DevCenter/setuptools" -depends=('python2') -source=(http://cheeseshop.python.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - mkdir -p ${pkgdir}/usr/lib/python2.6/site-packages - python2 setup.py install --root=${pkgdir} - echo "/usr/lib/python2.6/site-packages/${pkgname}-${pkgver}-py2.6.egg" > ${pkgdir}/usr/lib/python2.6/site-packages/setuptools.pth -} -md5sums=('7df2a529a074f613b509fb44feefe74e') diff --git a/abs/core/sg3_utils/PKGBUILD b/abs/core/sg3_utils/PKGBUILD index 6fc92a2..7392bd2 100644 --- a/abs/core/sg3_utils/PKGBUILD +++ b/abs/core/sg3_utils/PKGBUILD @@ -1,25 +1,27 @@ -#$Id: PKGBUILD 82274 2010-06-09 19:35:19Z ibiru $ +#$Id: PKGBUILD 147121 2012-01-22 10:55:51Z andyrtr $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> + pkgname=sg3_utils -pkgver=1.29 +pkgver=1.33 pkgrel=1 pkgdesc="Generic SCSI utilities" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') options=('!libtool') source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz) -md5sums=('17b8f2bc1b32bd036515683cc87328ea') +md5sums=('261e39f7161337330ba6bd57999be801') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/shadow/LICENSE b/abs/core/shadow/LICENSE new file mode 100644 index 0000000..c5ab15a --- /dev/null +++ b/abs/core/shadow/LICENSE @@ -0,0 +1,31 @@ +/* + * Copyright (c) 1990 - 1994, Julianne Frances Haugh + * Copyright (c) 1996 - 2000, Marek Michałkiewicz + * Copyright (c) 2001 - 2006, Tomasz Kłoczko + * Copyright (c) 2007 - 2009, Nicolas François + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the copyright holders or contributors may not be used to + * endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/abs/core/shadow/PKGBUILD b/abs/core/shadow/PKGBUILD index f8afc52..971b59a 100644 --- a/abs/core/shadow/PKGBUILD +++ b/abs/core/shadow/PKGBUILD @@ -1,97 +1,131 @@ -# $Id: PKGBUILD 81313 2010-05-28 01:29:23Z ibiru $ +# $Id: PKGBUILD 162993 2012-07-04 21:45:24Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow -pkgver=4.1.4.2 -pkgrel=3 -pkgdesc="Shadow password file utilities" +pkgver=4.1.5.1 +pkgrel=1 +pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' -license=('custom') +license=('BSD') groups=('base') -depends=('bash') +depends=('bash' 'pam' 'acl') backup=(etc/login.defs - etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} + etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} + etc/pam.d/{chgpasswd,groupmems} etc/default/useradd) -depends=('pam') -source=(ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-$pkgver.tar.bz2 - useradd.defaults login passwd chgpasswd chpasswd newusers defaults.pam - login.defs adduser shadow.cron.daily xstrdup.patch shadow-4.1.4.2-groupmod-pam-check.patch) -options=(!libtool) -install=shadow.install -md5sums=('d593a9cab93c48ee0a6ba056db8c1997' - 'beb64d09256ea46a4d96a783f096447f' - 'a7597cb2f60d7544d8d0ba6e49f6d937' - 'b84204ab731bd02dca49d0637d44ebec' - '65e9ebce249a5b9ed021e2790452b9e1' - '453a98456b297d2a69ca7e9b5f40d10b' - '453a98456b297d2a69ca7e9b5f40d10b' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fad9a7116366f7775b1099290be840da' - '6ce67e423ee19c87ae64f661310b2408' - '1d64b4113e1d402746d9dd65f28a2c6f' - '0eebe9d13065bec4b5d7ccf3bf46c509' - '7b747f7dca38b0b6e8ee56434378baae') +options=('!libtool') +install='shadow.install' +source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} + LICENSE + adduser + chgpasswd + chpasswd + defaults.pam + login.defs + newusers + passwd + shadow.cron.daily + useradd.defaults + xstrdup.patch + shadow-strncpy-usage.patch) +sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' + '126570e2939bf3b57f28df5197ab9309747a6b5c' + '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' + '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' + '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' + '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' + 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' + '611be25d91c3f8f307c7fe2485d5f781e5dee75f' + '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' + '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' + '6010fffeed1fc6673ad9875492e1193b1a847b53' + '21e12966a6befb25ec123b403cd9b5c492fe5b16') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" - #Ugh, force this to build shared libraries, for god's sake - sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am - libtoolize - autoreconf - export LDFLAGS="$LDFLAGS -lcrypt" + # avoid transitive linking issues with binutils 2.22 + sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - patch -Np1 -i $srcdir/xstrdup.patch || return 1 - patch -Np1 -i $srcdir/shadow-4.1.4.2-groupmod-pam-check.patch || return 1 + # link to glibc's crypt(3) + LDFLAGS+=" -lcrypt" + + # need to offer these upstream + patch -Np1 <"$srcdir/xstrdup.patch" + patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in ./configure \ - --prefix=/usr --libdir=/lib \ - --mandir=/usr/share/man --sysconfdir=/etc \ - --enable-shared --disable-static \ - --with-libpam --without-selinux - make || return 1 + --prefix=/usr \ + --libdir=/lib \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --with-libpam \ + --without-selinux + + make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install # license - install -Dm644 COPYING $pkgdir/usr/share/licenses/shadow/COPYING + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" # interactive useradd - install -Dm755 $srcdir/adduser $pkgdir/usr/sbin/adduser + install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" # useradd defaults - install -Dm644 $srcdir/useradd.defaults $pkgdir/etc/default/useradd + install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" # cron job - install -Dm744 $srcdir/shadow.cron.daily $pkgdir/etc/cron.daily/shadow + install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" # login.defs - install -Dm644 $srcdir/login.defs $pkgdir/etc/login.defs - - # PAM config - cutsom - install -Dm644 $srcdir/login $pkgdir/etc/pam.d/login - install -Dm644 $srcdir/passwd $pkgdir/etc/pam.d/passwd - install -Dm644 $srcdir/chgpasswd $pkgdir/etc/pam.d/chgpasswd - install -Dm644 $srcdir/chpasswd $pkgdir/etc/pam.d/chpasswd - install -Dm644 $srcdir/newusers $pkgdir/etc/pam.d/newusers + install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" + + # PAM config - custom + install -dm755 "$pkgdir/etc/pam.d" + install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers} + # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems $pkgdir/etc/pam.d/groupmems + install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" # we use the 'useradd' PAM file for other similar utilities - for file in chage chfn chsh groupadd groupdel groupmod shadow \ + for file in chage groupadd groupdel groupmod shadow \ useradd usermod userdel; do - install -Dm644 $srcdir/defaults.pam $pkgdir/etc/pam.d/$file + install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" done - # Remove su - using su from coreutils instead - rm -v $pkgdir/bin/su - find $pkgdir/usr/share/man -name 'su.1' -exec rm -v {} \; + # Remove utilities provided by util-linux + rm \ + "$pkgdir"/usr/bin/{chsh,chfn,sg} \ + "$pkgdir"/bin/{login,su} \ + "$pkgdir"/usr/sbin/{vipw,vigr} + + # but we keep newgrp, as sg is really an alias to it + mv "$pkgdir"/usr/bin/{newgrp,sg} + + # ...and their many man pages + find "$pkgdir"/usr/share/man \ + '(' -name 'chsh.1' -o \ + -name 'chfn.1' -o \ + -name 'su.1' -o \ + -name 'login.1' -o \ + -name 'vipw.8' -o \ + -name 'vigr.8' -o \ + -name 'newgrp.1' ')' \ + -delete + rmdir \ + "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ + "$pkgdir"/usr/share/man/{fi,ko/man8} } diff --git a/abs/core/shadow/chpasswd b/abs/core/shadow/chpasswd index bc14857..5d44798 100644 --- a/abs/core/shadow/chpasswd +++ b/abs/core/shadow/chpasswd @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/abs/core/shadow/chsh b/abs/core/shadow/chsh deleted file mode 100644 index a7bf8a4..0000000 --- a/abs/core/shadow/chsh +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/abs/core/shadow/login b/abs/core/shadow/login deleted file mode 100644 index 2230dd0..0000000 --- a/abs/core/shadow/login +++ /dev/null @@ -1,21 +0,0 @@ -#%PAM-1.0 -auth required pam_securetty.so -auth requisite pam_nologin.so -auth required pam_unix.so nullok -auth required pam_tally.so onerr=succeed file=/var/log/faillog -# use this to lockout accounts for 10 minutes after 3 failed attempts -#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog -account required pam_access.so -account required pam_time.so -account required pam_unix.so -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -session required pam_unix.so -session required pam_env.so -session required pam_motd.so -session required pam_limits.so -session optional pam_mail.so dir=/var/spool/mail standard -session optional pam_lastlog.so -# install consolekit and uncomment the line below -# to have ACL handle non-standard udev permissions -#session optional pam_ck_connector.so diff --git a/abs/core/shadow/login.defs b/abs/core/shadow/login.defs index 653e14e..2500ee4 100644 --- a/abs/core/shadow/login.defs +++ b/abs/core/shadow/login.defs @@ -187,27 +187,6 @@ DEFAULT_HOME yes #USERDEL_CMD /usr/sbin/userdel_local # -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -#GETPASS_ASTERISKS 1 - -# # Enable setting of the umask group bits to be the same as owner bits # (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is # the same as gid, and username is the same as the primary group name. diff --git a/abs/core/shadow/newusers b/abs/core/shadow/newusers index bc14857..5d44798 100644 --- a/abs/core/shadow/newusers +++ b/abs/core/shadow/newusers @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/abs/core/shadow/passwd b/abs/core/shadow/passwd index 1ffd1bd..ab56da4 100644 --- a/abs/core/shadow/passwd +++ b/abs/core/shadow/passwd @@ -1,4 +1,4 @@ #%PAM-1.0 #password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -password required pam_unix.so md5 shadow nullok +#password required pam_unix.so sha512 shadow use_authtok +password required pam_unix.so sha512 shadow nullok diff --git a/abs/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch b/abs/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch deleted file mode 100644 index f25c4e1..0000000 --- a/abs/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/300790 -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html - -2009-11-05 Nicolas François <nicolas.francois@centraliens.net> - - * NEWS, src/groupmod.c: Fixed groupmod when configured with - --enable-account-tools-setuid. - -diff --git a/src/groupmod.c b/src/groupmod.c -index 4205df2..da6d77f 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -724,7 +724,7 @@ int main (int argc, char **argv) - { - struct passwd *pampw; - pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ -- if (NULL == pamh) { -+ if (NULL == pampw) { - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); diff --git a/abs/core/shadow/shadow-strncpy-usage.patch b/abs/core/shadow/shadow-strncpy-usage.patch new file mode 100644 index 0000000..5aba8fa --- /dev/null +++ b/abs/core/shadow/shadow-strncpy-usage.patch @@ -0,0 +1,25 @@ +diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c +--- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 ++++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 +@@ -182,7 +182,7 @@ + struct tm *tp; + + if (date < 0) { +- strncpy (buf, "never", maxsize); ++ strncpy (buf, "never", maxsize - 1); + } else { + time_t t = (time_t) date; + tp = gmtime (&t); +diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c +--- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 ++++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 +@@ -752,7 +752,8 @@ + _("%s login: "), hostn); + } else { + strncpy (loginprompt, _("login: "), +- sizeof (loginprompt)); ++ sizeof (loginprompt) - 1); ++ loginprompt[sizeof (loginprompt) - 1] = '\0'; + } + + retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); diff --git a/abs/core/shadow/shadow.install b/abs/core/shadow/shadow.install index c1bd106..14384c3 100644 --- a/abs/core/shadow/shadow.install +++ b/abs/core/shadow/shadow.install @@ -1,8 +1,9 @@ post_upgrade() { - grpck -r &>/dev/null + grpck -r >/dev/null 2>&1 if [ $? -eq 2 ]; then - echo "Fixing gshadow file ..." - while :; do echo "y"; done | grpck &>/dev/null + printf '%s\n' \ + "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ + " Run 'grpck' to correct this." fi return 0 } diff --git a/abs/core/shared-mime-info/PKGBUILD b/abs/core/shared-mime-info/PKGBUILD index 45f7ba1..3b6bfa8 100644 --- a/abs/core/shared-mime-info/PKGBUILD +++ b/abs/core/shared-mime-info/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 95306 2010-10-18 14:49:19Z jgc $ +# $Id: PKGBUILD 148606 2012-02-04 11:19:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=shared-mime-info -pkgver=0.80 +pkgver=1.0 pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('i686' 'x86_64') license=('GPL') -depends=('libxml2>=2.7.7' 'glib2>=2.26.0') +depends=('libxml2' 'glib2') makedepends=('intltool' 'pkgconfig') install=shared-mime-info.install url="http://freedesktop.org/Software/shared-mime-info" -source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2 - pbm.patch) -md5sums=('eb8d24a6a80888849c9db7f30232ba6a' - '39fcc08fbd33145684ba97f1f64644c2') +source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz) +md5sums=('901b7977dbb2b71d12d30d4d8fb97028') +options=(!makeflags) build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/pbm.patch" ./configure --prefix=/usr --disable-update-mimedb - make || return 1 + make } package() { diff --git a/abs/core/shared-mime-info/pbm.patch b/abs/core/shared-mime-info/pbm.patch index 040900e..95f9ab8 100644 --- a/abs/core/shared-mime-info/pbm.patch +++ b/abs/core/shared-mime-info/pbm.patch @@ -40,10 +40,3 @@ diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/ </match> </match> </magic> -@@ -23926,4 +23920,4 @@ - </treemagic> - </mime-type> - --</mime-info> -\ No newline at end of file -+</mime-info> diff --git a/abs/core/speex/PKGBUILD b/abs/core/speex/PKGBUILD new file mode 100644 index 0000000..7bf7e7b --- /dev/null +++ b/abs/core/speex/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 137583 2011-09-09 22:58:20Z allan $ +# Maintainer: +# Contributer: Jason Chu <jason@archlinux.org> + +pkgname=speex +pkgver=1.2rc1 +pkgrel=2 +pkgdesc="A free codec for free speech" +arch=('i686' 'x86_64') +url="http://www.speex.org/" +license=('BSD') +depends=('libogg') +options=('!libtool') +source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') + +build() { + cd $srcdir/speex-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $srcdir/speex-$pkgver + make DESTDIR=$startdir/pkg install + + install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE +} diff --git a/abs/core/sqlite3/PKGBUILD b/abs/core/sqlite3/PKGBUILD deleted file mode 100644 index 1f60697..0000000 --- a/abs/core/sqlite3/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 94606 2010-10-08 18:17:20Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sqlite3 -pkgver=3.7.3 -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.sqlite.org/" -depends=('readline>=6.0.00') -makedepends=('tcl') -conflicts=('sqlite') -replaces=('sqlite') -source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz - license.txt) -options=(!libtool) -md5sums=('5437978aae90350cf984993091e0d695' - 'c1cdbc5544034d9012e421e75a5e4890') - -build() { - cd ${srcdir}/sqlite-${pkgver} - export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY" - ./configure --prefix=/usr \ - --enable-threadsafe \ - --enable-threads-override-locks \ - --enable-cross-thread-connections \ - --disable-static \ - --enable-load-extension - - # rpath removal - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - - make || return 1 -} - -package() { - cd ${srcdir}/sqlite-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm0644 sqlite3.1 ${pkgdir}/usr/share/man/man1/sqlite3.1 - - # license - install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt -} diff --git a/abs/core/sqlite3/license.txt b/abs/core/sqlite3/license.txt deleted file mode 100644 index 118c5d5..0000000 --- a/abs/core/sqlite3/license.txt +++ /dev/null @@ -1,33 +0,0 @@ -SQLite Copyright -SQLite is in the -Public Domain - - -All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. - -The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. - -All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. -Obtaining An Explicit License To Use SQLite - -Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: -You are using SQLite in a jurisdiction that does not recognize the public domain. -You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. -You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. -Your legal department tells you that you have to purchase a license. - -If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. -Contributed Code - -In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: -The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. - -We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: -Hwaci -6200 Maple Cove Lane -Charlotte, NC 28269 -USA - -A template copyright release is available in PDF or HTML. You can use this release to make future changes. - -see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/abs/core/squashfs-tools/PKGBUILD b/abs/core/squashfs-tools/PKGBUILD index 5ca67f8..ddbf5df 100644 --- a/abs/core/squashfs-tools/PKGBUILD +++ b/abs/core/squashfs-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42134 2011-03-13 21:59:05Z spupykin $ +# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Original TU: Jeff Mickey <j@codemac.net> @@ -6,7 +6,7 @@ pkgname=squashfs-tools pkgver=4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") diff --git a/abs/core/sudo/PKGBUILD b/abs/core/sudo/PKGBUILD index d74b779..eaf765f 100644 --- a/abs/core/sudo/PKGBUILD +++ b/abs/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90200 2010-09-09 05:26:45Z allan $ +# $Id: PKGBUILD 160450 2012-06-02 03:17:41Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.7.4p4 +_ver=1.8.5p2 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -12,27 +12,31 @@ url="http://www.sudo.ws/sudo/" license=('custom') depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz - sudo.pam) options=('!libtool' '!makeflags') -md5sums=('55d9906535d70a1de347cd3d3550ee87' +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} + sudo.pam) +md5sums=('dc42ed9f0946d92273762d0ae7314d59' + '756d80fc1c996d4f5458deec5a69b5c4' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { - cd $srcdir/$pkgname-$_ver + cd "$srcdir/$pkgname-$_ver" ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ --with-env-editor --with-all-insults --with-logfac=auth make } +check() { + cd "$srcdir/$pkgname-$_ver" + make check +} + package() { - cd $srcdir/$pkgname-$_ver - install -dm755 $pkgdir/var/lib + cd "$srcdir/$pkgname-$_ver" + make DESTDIR="$pkgdir" install - make DESTDIR=$pkgdir install - install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - install -Dm644 LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" } - diff --git a/abs/core/sysfsutils/PKGBUILD b/abs/core/sysfsutils/PKGBUILD index 7d4861d..1fa9bc5 100644 --- a/abs/core/sysfsutils/PKGBUILD +++ b/abs/core/sysfsutils/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 158624 2012-05-05 03:20:18Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=sysfsutils pkgver=2.1.0 -pkgrel=13 +pkgrel=8 pkgdesc="System Utilities Based on Sysfs" arch=(i686 x86_64) license=('GPL' 'LGPL') url="http://linux-diag.sourceforge.net/Sysfsutils.html" groups=('base') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz) md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') - +options=(!libtool) build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg/ install + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} - cd "$startdir"/pkg - mkdir -v lib - mv -v usr/lib/libsysfs.so.2* lib/ - ln -svf ../../lib/libsysfs.so.2 usr/lib/libsysfs.so - - #libtoolslay - find $startdir/pkg -name '*.la' -exec rm {} \; +check() { + cd "$pkgname-$pkgver" + make check } +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/lib/libsysfs.a" +} diff --git a/abs/core/syslog-ng/PKGBUILD b/abs/core/syslog-ng/PKGBUILD deleted file mode 100644 index dc66813..0000000 --- a/abs/core/syslog-ng/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 87478 2010-08-14 05:35:10Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=syslog-ng -pkgver=3.1.2 -pkgrel=1 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('base') -url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl') -makedepends=('flex' 'pkgconfig') -optdepends=('logrotate') -provides=('logger') -backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz - syslog-ng.conf - syslog-ng.logrotate - syslog-ng.rc) -install=syslog-ng.install -md5sums=('b9f45d9783a4ebeb84ec5acd158502fb' - 'e02be6637d0c3b5484d4597ce049ae39' - '735636090be4582885974542d2a75855' - '9bd98250cfa49e13fa3fa731b6040549') - -build() { - cd $srcdir/$pkgname-$pkgver - - # NOTE - re-assess this with later releases - # FS#15787: syslog-ng does not write to files not owned by root - # Upstream: https://bugzilla.balabit.com/show_bug.cgi?id=52 - # Solution: --disable-linux-caps - - LDFLAGS="$LDFLAGS -Wl,--no-undefined" ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib/syslog-ng \ - --enable-tcp-wrapper \ - --with-pidfile-dir=/var/run \ - --disable-spoof-source \ - --disable-linux-caps - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -dm755 $pkgdir/var/lib/syslog-ng - install -Dm644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf - install -Dm644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng - install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng - # remove libexec - rm -rf $pkgdir/usr/libexec -} diff --git a/abs/core/syslog-ng/syslog-ng.conf b/abs/core/syslog-ng/syslog-ng.conf deleted file mode 100644 index adee0cd..0000000 --- a/abs/core/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,93 +0,0 @@ -@version: 3.0 -# -# /etc/syslog-ng.conf -# - -options { - stats_freq (0); - flush_lines (0); - time_reopen (10); - log_fifo_size (1000); - long_hostnames(off); - use_dns (no); - use_fqdn (no); - create_dirs (no); - keep_hostname (yes); - perm(0640); - group("log"); -}; - -source src { - unix-stream("/dev/log"); - internal(); - file("/proc/kmsg"); -}; - -destination d_authlog { file("/var/log/auth.log"); }; -destination d_syslog { file("/var/log/syslog.log"); }; -destination d_cron { file("/var/log/crond.log"); }; -destination d_daemon { file("/var/log/daemon.log"); }; -destination d_kernel { file("/var/log/kernel.log"); }; -destination d_lpr { file("/var/log/lpr.log"); }; -destination d_user { file("/var/log/user.log"); }; -destination d_uucp { file("/var/log/uucp.log"); }; -destination d_mail { file("/var/log/mail.log"); }; -destination d_news { file("/var/log/news.log"); }; -destination d_ppp { file("/var/log/ppp.log"); }; -destination d_debug { file("/var/log/debug.log"); }; -destination d_messages { file("/var/log/messages.log"); }; -destination d_errors { file("/var/log/errors.log"); }; -destination d_everything { file("/var/log/everything.log"); }; -destination d_iptables { file("/var/log/iptables.log"); }; -destination d_acpid { file("/var/log/acpid.log"); }; -destination d_console { usertty("root"); }; - -# Log everything to tty12 -destination console_all { file("/dev/tty12"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { program(syslog-ng); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern) and not filter(f_iptables); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_user { facility(user); }; -filter f_uucp { facility(cron); }; -filter f_news { facility(news); }; -filter f_ppp { facility(local2); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; -filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; -filter f_emergency { level(emerg); }; -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; -filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; -filter f_acpid { program("acpid"); }; - -log { source(src); filter(f_acpid); destination(d_acpid); }; -log { source(src); filter(f_authpriv); destination(d_authlog); }; -log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_cron); destination(d_cron); }; -log { source(src); filter(f_daemon); destination(d_daemon); }; -log { source(src); filter(f_kernel); destination(d_kernel); }; -log { source(src); filter(f_lpr); destination(d_lpr); }; -log { source(src); filter(f_mail); destination(d_mail); }; -log { source(src); filter(f_news); destination(d_news); }; -log { source(src); filter(f_ppp); destination(d_ppp); }; -log { source(src); filter(f_user); destination(d_user); }; -log { source(src); filter(f_uucp); destination(d_uucp); }; -#log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); filter(f_messages); destination(d_messages); }; -log { source(src); filter(f_err); destination(d_errors); }; -log { source(src); filter(f_emergency); destination(d_console); }; -log { source(src); filter(f_everything); destination(d_everything); }; -log { source(src); filter(f_iptables); destination(d_iptables); }; - -# Log everything to tty12 -#log { source(src); destination(console_all); }; diff --git a/abs/core/syslog-ng/syslog-ng.install b/abs/core/syslog-ng/syslog-ng.install deleted file mode 100644 index 96f5dd8..0000000 --- a/abs/core/syslog-ng/syslog-ng.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 2.1.3-3)" -lt 0 -a -e /etc/syslog-ng.conf.pacnew ]; then - echo "Attention syslog-ng update:" - echo "Configuration file syntax has changed. Make sure to update /etc/syslog-ng.conf" - - fi -} diff --git a/abs/core/syslog-ng/syslog-ng.logrotate b/abs/core/syslog-ng/syslog-ng.logrotate deleted file mode 100644 index e0e6929..0000000 --- a/abs/core/syslog-ng/syslog-ng.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { - missingok - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/abs/core/syslog-ng/syslog-ng.rc b/abs/core/syslog-ng/syslog-ng.rc deleted file mode 100755 index f9d14c7..0000000 --- a/abs/core/syslog-ng/syslog-ng.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/syslog-ng` -case "$1" in - start) - stat_busy "Starting Syslog-NG" - [ -z "$PID" ] && /usr/sbin/syslog-ng - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon syslog-ng - stat_done - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/syslog-ng.pid -# Removing stale syslog-ng.persist file. It's new location, as of 2.0.6-1, is /var/lib/syslog-ng/ - rm -f /var/syslog-ng.persist - rm_daemon syslog-ng - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 25c83f2..7ed7635 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=13 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() -arch=('i686') +arch=('i686' 'x86_64') source=() build() { diff --git a/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch b/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch new file mode 100644 index 0000000..766dcb8 --- /dev/null +++ b/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch @@ -0,0 +1,124 @@ +From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 25 May 2012 19:43:24 -0400 +Subject: [PATCH] Reinstate TIMEOUT= handling + +This is mostly to deal with ipw2?00 drivers which have yet to be fixed +in the kernel. +--- + src/libudev/libudev-device.c | 19 +++++++++++++++++++ + src/libudev/libudev-private.h | 1 + + src/udev/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index a8277d1..5966189 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -89,6 +90,21 @@ struct udev_device { + bool db_persist; + }; + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + /** + * udev_device_get_seqnum: + * @udev_device: udev device +@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + + util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); + udev_device_set_syspath(udev_device, path); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (startswith(property, "SUBSYSTEM=")) { + udev_device_set_subsystem(udev_device, &property[10]); + } else if (startswith(property, "DEVTYPE=")) { +@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h +index 4eb4a59..99aefeb 100644 +--- a/src/libudev/libudev-private.h ++++ b/src/libudev/libudev-private.h +@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 0d85960..cd24462 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -384,7 +384,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -410,7 +410,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + log_debug("maximum number (%i) of children reached\n", children); + return; +@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) + if (is_devpath_busy(event)) + continue; + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.10.2 + diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD new file mode 100644 index 0000000..d677cfc --- /dev/null +++ b/abs/core/systemd/PKGBUILD @@ -0,0 +1,209 @@ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') +pkgver=187 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2' 'LGPL2.1' 'MIT') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 'initcpio-hook-udev' + 'initcpio-install-udev' + 'initcpio-install-timestamp' + '0001-Reinstate-TIMEOUT-handling.patch' + 'locale.sh') +md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' + 'e99e9189aa2f6084ac28b8ddf605aeb8' + '59e91c4d7a69b7bf12c86a9982e37ced' + 'df69615503ad293c9ddf9d8b7755282d' + '5543be25f205f853a21fa5ee68e03f0d' + 'f15956945052bb911e5df81cf5e7e5dc') + +build() { + cd "$pkgname-$pkgver" + + # still waiting on ipw2x00 to get fixed... + patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + ./configure \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-split-usr \ + --enable-introspection \ + --enable-gtk-doc \ + --disable-audit \ + --disable-ima \ + --with-pamlibdir=/usr/lib/security \ + --with-distro=arch \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + + make +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' + "systemd-tools=$pkgver" 'util-linux' 'xz') + optdepends=('initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: legacy generator for initialization scripts' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/logind.conf + etc/systemd/journald.conf) + install="systemd.install" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + install -dm755 "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + # don't write units to /etc by default -- we'll enable this on post_install + # as a sane default + rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" + rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + + # fix systemd-analyze for python2. the 'plot' verb does not work + # with py3k due to a bug in python-cairo + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + ### split off libsystemd (libs, includes, pkgconfig, man3) + rm -rf "$srcdir/_libsystemd" + install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} + cd "$srcdir"/_libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 + + ### split out systemd-tools/udev + rm -rf "$srcdir/_tools" + install -dm755 \ + "$srcdir"/_tools/etc/udev \ + "$srcdir"/_tools/usr/bin \ + "$srcdir"/_tools/usr/include \ + "$srcdir"/_tools/usr/lib/udev \ + "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ + "$srcdir"/_tools/usr/lib/girepository-1.0 \ + "$srcdir"/_tools/usr/share/pkgconfig \ + "$srcdir"/_tools/usr/share/gir-1.0 \ + "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ + "$srcdir"/_tools/usr/share/man/man{1,5,7,8} + + cd "$srcdir/_tools" + mv "$pkgdir"/etc/udev etc + mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc + mv "$pkgdir"/usr/bin/udevadm usr/bin + mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin + mv "$pkgdir"/usr/lib/pkgconfig usr/lib + mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd + mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system + mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants + mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants + mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib + mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib + mv "$pkgdir"/usr/lib/udev usr/lib + mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include + mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib + mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0 usr/share + mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html + mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 + mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 + mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 + mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 + mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin + mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + + install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('xz') + + mv "$srcdir/_libsystemd"/* "$pkgdir" +} + +package_systemd-tools() { + pkgdesc='standalone tools from systemd' + url='http://www.freedesktop.org/wiki/Software/systemd' + depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') + optdepends=('cryptsetup: required for encrypted block devices') + provides=("udev=$pkgver") + conflicts=('udev') + replaces=('udev') + install='systemd-tools.install' + + mv "$srcdir/_tools/"* "$pkgdir" + + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" + install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # XXX: kill off coredump rule until the journal can recover coredumps + # this file needs to come back as part of systemd, not systemd-tools + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" +} + +# vim: ft=sh syn=sh et diff --git a/abs/core/systemd/initcpio-hook-udev b/abs/core/systemd/initcpio-hook-udev new file mode 100644 index 0000000..75da7e4 --- /dev/null +++ b/abs/core/systemd/initcpio-hook-udev @@ -0,0 +1,20 @@ +#!/usr/bin/ash + +run_earlyhook() { + udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/initcpio-install-timestamp b/abs/core/systemd/initcpio-install-timestamp new file mode 100644 index 0000000..259cc70 --- /dev/null +++ b/abs/core/systemd/initcpio-install-timestamp @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp +} + +help() { + cat <<HELPEOF +Provides support for RD_TIMESTAMP in early userspace, which can be read by a +program such as systemd-analyze to determine boot time. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/initcpio-install-udev b/abs/core/systemd/initcpio-install-udev new file mode 100644 index 0000000..7624299 --- /dev/null +++ b/abs/core/systemd/initcpio-install-udev @@ -0,0 +1,28 @@ +#!/bin/bash + +build() { + local rules tool + + add_file "/etc/udev/udev.conf" + add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/locale.sh b/abs/core/systemd/locale.sh new file mode 100644 index 0000000..a4c413e --- /dev/null +++ b/abs/core/systemd/locale.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +if [ ! -r /etc/locale.conf ]; then + return +fi + +. /etc/locale.conf + +if [ "${LANG+x}" = 'x' ]; then + export LANG +fi + +if [ "${LC_CTYPE+x}" = 'x' ]; then + export LC_CTYPE +fi + +if [ "${LC_NUMERIC+x}" = 'x' ]; then + export LC_NUMERIC +fi + +if [ "${LC_TIME+x}" = 'x' ]; then + export LC_TIME +fi + +if [ "${LC_COLLATE+x}" = 'x' ]; then + export LC_COLLATE +fi + +if [ "${LC_MONETARY+x}" = 'x' ]; then + export LC_MONETARY +fi + +if [ "${LC_MESSAGES+x}" = 'x' ]; then + export LC_MESSAGES +fi + +if [ "${LC_PAPER+x}" = 'x' ]; then + export LC_PAPER +fi + +if [ "${LC_NAME+x}" = 'x' ]; then + export LC_NAME +fi + +if [ "${LC_ADDRESS+x}" = 'x' ]; then + export LC_ADDRESS +fi + +if [ "${LC_TELEPHONE+x}" = 'x' ]; then + export LC_TELEPHONE +fi + +if [ "${LC_MEASUREMENT+x}" = 'x' ]; then + export LC_MEASUREMENT +fi + +if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then + export LC_IDENTIFICATION +fi + diff --git a/abs/core/systemd/systemd-187-2.src.tar.gz b/abs/core/systemd/systemd-187-2.src.tar.gz new file mode 120000 index 0000000..980a3eb --- /dev/null +++ b/abs/core/systemd/systemd-187-2.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/src_packages/systemd-187-2.src.tar.gz
\ No newline at end of file diff --git a/abs/core/systemd/systemd-tools.install b/abs/core/systemd/systemd-tools.install new file mode 100644 index 0000000..7d0bd87 --- /dev/null +++ b/abs/core/systemd/systemd-tools.install @@ -0,0 +1,35 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + systemd-machine-id-setup +} + +post_upgrade() { + systemd-machine-id-setup + + if [ "$(vercmp $2 174)" -lt 0 ]; then + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." + fi + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." + fi + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi + if [ "$(vercmp $2 181-3)" -lt 0 ]; then + echo " * if your kernel does not provide /dev/loop-control, you need to manually" + echo " load the 'loop' module before using losetup" + fi +} diff --git a/abs/core/systemd/systemd-tools/0001-Reinstate-TIMEOUT-handling.patch b/abs/core/systemd/systemd-tools/0001-Reinstate-TIMEOUT-handling.patch new file mode 100644 index 0000000..766dcb8 --- /dev/null +++ b/abs/core/systemd/systemd-tools/0001-Reinstate-TIMEOUT-handling.patch @@ -0,0 +1,124 @@ +From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 25 May 2012 19:43:24 -0400 +Subject: [PATCH] Reinstate TIMEOUT= handling + +This is mostly to deal with ipw2?00 drivers which have yet to be fixed +in the kernel. +--- + src/libudev/libudev-device.c | 19 +++++++++++++++++++ + src/libudev/libudev-private.h | 1 + + src/udev/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index a8277d1..5966189 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -89,6 +90,21 @@ struct udev_device { + bool db_persist; + }; + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + /** + * udev_device_get_seqnum: + * @udev_device: udev device +@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + + util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); + udev_device_set_syspath(udev_device, path); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (startswith(property, "SUBSYSTEM=")) { + udev_device_set_subsystem(udev_device, &property[10]); + } else if (startswith(property, "DEVTYPE=")) { +@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h +index 4eb4a59..99aefeb 100644 +--- a/src/libudev/libudev-private.h ++++ b/src/libudev/libudev-private.h +@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 0d85960..cd24462 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -384,7 +384,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -410,7 +410,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + log_debug("maximum number (%i) of children reached\n", children); + return; +@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) + if (is_devpath_busy(event)) + continue; + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.10.2 + diff --git a/abs/core/systemd/systemd-tools/PKGBUILD b/abs/core/systemd/systemd-tools/PKGBUILD new file mode 100644 index 0000000..338fd8f --- /dev/null +++ b/abs/core/systemd/systemd-tools/PKGBUILD @@ -0,0 +1,205 @@ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') +pkgver=186 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2' 'LGPL2.1' 'MIT') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 'initcpio-hook-udev' + 'initcpio-install-udev' + 'initcpio-install-timestamp' + '0001-Reinstate-TIMEOUT-handling.patch' + 'locale.sh') +md5sums=('17eff1d31e6e49bf82e129fe57efd59b' + 'e99e9189aa2f6084ac28b8ddf605aeb8' + '59e91c4d7a69b7bf12c86a9982e37ced' + 'df69615503ad293c9ddf9d8b7755282d' + '5543be25f205f853a21fa5ee68e03f0d' + 'f15956945052bb911e5df81cf5e7e5dc') + +build() { + cd "$pkgname-$pkgver" + + # still waiting on ipw2x00 to get fixed... + patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + ./configure \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-split-usr \ + --enable-introspection \ + --enable-gtk-doc \ + --disable-audit \ + --disable-ima \ + --with-pamlibdir=/usr/lib/security \ + --with-distro=arch \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + + make +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' + "systemd-tools=$pkgver" 'util-linux' 'xz') + optdepends=('python-dbus: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: legacy generator for initialization scripts' + 'python-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/logind.conf + etc/systemd/journald.conf) + install="systemd.install" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + install -dm755 "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + # don't write units to /etc by default -- we'll enable this on post_install + # as a sane default + rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" + rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + + ### split off libsystemd (libs, includes, pkgconfig, man3) + rm -rf "$srcdir/_libsystemd" + install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} + cd "$srcdir"/_libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 + + ### split out systemd-tools/udev + rm -rf "$srcdir/_tools" + install -dm755 \ + "$srcdir"/_tools/etc/udev \ + "$srcdir"/_tools/usr/bin \ + "$srcdir"/_tools/usr/include \ + "$srcdir"/_tools/usr/lib/udev \ + "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ + "$srcdir"/_tools/usr/lib/girepository-1.0 \ + "$srcdir"/_tools/usr/share/pkgconfig \ + "$srcdir"/_tools/usr/share/gir-1.0 \ + "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ + "$srcdir"/_tools/usr/share/man/man{1,5,7,8} + + cd "$srcdir/_tools" + mv "$pkgdir"/etc/udev etc + mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc + mv "$pkgdir"/usr/bin/udevadm usr/bin + mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin + mv "$pkgdir"/usr/lib/pkgconfig usr/lib + mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd + mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system + mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants + mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants + mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib + mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib + mv "$pkgdir"/usr/lib/udev usr/lib + mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include + mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib + mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0 usr/share + mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html + mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 + mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 + mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 + mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin + mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + + install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('xz') + + mv "$srcdir/_libsystemd"/* "$pkgdir" +} + +package_systemd-tools() { + pkgdesc='standalone tools from systemd' + url='http://www.freedesktop.org/wiki/Software/systemd' + depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') + optdepends=('cryptsetup: required for encrypted block devices') + provides=("udev=$pkgver") + conflicts=('udev') + replaces=('udev') + install='systemd-tools.install' + + mv "$srcdir/_tools/"* "$pkgdir" + + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" + install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # XXX: kill off coredump rule until the journal can recover coredumps + # this file needs to come back as part of systemd, not systemd-tools + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" +} + +# vim: ft=sh syn=sh et diff --git a/abs/core/systemd/systemd-tools/initcpio-hook-udev b/abs/core/systemd/systemd-tools/initcpio-hook-udev new file mode 100644 index 0000000..75da7e4 --- /dev/null +++ b/abs/core/systemd/systemd-tools/initcpio-hook-udev @@ -0,0 +1,20 @@ +#!/usr/bin/ash + +run_earlyhook() { + udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/systemd-tools/initcpio-install-timestamp b/abs/core/systemd/systemd-tools/initcpio-install-timestamp new file mode 100644 index 0000000..259cc70 --- /dev/null +++ b/abs/core/systemd/systemd-tools/initcpio-install-timestamp @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp +} + +help() { + cat <<HELPEOF +Provides support for RD_TIMESTAMP in early userspace, which can be read by a +program such as systemd-analyze to determine boot time. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/systemd-tools/initcpio-install-udev b/abs/core/systemd/systemd-tools/initcpio-install-udev new file mode 100644 index 0000000..7624299 --- /dev/null +++ b/abs/core/systemd/systemd-tools/initcpio-install-udev @@ -0,0 +1,28 @@ +#!/bin/bash + +build() { + local rules tool + + add_file "/etc/udev/udev.conf" + add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/abs/core/systemd/systemd-tools/locale.sh b/abs/core/systemd/systemd-tools/locale.sh new file mode 100644 index 0000000..a4c413e --- /dev/null +++ b/abs/core/systemd/systemd-tools/locale.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +if [ ! -r /etc/locale.conf ]; then + return +fi + +. /etc/locale.conf + +if [ "${LANG+x}" = 'x' ]; then + export LANG +fi + +if [ "${LC_CTYPE+x}" = 'x' ]; then + export LC_CTYPE +fi + +if [ "${LC_NUMERIC+x}" = 'x' ]; then + export LC_NUMERIC +fi + +if [ "${LC_TIME+x}" = 'x' ]; then + export LC_TIME +fi + +if [ "${LC_COLLATE+x}" = 'x' ]; then + export LC_COLLATE +fi + +if [ "${LC_MONETARY+x}" = 'x' ]; then + export LC_MONETARY +fi + +if [ "${LC_MESSAGES+x}" = 'x' ]; then + export LC_MESSAGES +fi + +if [ "${LC_PAPER+x}" = 'x' ]; then + export LC_PAPER +fi + +if [ "${LC_NAME+x}" = 'x' ]; then + export LC_NAME +fi + +if [ "${LC_ADDRESS+x}" = 'x' ]; then + export LC_ADDRESS +fi + +if [ "${LC_TELEPHONE+x}" = 'x' ]; then + export LC_TELEPHONE +fi + +if [ "${LC_MEASUREMENT+x}" = 'x' ]; then + export LC_MEASUREMENT +fi + +if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then + export LC_IDENTIFICATION +fi + diff --git a/abs/core/systemd/systemd-tools/systemd-tools.install b/abs/core/systemd/systemd-tools/systemd-tools.install new file mode 100644 index 0000000..7d0bd87 --- /dev/null +++ b/abs/core/systemd/systemd-tools/systemd-tools.install @@ -0,0 +1,35 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + systemd-machine-id-setup +} + +post_upgrade() { + systemd-machine-id-setup + + if [ "$(vercmp $2 174)" -lt 0 ]; then + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." + fi + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." + fi + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi + if [ "$(vercmp $2 181-3)" -lt 0 ]; then + echo " * if your kernel does not provide /dev/loop-control, you need to manually" + echo " load the 'loop' module before using losetup" + fi +} diff --git a/abs/core/systemd/systemd-tools/systemd.install b/abs/core/systemd/systemd-tools/systemd.install new file mode 100644 index 0000000..e369f09 --- /dev/null +++ b/abs/core/systemd/systemd-tools/systemd.install @@ -0,0 +1,37 @@ +#!/bin/sh + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + # enable getty@tty1 by default, but don't track the file + systemctl enable getty@.service + + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd" +} + +post_upgrade() { + if sd_booted; then + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec + fi + fi + + # getty@tty1.service is no longer enabled by default, but we don't want to break + # existing setups. + if [ "$(vercmp 183 "$2")" -eq 1 ]; then + # systemctl seems to be whiny on sysvinit. this will succeed unless something + # horrific happens, so just mask the error. + systemctl -q enable getty@.service || true + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/systemd/systemd.install b/abs/core/systemd/systemd.install new file mode 100644 index 0000000..e369f09 --- /dev/null +++ b/abs/core/systemd/systemd.install @@ -0,0 +1,37 @@ +#!/bin/sh + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + # enable getty@tty1 by default, but don't track the file + systemctl enable getty@.service + + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd" +} + +post_upgrade() { + if sd_booted; then + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec + fi + fi + + # getty@tty1.service is no longer enabled by default, but we don't want to break + # existing setups. + if [ "$(vercmp 183 "$2")" -eq 1 ]; then + # systemctl seems to be whiny on sysvinit. this will succeed unless something + # horrific happens, so just mask the error. + systemctl -q enable getty@.service || true + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/sysvinit/0001-simplify-writelog.patch b/abs/core/sysvinit/0001-simplify-writelog.patch new file mode 100644 index 0000000..cc28f14 --- /dev/null +++ b/abs/core/sysvinit/0001-simplify-writelog.patch @@ -0,0 +1,126 @@ +From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001 +From: Florian Pritz <bluewind@xinu.at> +Date: Fri, 15 Jun 2012 16:41:52 +0200 +Subject: [PATCH 1/2] simplify writelog() + +All we do is prepend the date and remove \r. We don't handle color +codes, but the user can just cat the log file in a terminal and it will +interpret the codes correctly. + +Signed-off-by: Florian Pritz <bluewind@xinu.at> +--- + bootlogd.c | 76 +++++++++++++++++------------------------------------------- + 1 file changed, 21 insertions(+), 55 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index 570d382..e36e261 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -68,11 +68,6 @@ int didnl = 1; + int createlogfile = 0; + int syncalot = 0; + +-struct line { +- char buf[256]; +- int pos; +-} line; +- + /* + * Console devices as listed on the kernel command line and + * the mapping to actual devices in /dev +@@ -351,63 +346,34 @@ int consolename(char *res, int rlen) + */ + void writelog(FILE *fp, unsigned char *ptr, int len) + { +- time_t t; +- char *s; +- char tmp[8]; +- int olen = len; +- int dosync = 0; +- int tlen; +- +- while (len > 0) { +- tmp[0] = 0; +- if (didnl) { ++ int dosync = 0; ++ int i; ++ static int first_run = 1; ++ ++ for (i = 0; i < len; i++) { ++ int ignore = 0; ++ ++ /* prepend date to every line */ ++ if (*(ptr-1) == '\n' || first_run) { ++ time_t t; ++ char *s; + time(&t); + s = ctime(&t); + fprintf(fp, "%.24s: ", s); +- didnl = 0; ++ dosync = 1; ++ first_run = 0; + } +- switch (*ptr) { +- case 27: /* ESC */ +- strcpy(tmp, "^["); +- break; +- case '\r': +- line.pos = 0; +- break; +- case 8: /* ^H */ +- if (line.pos > 0) line.pos--; +- break; +- case '\n': +- didnl = 1; +- dosync = 1; +- break; +- case '\t': +- line.pos += (line.pos / 8 + 1) * 8; +- if (line.pos >= (int)sizeof(line.buf)) +- line.pos = sizeof(line.buf) - 1; +- break; +- case 32 ... 127: +- case 161 ... 255: +- tmp[0] = *ptr; +- tmp[1] = 0; +- break; +- default: +- sprintf(tmp, "\\%03o", *ptr); +- break; +- } +- ptr++; +- len--; + +- tlen = strlen(tmp); +- if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) { +- memcpy(line.buf + line.pos, tmp, tlen); +- line.pos += tlen; ++ if (*ptr == '\r') { ++ ignore = 1; + } +- if (didnl) { +- fprintf(fp, "%s\n", line.buf); +- memset(&line, 0, sizeof(line)); ++ ++ if (!ignore) { ++ fwrite(ptr, sizeof(char), 1, fp); + } +- } + ++ ptr++; ++ } + if (dosync) { + fflush(fp); + if (syncalot) { +@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + } + } + +- outptr += olen; ++ outptr += len; + if (outptr >= endptr) + outptr = ringbuf; + +-- +1.7.10.4 + diff --git a/abs/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/abs/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch new file mode 100644 index 0000000..89b3280 --- /dev/null +++ b/abs/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch @@ -0,0 +1,80 @@ +From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001 +From: Florian Pritz <bluewind@xinu.at> +Date: Sun, 24 Jun 2012 15:49:51 +0200 +Subject: [PATCH 2/2] remove ansi escape codes from log file + +References: https://en.wikipedia.org/wiki/ANSI_escape_code + +Signed-off-by: Florian Pritz <bluewind@xinu.at> +--- + bootlogd.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 43 insertions(+), 2 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index e36e261..88e610d 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + int dosync = 0; + int i; + static int first_run = 1; ++ static int inside_esc = 0; + + for (i = 0; i < len; i++) { + int ignore = 0; +@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + first_run = 0; + } + +- if (*ptr == '\r') { +- ignore = 1; ++ /* remove escape sequences, but do it in a way that allows us to stop ++ * in the middle in case the string was cut off */ ++ if (inside_esc == 1) { ++ /* first '[' is special because if we encounter it again, it should be considered the final byte */ ++ if (*ptr == '[') { ++ /* multi char sequence */ ++ ignore = 1; ++ inside_esc = 2; ++ } else { ++ /* single char sequence */ ++ if (*ptr >= 64 && *ptr <= 95) { ++ ignore = 1; ++ } ++ inside_esc = 0; ++ } ++ } else if (inside_esc == 2) { ++ switch (*ptr) { ++ case '0' ... '9': /* intermediate chars of escape sequence */ ++ case ';': ++ case 32 ... 47: ++ if (inside_esc) { ++ ignore = 1; ++ } ++ break; ++ case 64 ... 126: /* final char of escape sequence */ ++ if (inside_esc) { ++ ignore = 1; ++ inside_esc = 0; ++ } ++ break; ++ } ++ } else { ++ switch (*ptr) { ++ case '\r': ++ ignore = 1; ++ break; ++ case 27: /* ESC */ ++ ignore = 1; ++ inside_esc = 1; ++ break; ++ } + } + ++ + if (!ignore) { + fwrite(ptr, sizeof(char), 1, fp); + } +-- +1.7.10.4 + diff --git a/abs/core/sysvinit/PKGBUILD b/abs/core/sysvinit/PKGBUILD index c3ba701..27d5a09 100644 --- a/abs/core/sysvinit/PKGBUILD +++ b/abs/core/sysvinit/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 92996 2010-10-02 19:26:38Z eric $ +# $Id: PKGBUILD 162726 2012-06-29 06:27:09Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> pkgname=sysvinit pkgver=2.88 @@ -10,33 +9,43 @@ arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') groups=('base') -depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk' 'poweroff-scripts') -source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 halt-init.patch) +depends=('util-linux' 'coreutils' 'glibc' 'awk' 'poweroff-scripts') +install=sysvinit.install +source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 + "0001-simplify-writelog.patch" + "0002-remove-ansi-escape-codes-from-log-file.patch" + "halt_init.patch") build() { cd "${srcdir}/${pkgname}-${pkgver}dsf" - patch -p0 < ${srcdir}/halt-init.patch - make || return 1 + + # FS#30005 + patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" + patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" + patch -p0 < ${srcdir}/halt_init.patch + make } package() { cd "${srcdir}/${pkgname}-${pkgver}dsf" make ROOT="${pkgdir}" install + # mountpoint is now provided by util-linux instead + cd "${pkgdir}" + rm bin/mountpoint + rm usr/share/man/man1/mountpoint.1 + # Rename some stuff so it does not bigfoot changes needed for runit cd "${pkgdir}/sbin" rm -f reboot poweroff - #These will be created in the poweroff-scripts post-install section - #This should be removed when moving to 64 and we have no legacy to worry about - #ln -s halt.init reboot.init - #ln -s halt.init poweroff.init - - - mv halt halt.init mv shutdown shutdown.init + + } md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f' - 'cd4c5767f63ca5881e3e1f1c4f10f896') + 'e3e82a3a38415518f52f78a622ef0262' + '04f0ab28340df08bb47d066669bc4519' + 'aec0de91c1d2f56e78393d400fd238a7') diff --git a/abs/core/sysvinit/__changelog b/abs/core/sysvinit/__changelog index f249199..0609292 100644 --- a/abs/core/sysvinit/__changelog +++ b/abs/core/sysvinit/__changelog @@ -1,30 +1,9 @@ -patch halt to work with runit +halt_init.patch + # Rename some stuff so it does not bigfoot changes needed for runit + cd "${pkgdir}/sbin" + rm -f reboot poweroff + mv halt halt.init + mv shutdown shutdown.init ---- src/halt.c.orig 2008-08-30 17:25:02.000000000 +0000 -+++ src/halt.c 2008-08-30 18:10:29.000000000 +0000 -@@ -186,6 +186,14 @@ - if (!strcmp(progname, "reboot")) do_reboot = 1; - if (!strcmp(progname, "poweroff")) do_poweroff = 1; - -+ if (!strcmp(progname, "reboot.init")) do_reboot = 1; -+ if (!strcmp(progname, "poweroff.init")) do_poweroff = 1; -+ -+ //fprintf(stderr, "%d: do_reboot \n ", do_reboot); -+ //fprintf(stderr, "%d: do_poweroff \n ", do_poweroff); -+ //fprintf(stderr, "%s: \n", progname); -+ //do_nothing = 1; -+ - /* - * Get flags - */ -# mjh 08-17-2011 -* mv halt to halt-init -* mv shutdown shutdown-init -* rm -f reboot poweroff -* remove sysvinit.install - -#add -jm -'poweroff-scripts' as a depend - diff --git a/abs/core/sysvinit/halt-init.patch b/abs/core/sysvinit/halt_init.patch index 0885252..4f10932 100644 --- a/abs/core/sysvinit/halt-init.patch +++ b/abs/core/sysvinit/halt_init.patch @@ -1,12 +1,11 @@ --- src/halt.c.orig 2010-02-26 13:45:49.000000000 +0000 -+++ src/halt.c 2010-12-02 17:42:51.000000000 +0000 -@@ -198,6 +198,9 @@ ++++ src/halt.c 2012-08-07 23:13:06.321378085 +0000 +@@ -197,6 +197,8 @@ + if (!strcmp(progname, "reboot")) do_reboot = 1; if (!strcmp(progname, "poweroff")) do_poweroff = 1; - + if (!strcmp(progname, "reboot.init")) do_reboot = 1; + if (!strcmp(progname, "poweroff.init")) do_poweroff = 1; -+ + /* * Get flags - */ diff --git a/abs/core/sysvinit/sysvinit.install b/abs/core/sysvinit/sysvinit.install new file mode 100644 index 0000000..2f0e62e --- /dev/null +++ b/abs/core/sysvinit/sysvinit.install @@ -0,0 +1,3 @@ +post_upgrade() { + [ -x sbin/init ] && sbin/init u +} diff --git a/abs/core/taglib/PKGBUILD b/abs/core/taglib/PKGBUILD index c1732f1..38de561 100644 --- a/abs/core/taglib/PKGBUILD +++ b/abs/core/taglib/PKGBUILD @@ -1,33 +1,39 @@ -# $Id: PKGBUILD 79406 2010-05-04 00:23:40Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 158844 2012-05-12 11:47:35Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib -pkgver=1.6.3 +pkgver=1.7.2 pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64') url="http://developer.kde.org/~wheeler/taglib.html" -license=('GPL2') +license=('LGPL' 'MPL') depends=('sh' 'zlib' 'gcc-libs') -makedepends=('cmake' 'pkgconfig') -source=(http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz) +makedepends=('cmake' 'pkg-config') options=('!libtool') -md5sums=('ddf02f4e1d2dc30f76734df806e613eb') +source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" + 'ape-idev2.patch') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/ape-idev2.patch + + cd "${srcdir}" mkdir build cd build - cmake ../$pkgname-$pkgver \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ -DWITH_ASF=ON - make VERBOSE=1 || return 1 + make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } +md5sums=('b0a9e797d3833fb933c7c3176de3d720' + 'c7c165d99acf01456351ba39ff7056cb') diff --git a/abs/core/taglib/ape-idev2.patch b/abs/core/taglib/ape-idev2.patch new file mode 100644 index 0000000..9c58da4 --- /dev/null +++ b/abs/core/taglib/ape-idev2.patch @@ -0,0 +1,12 @@ +diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp +--- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100 ++++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000 +@@ -137,7 +137,7 @@ + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; diff --git a/abs/core/tar/PKGBUILD b/abs/core/tar/PKGBUILD index 3bde59b..e7ac2e4 100644 --- a/abs/core/tar/PKGBUILD +++ b/abs/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=1 +pkgrel=2 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/tar/tar.html" @@ -13,15 +13,17 @@ groups=('base') depends=('glibc' 'sh') options=('!emptydirs') install=tar.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} tar.1) md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' - 'e0538778516a284e3558c454b2576c2f') + '6618d5fe7785e138c27d7d6a24e998b2' + 'e97e7343f4e23724b4c48bca2f033e38') build() { cd ${srcdir}/$pkgname-$pkgver + sed -i '/gets is a security hole/d' gnu/stdio.in.h - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin + ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin make } diff --git a/abs/core/tar/__changelog b/abs/core/tar/__changelog index 4c86946..ad7bc8d 100644 --- a/abs/core/tar/__changelog +++ b/abs/core/tar/__changelog @@ -1 +1,2 @@ -added FORCE_UNSAFE_CONFIGURE=1 to configure line of PKGBUILD + sed -i '/gets is a security hole/d' gnu/stdio.in.h + diff --git a/abs/core/tar/tar.1 b/abs/core/tar/tar.1 index 872c8dc..75bbcd3 100644 --- a/abs/core/tar/tar.1 +++ b/abs/core/tar/tar.1 @@ -1,5 +1,5 @@ -.\" generated by script on Wed Mar 10 17:01:09 2010 -.Dd Mar 10, 2010 +.\" generated by script on Fri Aug 19 16:19:30 2011 +.Dd Aug 19, 2011 .Dt TAR 1 .Sh NAME .Nm tar @@ -110,6 +110,8 @@ use archive file or device ARCHIVE run script at end of each tape (implies -M) .It Fl \-force\-local archive file is local even if it has a colon +.It Fl \-full\-time +print file time to its full resolution .It Fl g , Fl \-listed\-incremental Ar FILE handle new GNU-format incremental backup .It Fl G , Fl \-incremental @@ -283,7 +285,7 @@ unquote filenames read with -T (default) .It Fl \-no\-unquote do not unquote filenames read with -T .It Fl \-utc -print file modification dates in UTC +print file modification times in UTC .It Fl v , Fl \-verbose verbosely list files processed .It Fl V , Fl \-label Ar TEXT @@ -329,6 +331,7 @@ Device or file to use for the archive if .Fl \-file is not specified. If this environment variable is unset, use stdin or stdout instead. +.It Ev TAR_LONGLINK_100 .El .Sh EXAMPLES Create archive.tar from files foo and bar. diff --git a/abs/core/tcl/ChangeLog b/abs/core/tcl/ChangeLog deleted file mode 100644 index 0aeabc7..0000000 --- a/abs/core/tcl/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2008-12-24 Allan McRae <allan@archlinux.org> - * 8.5.6-1 : - new upstream release - -2008-10-16 Allan McRae <allan@archlinux.org> - * 8.5.5-1 : - new upstream release - -2008-08-16 Allan McRae <allan@archlinux.org> - * 8.5.4-1 : - new upstream release - FHS man directory - -2008-07-01 Allan McRae <allan@archlinux.org> - * 8.5.3-1 : - new upstream release. diff --git a/abs/core/tcl/PKGBUILD b/abs/core/tcl/PKGBUILD index acce9e8..73f1461 100644 --- a/abs/core/tcl/PKGBUILD +++ b/abs/core/tcl/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 90377 2010-09-11 03:54:51Z allan $ +# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.9 +pkgver=8.5.11 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') -depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('8512d8db3233041dd68a81476906012a') +md5sums=('b01a9691c83990b3db0ce62d1012ca67') build() { cd ${srcdir}/tcl${pkgver}/unix @@ -25,6 +24,11 @@ build() { make } +#check() { +# cd ${srcdir}/tcl${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tcl${pkgver}/unix diff --git a/abs/core/tcp_wrappers/PKGBUILD b/abs/core/tcp_wrappers/PKGBUILD deleted file mode 100644 index 5612e23..0000000 --- a/abs/core/tcp_wrappers/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd <jvinet@zeroflux.org> -pkgname=tcp_wrappers -pkgver=7.6 -pkgrel=17 -pkgdesc="Monitors and Controls incoming TCP connections" -arch=(i686 x86_64) -url="ftp://ftp.porcupine.org/pub/security/index.html" -license=('custom') -groups=('base') -backup=(etc/hosts.allow etc/hosts.deny) -depends=('bash' 'glibc') -source=(ftp://ftp.porcupine.org/pub/security/${pkgname}_$pkgver.tar.gz \ - hosts.allow hosts.deny try-from.8 safe_finger.8 gcc340.patch \ - shared_lib_plus_plus-1.patch) -md5sums=('e6fa25f71226d090f34de3f6b122fb5a' '32cfeeed797161034f62bb45f3167baa'\ - 'a0ee30f6aeaca241c4d44f7c177eca6b' '4a8f40f9a69f0848df92b232072e8561'\ - '1a6d7b11abb1fd69ace775d02a1c72cf' '19c3badd4fbee547eb9de61ed93691af'\ - 'e39dc7e099b741b6d2b1799a56ab77af') - -build() { - cd $startdir/src/${pkgname}_$pkgver - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np1 -i ../shared_lib_plus_plus-1.patch || return 1 - make REAL_DAEMON_DIR=/usr/sbin STYLE=-DSYS_ERRLIST_DEFINED linux || return 1 - # dumb makefile - mkdir -p $startdir/pkg/usr/{include,lib,sbin} - mkdir -p $startdir/pkg/usr/share/man/man{3,5,8} - make DESTDIR=$startdir/pkg install - install -D -m644 ../hosts.allow $startdir/pkg/etc/hosts.allow - install -D -m644 ../hosts.deny $startdir/pkg/etc/hosts.deny - # install license - mkdir -p $startdir/pkg/usr/share/licenses/$pkgname - install -m644 DISCLAIMER $startdir/pkg/usr/share/licenses/$pkgname/license.txt -} diff --git a/abs/core/tcp_wrappers/gcc340.patch b/abs/core/tcp_wrappers/gcc340.patch deleted file mode 100644 index d0a2750..0000000 --- a/abs/core/tcp_wrappers/gcc340.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur tcp_wrappers_7.6-orig/scaffold.c tcp_wrappers_7.6/scaffold.c ---- tcp_wrappers_7.6-orig/scaffold.c 1997-03-21 10:27:24.000000000 -0800 -+++ tcp_wrappers_7.6/scaffold.c 2004-05-07 19:44:50.000000000 -0700 -@@ -25,7 +25,6 @@ - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ - #endif - --extern char *malloc(); - - /* Application-specific. */ - diff --git a/abs/core/tcp_wrappers/hosts.allow b/abs/core/tcp_wrappers/hosts.allow deleted file mode 100644 index e5c035d..0000000 --- a/abs/core/tcp_wrappers/hosts.allow +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/hosts.allow -# - -# End of file diff --git a/abs/core/tcp_wrappers/hosts.deny b/abs/core/tcp_wrappers/hosts.deny deleted file mode 100644 index efcce18..0000000 --- a/abs/core/tcp_wrappers/hosts.deny +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/hosts.deny -# - -ALL: ALL: DENY - -# End of file diff --git a/abs/core/tcp_wrappers/safe_finger.8 b/abs/core/tcp_wrappers/safe_finger.8 deleted file mode 100644 index 875616b..0000000 --- a/abs/core/tcp_wrappers/safe_finger.8 +++ /dev/null @@ -1,34 +0,0 @@ -.TH SAFE_FINGER 8 "21th June 1997" Linux "Linux Programmer's Manual" -.SH NAME -safe_finger \- finger client wrapper that protects against nasty stuff -from finger servers -.SH SYNOPSIS -.B safe_finger [finger_options] -.SH DESCRIPTION -The -.B safe_finger -command protects against nasty stuff from finger servers. Use this -program for automatic reverse finger probes from the -.B tcp_wrapper -.B (tcpd) -, not the raw finger command. The -.B safe_finger -command makes sure that the finger client is not run with root -privileges. It also runs the finger client with a defined PATH -environment. -.B safe_finger -will also protect you from problems caused by the output of some -finger servers. The problem: some programs may react to stuff in -the first column. Other programs may get upset by thrash anywhere -on a line. File systems may fill up as the finger server keeps -sending data. Text editors may bomb out on extremely long lines. -The finger server may take forever because it is somehow wedged. -.B safe_finger -takes care of all this badness. -.SH SEE ALSO -.BR hosts_access (5), -.BR hosts_options (5), -.BR tcpd (8) -.SH AUTHOR -Wietse Venema, Eindhoven University of Technology, The Netherlands. - diff --git a/abs/core/tcp_wrappers/shared_lib_plus_plus-1.patch b/abs/core/tcp_wrappers/shared_lib_plus_plus-1.patch deleted file mode 100644 index 89b0b0c..0000000 --- a/abs/core/tcp_wrappers/shared_lib_plus_plus-1.patch +++ /dev/null @@ -1,1025 +0,0 @@ -diff -Naur tcp_wrappers_7.6/Makefile tcp_wrappers_7.6.gimli/Makefile ---- tcp_wrappers_7.6/Makefile 1997-03-21 12:27:21.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/Makefile 2002-07-15 16:07:21.000000000 -0500 -@@ -1,5 +1,10 @@ -+GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h) -+ - # @(#) Makefile 1.23 97/03/21 19:27:20 - -+# unset the HOSTNAME environment variable -+HOSTNAME = -+ - what: - @echo - @echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:" -@@ -19,7 +24,7 @@ - @echo " generic (most bsd-ish systems with sys5 compatibility)" - @echo " 386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543" - @echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix" -- @echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211" -+ @echo " linux gnu machten mips(untested) ncrsvr4 netbsd next osf power_unix_211" - @echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4" - @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2" - @echo " uts215 uxp" -@@ -43,8 +48,8 @@ - # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx - #REAL_DAEMON_DIR=/usr/etc - # --# SysV.4 Solaris 2.x OSF AIX --#REAL_DAEMON_DIR=/usr/sbin -+# SysV.4 Solaris 2.x OSF AIX Linux -+REAL_DAEMON_DIR=/usr/sbin - # - # BSD 4.4 - #REAL_DAEMON_DIR=/usr/libexec -@@ -141,10 +146,21 @@ - LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ - EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all - -+ifneq ($(GLIBC),0) -+MYLIB=-lnsl -+endif -+ - linux: - @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ -- LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ -- NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all -+ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ -+ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \ -+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT" -+ -+gnu: -+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ -+ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ -+ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \ -+ EXTRA_CFLAGS="-DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT" - - # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. - hpux hpux8 hpux9 hpux10: -@@ -391,7 +407,7 @@ - # the ones provided with this source distribution. The environ.c module - # implements setenv(), getenv(), and putenv(). - --AUX_OBJ= setenv.o -+#AUX_OBJ= setenv.o - #AUX_OBJ= environ.o - #AUX_OBJ= environ.o strcasecmp.o - -@@ -454,7 +470,8 @@ - # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work - # around this. The workaround does no harm on other Solaris versions. - --BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK -+BUGS = -+#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK - #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG - #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG - -@@ -464,7 +481,7 @@ - # If your system supports NIS or YP-style netgroups, enable the following - # macro definition. Netgroups are used only for host access control. - # --#NETGROUP= -DNETGROUP -+NETGROUP= -DNETGROUP - - ############################################################### - # System dependencies: whether or not your system has vsyslog() -@@ -491,7 +508,7 @@ - # Uncomment the next definition to turn on the language extensions - # (examples: allow, deny, banners, twist and spawn). - # --#STYLE = -DPROCESS_OPTIONS # Enable language extensions. -+STYLE = -DPROCESS_OPTIONS # Enable language extensions. - - ################################################################ - # Optional: Changing the default disposition of logfile records -@@ -514,7 +531,7 @@ - # - # The LOG_XXX names below are taken from the /usr/include/syslog.h file. - --FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use -+FACILITY= LOG_DAEMON # LOG_MAIL is what most sendmail daemons use - - # The syslog priority at which successful connections are logged. - -@@ -610,7 +627,7 @@ - # Paranoid mode implies hostname lookup. In order to disable hostname - # lookups altogether, see the next section. - --PARANOID= -DPARANOID -+#PARANOID= -DPARANOID - - ######################################## - # Optional: turning off hostname lookups -@@ -623,7 +640,7 @@ - # In order to perform selective hostname lookups, disable paranoid - # mode (see previous section) and comment out the following definition. - --HOSTNAME= -DALWAYS_HOSTNAME -+#HOSTNAME= -DALWAYS_HOSTNAME - - ############################################# - # Optional: Turning on host ADDRESS checking -@@ -649,28 +666,46 @@ - # source-routed traffic in the kernel. Examples: 4.4BSD derivatives, - # Solaris 2.x, and Linux. See your system documentation for details. - # --# KILL_OPT= -DKILL_IP_OPTIONS -+KILL_OPT= -DKILL_IP_OPTIONS - - ## End configuration options - ############################ - - # Protection against weird shells or weird make programs. - -+CC = gcc - SHELL = /bin/sh --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c -+ -+SOMAJOR = 0 -+SOMINOR = 7.6 -+ -+LIB = libwrap.a -+SHLIB = shared/libwrap.so.$(SOMAJOR).$(SOMINOR) -+SHLIBSOMAJ= shared/libwrap.so.$(SOMAJOR) -+SHLIBSO = shared/libwrap.so -+SHLIBFLAGS = -Lshared -lwrap - --CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ -+shared/%.o: %.c -+ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@ -+ -+CFLAGS = -O2 -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ - $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ - -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ - -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ - $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ - $(VSYSLOG) $(HOSTNAME) - -+SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS) -+SHCFLAGS = -fPIC -shared -D_REENTRANT -+ - LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ - hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ - $(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \ - update.o misc.o diag.o percent_m.o myvsyslog.o - -+SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ)); -+ - FROM_OBJ= fromhost.o - - KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ -@@ -684,46 +719,80 @@ - refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ - scaffold.h tcpdmatch.8 README.NIS - --LIB = libwrap.a -- --all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk -+all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB) - - # Invalidate all object files when the compiler options (CFLAGS) have changed. - - config-check: - @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } -- @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \ -- if cmp cflags /tmp/cflags.$$$$ ; \ -- then rm /tmp/cflags.$$$$ ; \ -- else mv /tmp/cflags.$$$$ cflags ; \ -+ @set +e; echo $(CFLAGS) >cflags.new ; \ -+ if cmp cflags cflags.new ; \ -+ then rm cflags.new ; \ -+ else mv cflags.new cflags ; \ - fi >/dev/null 2>/dev/null -+ @if [ ! -d shared ]; then mkdir shared; fi - - $(LIB): $(LIB_OBJ) - rm -f $(LIB) - $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) - -$(RANLIB) $(LIB) - --tcpd: tcpd.o $(LIB) -- $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) -+$(SHLIB): $(SHLIB_OBJ) -+ rm -f $(SHLIB) -+ $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) -+ ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ) -+ ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) -+ -+tcpd: tcpd.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) - --miscd: miscd.o $(LIB) -- $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) -+miscd: miscd.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS) - --safe_finger: safe_finger.o $(LIB) -- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) -+safe_finger: safe_finger.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS) - - TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o - --tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) -- $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) -+tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) - --try-from: try-from.o fakelog.o $(LIB) -- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) -+try-from: try-from.o fakelog.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS) - - TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o - --tcpdchk: $(TCPDCHK_OBJ) $(LIB) -- $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) -+tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS) -+ -+install: install-lib install-bin install-dev -+ -+install-lib: -+ install -o root -g root -m 0755 $(SHLIB) ${DESTDIR}/usr/lib/ -+ ln -sf $(notdir $(SHLIB)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSOMAJ)) -+ ln -sf $(notdir $(SHLIBSOMAJ)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSO)) -+ -+install-bin: -+ install -o root -g root -m 0755 tcpd ${DESTDIR}/usr/sbin/ -+ install -o root -g root -m 0755 tcpdchk ${DESTDIR}/usr/sbin/ -+ install -o root -g root -m 0755 tcpdmatch ${DESTDIR}/usr/sbin/ -+ install -o root -g root -m 0755 try-from ${DESTDIR}/usr/sbin/ -+ install -o root -g root -m 0755 safe_finger ${DESTDIR}/usr/sbin/ -+ install -o root -g root -m 0644 tcpd.8 ${DESTDIR}/usr/share/man/man8/ -+ install -o root -g root -m 0644 tcpdchk.8 ${DESTDIR}/usr/share/man/man8/ -+ install -o root -g root -m 0644 try-from.8 ${DESTDIR}/usr/share/man/man8/ -+ install -o root -g root -m 0644 tcpdmatch.8 ${DESTDIR}/usr/share/man/man8/ -+ install -o root -g root -m 0644 safe_finger.8 ${DESTDIR}/usr/share/man/man8/ -+ install -o root -g root -m 0644 hosts_access.5 ${DESTDIR}/usr/share/man/man5/ -+ install -o root -g root -m 0644 hosts_options.5 ${DESTDIR}/usr/share/man/man5/ -+ -+install-dev: -+ install -o root -g root -m 0644 hosts_access.3 ${DESTDIR}/usr/share/man/man3/ -+ install -o root -g root -m 0644 tcpd.h ${DESTDIR}/usr/include/ -+ install -o root -g root -m 0644 $(LIB) ${DESTDIR}/usr/lib/ -+ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/hosts_ctl.3 -+ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_init.3 -+ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_set.3 - - shar: $(KIT) - @shar $(KIT) -@@ -739,7 +808,8 @@ - - clean: - rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ -- cflags -+ cflags libwrap*.so* -+ rm -rf shared - - tidy: clean - chmod -R a+r . -@@ -885,5 +955,6 @@ - update.o: mystdarg.h - update.o: tcpd.h - vfprintf.o: cflags -+weak_symbols.o: tcpd.h - workarounds.o: cflags - workarounds.o: tcpd.h -diff -Naur tcp_wrappers_7.6/fix_options.c tcp_wrappers_7.6.gimli/fix_options.c ---- tcp_wrappers_7.6/fix_options.c 1997-04-07 19:29:19.000000000 -0500 -+++ tcp_wrappers_7.6.gimli/fix_options.c 2002-01-07 08:50:19.000000000 -0600 -@@ -35,7 +35,12 @@ - #ifdef IP_OPTIONS - unsigned char optbuf[BUFFER_SIZE / 3], *cp; - char lbuf[BUFFER_SIZE], *lp; -+#if !defined(__GLIBC__) - int optsize = sizeof(optbuf), ipproto; -+#else /* __GLIBC__ */ -+ size_t optsize = sizeof(optbuf); -+ int ipproto; -+#endif /* __GLIBC__ */ - struct protoent *ip; - int fd = request->fd; - unsigned int opt; -diff -Naur tcp_wrappers_7.6/hosts_access.3 tcp_wrappers_7.6.gimli/hosts_access.3 ---- tcp_wrappers_7.6/hosts_access.3 1996-02-11 10:01:27.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/hosts_access.3 2002-01-07 08:50:19.000000000 -0600 -@@ -3,7 +3,7 @@ - hosts_access, hosts_ctl, request_init, request_set \- access control library - .SH SYNOPSIS - .nf --#include "tcpd.h" -+#include <tcpd.h> - - extern int allow_severity; - extern int deny_severity; -diff -Naur tcp_wrappers_7.6/hosts_access.5 tcp_wrappers_7.6.gimli/hosts_access.5 ---- tcp_wrappers_7.6/hosts_access.5 1995-01-30 12:51:47.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/hosts_access.5 2002-01-07 08:50:19.000000000 -0600 -@@ -8,9 +8,9 @@ - impatient reader is encouraged to skip to the EXAMPLES section for a - quick introduction. - .PP --An extended version of the access control language is described in the --\fIhosts_options\fR(5) document. The extensions are turned on at --program build time by building with -DPROCESS_OPTIONS. -+The extended version of the access control language is described in the -+\fIhosts_options\fR(5) document. \fBNote that this language supersedes -+the meaning of \fIshell_command\fB as documented below.\fR - .PP - In the following text, \fIdaemon\fR is the the process name of a - network daemon process, and \fIclient\fR is the name and/or address of -@@ -40,7 +40,7 @@ - character. This permits you to break up long lines so that they are - easier to edit. - .IP \(bu --Blank lines or lines that begin with a `#\' character are ignored. -+Blank lines or lines that begin with a `#' character are ignored. - This permits you to insert comments and whitespace so that the tables - are easier to read. - .IP \(bu -@@ -69,26 +69,33 @@ - .SH PATTERNS - The access control language implements the following patterns: - .IP \(bu --A string that begins with a `.\' character. A host name is matched if -+A string that begins with a `.' character. A host name is matched if - the last components of its name match the specified pattern. For --example, the pattern `.tue.nl\' matches the host name --`wzv.win.tue.nl\'. -+example, the pattern `.tue.nl' matches the host name -+`wzv.win.tue.nl'. - .IP \(bu --A string that ends with a `.\' character. A host address is matched if -+A string that ends with a `.' character. A host address is matched if - its first numeric fields match the given string. For example, the --pattern `131.155.\' matches the address of (almost) every host on the -+pattern `131.155.' matches the address of (almost) every host on the - Eind\%hoven University network (131.155.x.x). - .IP \(bu --A string that begins with an `@\' character is treated as an NIS -+A string that begins with an `@' character is treated as an NIS - (formerly YP) netgroup name. A host name is matched if it is a host - member of the specified netgroup. Netgroup matches are not supported - for daemon process names or for client user names. - .IP \(bu --An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a --`net/mask\' pair. A host address is matched if `net\' is equal to the --bitwise AND of the address and the `mask\'. For example, the net/mask --pattern `131.155.72.0/255.255.254.0\' matches every address in the --range `131.155.72.0\' through `131.155.73.255\'. -+An expression of the form `n.n.n.n/m.m.m.m' is interpreted as a -+`net/mask' pair. A host address is matched if `net' is equal to the -+bitwise AND of the address and the `mask'. For example, the net/mask -+pattern `131.155.72.0/255.255.254.0' matches every address in the -+range `131.155.72.0' through `131.155.73.255'. -+.IP \(bu -+A string that begins with a `/' character is treated as a file -+name. A host name or address is matched if it matches any host name -+or address pattern listed in the named file. The file format is -+zero or more lines with zero or more host name or address patterns -+separated by whitespace. A file name pattern can be used anywhere -+a host name or address pattern can be used. - .SH WILDCARDS - The access control language supports explicit wildcards: - .IP ALL -@@ -115,19 +122,19 @@ - .ne 6 - .SH OPERATORS - .IP EXCEPT --Intended use is of the form: `list_1 EXCEPT list_2\'; this construct -+Intended use is of the form: `list_1 EXCEPT list_2'; this construct - matches anything that matches \fIlist_1\fR unless it matches - \fIlist_2\fR. The EXCEPT operator can be used in daemon_lists and in - client_lists. The EXCEPT operator can be nested: if the control --language would permit the use of parentheses, `a EXCEPT b EXCEPT c\' --would parse as `(a EXCEPT (b EXCEPT c))\'. -+language would permit the use of parentheses, `a EXCEPT b EXCEPT c' -+would parse as `(a EXCEPT (b EXCEPT c))'. - .br - .ne 6 - .SH SHELL COMMANDS - If the first-matched access control rule contains a shell command, that - command is subjected to %<letter> substitutions (see next section). - The result is executed by a \fI/bin/sh\fR child process with standard --input, output and error connected to \fI/dev/null\fR. Specify an `&\' -+input, output and error connected to \fI/dev/null\fR. Specify an `&' - at the end of the command if you do not want to wait until it has - completed. - .PP -@@ -159,7 +166,7 @@ - .IP %u - The client user name (or "unknown"). - .IP %% --Expands to a single `%\' character. -+Expands to a single `%' character. - .PP - Characters in % expansions that may confuse the shell are replaced by - underscores. -@@ -243,9 +250,9 @@ - less trustworthy. It is possible for an intruder to spoof both the - client connection and the IDENT lookup, although doing so is much - harder than spoofing just a client connection. It may also be that --the client\'s IDENT server is lying. -+the client's IDENT server is lying. - .PP --Note: IDENT lookups don\'t work with UDP services. -+Note: IDENT lookups don't work with UDP services. - .SH EXAMPLES - The language is flexible enough that different types of access control - policy can be expressed with a minimum of fuss. Although the language -@@ -285,7 +292,7 @@ - .br - ALL: .foobar.edu EXCEPT terminalserver.foobar.edu - .PP --The first rule permits access from hosts in the local domain (no `.\' -+The first rule permits access from hosts in the local domain (no `.' - in the host name) and from members of the \fIsome_netgroup\fP - netgroup. The second rule permits access from all hosts in the - \fIfoobar.edu\fP domain (notice the leading dot), with the exception of -@@ -322,8 +329,8 @@ - /etc/hosts.deny: - .in +3 - .nf --in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ -- /usr/ucb/mail -s %d-%h root) & -+in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\ -+ /usr/bin/mail -s %d-%h root) & - .fi - .PP - The safe_finger command comes with the tcpd wrapper and should be -@@ -349,7 +356,7 @@ - capacity of an internal buffer; when an access control rule is not - terminated by a newline character; when the result of %<letter> - expansion would overflow an internal buffer; when a system call fails --that shouldn\'t. All problems are reported via the syslog daemon. -+that shouldn't. All problems are reported via the syslog daemon. - .SH FILES - .na - .nf -diff -Naur tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.gimli/hosts_access.c ---- tcp_wrappers_7.6/hosts_access.c 1997-02-11 19:13:23.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/hosts_access.c 2002-01-07 08:50:19.000000000 -0600 -@@ -240,6 +240,26 @@ - } - } - -+/* hostfile_match - look up host patterns from file */ -+ -+static int hostfile_match(path, host) -+char *path; -+struct hosts_info *host; -+{ -+ char tok[BUFSIZ]; -+ int match = NO; -+ FILE *fp; -+ -+ if ((fp = fopen(path, "r")) != 0) { -+ while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host))) -+ /* void */ ; -+ fclose(fp); -+ } else if (errno != ENOENT) { -+ tcpd_warn("open %s: %m", path); -+ } -+ return (match); -+} -+ - /* host_match - match host name and/or address against pattern */ - - static int host_match(tok, host) -@@ -267,6 +287,8 @@ - tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */ - return (NO); - #endif -+ } else if (tok[0] == '/') { /* /file hack */ -+ return (hostfile_match(tok, host)); - } else if (STR_EQ(tok, "KNOWN")) { /* check address and name */ - char *name = eval_hostname(host); - return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name)); -diff -Naur tcp_wrappers_7.6/hosts_options.5 tcp_wrappers_7.6.gimli/hosts_options.5 ---- tcp_wrappers_7.6/hosts_options.5 1994-12-28 10:42:29.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/hosts_options.5 2002-01-07 08:50:19.000000000 -0600 -@@ -58,12 +58,12 @@ - Execute, in a child process, the specified shell command, after - performing the %<letter> expansions described in the hosts_access(5) - manual page. The command is executed with stdin, stdout and stderr --connected to the null device, so that it won\'t mess up the -+connected to the null device, so that it won't mess up the - conversation with the client host. Example: - .sp - .nf - .ti +3 --spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) & -+spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) & - .fi - .sp - executes, in a background child process, the shell command "safe_finger -diff -Naur tcp_wrappers_7.6/options.c tcp_wrappers_7.6.gimli/options.c ---- tcp_wrappers_7.6/options.c 1996-02-11 10:01:32.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/options.c 2002-01-07 08:50:19.000000000 -0600 -@@ -473,6 +473,9 @@ - #ifdef LOG_CRON - "cron", LOG_CRON, - #endif -+#ifdef LOG_FTP -+ "ftp", LOG_FTP, -+#endif - #ifdef LOG_LOCAL0 - "local0", LOG_LOCAL0, - #endif -diff -Naur tcp_wrappers_7.6/percent_m.c tcp_wrappers_7.6.gimli/percent_m.c ---- tcp_wrappers_7.6/percent_m.c 1994-12-28 10:42:37.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/percent_m.c 2002-01-07 08:50:19.000000000 -0600 -@@ -13,7 +13,7 @@ - #include <string.h> - - extern int errno; --#ifndef SYS_ERRLIST_DEFINED -+#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR) - extern char *sys_errlist[]; - extern int sys_nerr; - #endif -@@ -29,11 +29,15 @@ - - while (*bp = *cp) - if (*cp == '%' && cp[1] == 'm') { -+#ifdef HAVE_STRERROR -+ strcpy(bp, strerror(errno)); -+#else - if (errno < sys_nerr && errno > 0) { - strcpy(bp, sys_errlist[errno]); - } else { - sprintf(bp, "Unknown error %d", errno); - } -+#endif - bp += strlen(bp); - cp += 2; - } else { -diff -Naur tcp_wrappers_7.6/rfc931.c tcp_wrappers_7.6.gimli/rfc931.c ---- tcp_wrappers_7.6/rfc931.c 1995-01-02 09:11:34.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/rfc931.c 2002-01-07 08:50:19.000000000 -0600 -@@ -33,7 +33,7 @@ - - int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */ - --static jmp_buf timebuf; -+static sigjmp_buf timebuf; - - /* fsocket - open stdio stream on top of socket */ - -@@ -62,7 +62,7 @@ - static void timeout(sig) - int sig; - { -- longjmp(timebuf, sig); -+ siglongjmp(timebuf, sig); - } - - /* rfc931 - return remote user name, given socket structures */ -@@ -99,7 +99,7 @@ - * Set up a timer so we won't get stuck while waiting for the server. - */ - -- if (setjmp(timebuf) == 0) { -+ if (sigsetjmp(timebuf,1) == 0) { - signal(SIGALRM, timeout); - alarm(rfc931_timeout); - -diff -Naur tcp_wrappers_7.6/safe_finger.8 tcp_wrappers_7.6.gimli/safe_finger.8 ---- tcp_wrappers_7.6/safe_finger.8 1969-12-31 18:00:00.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/safe_finger.8 2002-01-07 08:50:19.000000000 -0600 -@@ -0,0 +1,34 @@ -+.TH SAFE_FINGER 8 "21th June 1997" Linux "Linux Programmer's Manual" -+.SH NAME -+safe_finger \- finger client wrapper that protects against nasty stuff -+from finger servers -+.SH SYNOPSIS -+.B safe_finger [finger_options] -+.SH DESCRIPTION -+The -+.B safe_finger -+command protects against nasty stuff from finger servers. Use this -+program for automatic reverse finger probes from the -+.B tcp_wrapper -+.B (tcpd) -+, not the raw finger command. The -+.B safe_finger -+command makes sure that the finger client is not run with root -+privileges. It also runs the finger client with a defined PATH -+environment. -+.B safe_finger -+will also protect you from problems caused by the output of some -+finger servers. The problem: some programs may react to stuff in -+the first column. Other programs may get upset by thrash anywhere -+on a line. File systems may fill up as the finger server keeps -+sending data. Text editors may bomb out on extremely long lines. -+The finger server may take forever because it is somehow wedged. -+.B safe_finger -+takes care of all this badness. -+.SH SEE ALSO -+.BR hosts_access (5), -+.BR hosts_options (5), -+.BR tcpd (8) -+.SH AUTHOR -+Wietse Venema, Eindhoven University of Technology, The Netherlands. -+ -diff -Naur tcp_wrappers_7.6/safe_finger.c tcp_wrappers_7.6.gimli/safe_finger.c ---- tcp_wrappers_7.6/safe_finger.c 1994-12-28 10:42:42.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/safe_finger.c 2002-01-07 08:50:19.000000000 -0600 -@@ -26,21 +26,24 @@ - #include <stdio.h> - #include <ctype.h> - #include <pwd.h> -+#include <syslog.h> - - extern void exit(); - - /* Local stuff */ - --char path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin"; -+char path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin"; - - #define TIME_LIMIT 60 /* Do not keep listinging forever */ - #define INPUT_LENGTH 100000 /* Do not keep listinging forever */ - #define LINE_LENGTH 128 /* Editors can choke on long lines */ - #define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */ - #define UNPRIV_NAME "nobody" /* Preferred privilege level */ --#define UNPRIV_UGID 32767 /* Default uid and gid */ -+#define UNPRIV_UGID 65534 /* Default uid and gid */ - - int finger_pid; -+int allow_severity = SEVERITY; -+int deny_severity = LOG_WARNING; - - void cleanup(sig) - int sig; -diff -Naur tcp_wrappers_7.6/scaffold.c tcp_wrappers_7.6.gimli/scaffold.c ---- tcp_wrappers_7.6/scaffold.c 1997-03-21 12:27:24.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/scaffold.c 2002-01-07 08:50:19.000000000 -0600 -@@ -180,10 +180,12 @@ - - /* ARGSUSED */ - --void rfc931(request) --struct request_info *request; -+void rfc931(rmt_sin, our_sin, dest) -+struct sockaddr_in *rmt_sin; -+struct sockaddr_in *our_sin; -+char *dest; - { -- strcpy(request->user, unknown); -+ strcpy(dest, unknown); - } - - /* check_path - examine accessibility */ -diff -Naur tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.gimli/socket.c ---- tcp_wrappers_7.6/socket.c 1997-03-21 12:27:25.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/socket.c 2002-01-07 08:50:19.000000000 -0600 -@@ -76,7 +76,11 @@ - { - static struct sockaddr_in client; - static struct sockaddr_in server; -+#if !defined (__GLIBC__) - int len; -+#else /* __GLIBC__ */ -+ size_t len; -+#endif /* __GLIBC__ */ - char buf[BUFSIZ]; - int fd = request->fd; - -@@ -224,7 +228,11 @@ - { - char buf[BUFSIZ]; - struct sockaddr_in sin; -+#if !defined(__GLIBC__) - int size = sizeof(sin); -+#else /* __GLIBC__ */ -+ size_t size = sizeof(sin); -+#endif /* __GLIBC__ */ - - /* - * Eat up the not-yet received datagram. Some systems insist on a -diff -Naur tcp_wrappers_7.6/tcpd.8 tcp_wrappers_7.6.gimli/tcpd.8 ---- tcp_wrappers_7.6/tcpd.8 1996-02-21 09:39:16.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/tcpd.8 2002-01-07 08:50:19.000000000 -0600 -@@ -94,7 +94,7 @@ - .PP - The example assumes that the network daemons live in /usr/etc. On some - systems, network daemons live in /usr/sbin or in /usr/libexec, or have --no `in.\' prefix to their name. -+no `in.' prefix to their name. - .SH EXAMPLE 2 - This example applies when \fItcpd\fR expects that the network daemons - are left in their original place. -@@ -110,26 +110,26 @@ - becomes: - .sp - .ti +5 --finger stream tcp nowait nobody /some/where/tcpd in.fingerd -+finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd - .sp - .fi - .PP - The example assumes that the network daemons live in /usr/etc. On some - systems, network daemons live in /usr/sbin or in /usr/libexec, the --daemons have no `in.\' prefix to their name, or there is no userid -+daemons have no `in.' prefix to their name, or there is no userid - field in the inetd configuration file. - .PP - Similar changes will be needed for the other services that are to be --covered by \fItcpd\fR. Send a `kill -HUP\' to the \fIinetd\fR(8) -+covered by \fItcpd\fR. Send a `kill -HUP' to the \fIinetd\fR(8) - process to make the changes effective. AIX users may also have to --execute the `inetimp\' command. -+execute the `inetimp' command. - .SH EXAMPLE 3 - In the case of daemons that do not live in a common directory ("secret" - or otherwise), edit the \fIinetd\fR configuration file so that it - specifies an absolute path name for the process name field. For example: - .nf - .sp -- ntalk dgram udp wait root /some/where/tcpd /usr/local/lib/ntalkd -+ ntalk dgram udp wait root /usr/sbin/tcpd /usr/sbin/in.ntalkd - .sp - .fi - .PP -diff -Naur tcp_wrappers_7.6/tcpd.h tcp_wrappers_7.6.gimli/tcpd.h ---- tcp_wrappers_7.6/tcpd.h 1996-03-19 09:22:25.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/tcpd.h 2002-01-07 08:50:19.000000000 -0600 -@@ -4,6 +4,25 @@ - * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. - */ - -+#ifndef _TCPWRAPPERS_TCPD_H -+#define _TCPWRAPPERS_TCPD_H -+ -+/* someone else may have defined this */ -+#undef __P -+ -+/* use prototypes if we have an ANSI C compiler or are using C++ */ -+#if defined(__STDC__) || defined(__cplusplus) -+#define __P(args) args -+#else -+#define __P(args) () -+#endif -+ -+/* Need definitions of struct sockaddr_in and FILE. */ -+#include <netinet/in.h> -+#include <stdio.h> -+ -+__BEGIN_DECLS -+ - /* Structure to describe one communications endpoint. */ - - #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -25,10 +44,10 @@ - char pid[10]; /* access via eval_pid(request) */ - struct host_info client[1]; /* client endpoint info */ - struct host_info server[1]; /* server endpoint info */ -- void (*sink) (); /* datagram sink function or 0 */ -- void (*hostname) (); /* address to printable hostname */ -- void (*hostaddr) (); /* address to printable address */ -- void (*cleanup) (); /* cleanup function or 0 */ -+ void (*sink) __P((int)); /* datagram sink function or 0 */ -+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ -+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ -+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ - struct netconfig *config; /* netdir handle */ - }; - -@@ -61,25 +80,30 @@ - /* Global functions. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void fromhost(); /* get/validate client host info */ -+extern void fromhost __P((struct request_info *)); /* get/validate client host info */ - #else - #define fromhost sock_host /* no TLI support needed */ - #endif - --extern int hosts_access(); /* access control */ --extern void shell_cmd(); /* execute shell command */ --extern char *percent_x(); /* do %<char> expansion */ --extern void rfc931(); /* client name from RFC 931 daemon */ --extern void clean_exit(); /* clean up and exit */ --extern void refuse(); /* clean up and exit */ --extern char *xgets(); /* fgets() on steroids */ --extern char *split_at(); /* strchr() and split */ --extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ -+extern void shell_cmd __P((char *)); /* execute shell command */ -+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ -+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ -+extern void clean_exit __P((struct request_info *)); /* clean up and exit */ -+extern void refuse __P((struct request_info *)); /* clean up and exit */ -+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ -+extern char *split_at __P((char *, int)); /* strchr() and split */ -+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ - - /* Global variables. */ - -+#ifdef HAVE_WEAKSYMS -+extern int allow_severity __attribute__ ((weak)); /* for connection logging */ -+extern int deny_severity __attribute__ ((weak)); /* for connection logging */ -+#else - extern int allow_severity; /* for connection logging */ - extern int deny_severity; /* for connection logging */ -+#endif -+ - extern char *hosts_allow_table; /* for verification mode redirection */ - extern char *hosts_deny_table; /* for verification mode redirection */ - extern int hosts_access_verbose; /* for verbose matching mode */ -@@ -92,9 +116,14 @@ - */ - - #ifdef __STDC__ -+extern int hosts_access(struct request_info *request); -+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, -+ char *client_user); - extern struct request_info *request_init(struct request_info *,...); - extern struct request_info *request_set(struct request_info *,...); - #else -+extern int hosts_access(); -+extern int hosts_ctl(); - extern struct request_info *request_init(); /* initialize request */ - extern struct request_info *request_set(); /* update request structure */ - #endif -@@ -117,27 +146,31 @@ - * host_info structures serve as caches for the lookup results. - */ - --extern char *eval_user(); /* client user */ --extern char *eval_hostname(); /* printable hostname */ --extern char *eval_hostaddr(); /* printable host address */ --extern char *eval_hostinfo(); /* host name or address */ --extern char *eval_client(); /* whatever is available */ --extern char *eval_server(); /* whatever is available */ -+extern char *eval_user __P((struct request_info *)); /* client user */ -+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ -+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ -+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ -+extern char *eval_client __P((struct request_info *)); /* whatever is available */ -+extern char *eval_server __P((struct request_info *)); /* whatever is available */ - #define eval_daemon(r) ((r)->daemon) /* daemon process name */ - #define eval_pid(r) ((r)->pid) /* process id */ - - /* Socket-specific methods, including DNS hostname lookups. */ - --extern void sock_host(); /* look up endpoint addresses */ --extern void sock_hostname(); /* translate address to hostname */ --extern void sock_hostaddr(); /* address to printable address */ -+/* look up endpoint addresses */ -+extern void sock_host __P((struct request_info *)); -+/* translate address to hostname */ -+extern void sock_hostname __P((struct host_info *)); -+/* address to printable address */ -+extern void sock_hostaddr __P((struct host_info *)); -+ - #define sock_methods(r) \ - { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } - - /* The System V Transport-Level Interface (TLI) interface. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void tli_host(); /* look up endpoint addresses etc. */ -+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ - #endif - - /* -@@ -178,7 +211,7 @@ - * behavior. - */ - --extern void process_options(); /* execute options */ -+extern void process_options __P((char *, struct request_info *)); /* execute options */ - extern int dry_run; /* verification flag */ - - /* Bug workarounds. */ -@@ -217,3 +250,7 @@ - #define strtok my_strtok - extern char *my_strtok(); - #endif -+ -+__END_DECLS -+ -+#endif /* tcpd.h */ -diff -Naur tcp_wrappers_7.6/tcpdchk.c tcp_wrappers_7.6.gimli/tcpdchk.c ---- tcp_wrappers_7.6/tcpdchk.c 1997-02-11 19:13:25.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/tcpdchk.c 2002-01-07 08:50:19.000000000 -0600 -@@ -350,6 +350,8 @@ - { - if (pat[0] == '@') { - tcpd_warn("%s: daemon name begins with \"@\"", pat); -+ } else if (pat[0] == '/') { -+ tcpd_warn("%s: daemon name begins with \"/\"", pat); - } else if (pat[0] == '.') { - tcpd_warn("%s: daemon name begins with dot", pat); - } else if (pat[strlen(pat) - 1] == '.') { -@@ -382,6 +384,8 @@ - { - if (pat[0] == '@') { /* @netgroup */ - tcpd_warn("%s: user name begins with \"@\"", pat); -+ } else if (pat[0] == '/') { -+ tcpd_warn("%s: user name begins with \"/\"", pat); - } else if (pat[0] == '.') { - tcpd_warn("%s: user name begins with dot", pat); - } else if (pat[strlen(pat) - 1] == '.') { -@@ -402,8 +406,13 @@ - static int check_host(pat) - char *pat; - { -+ char buf[BUFSIZ]; - char *mask; - int addr_count = 1; -+ FILE *fp; -+ struct tcpd_context saved_context; -+ char *cp; -+ char *wsp = " \t\r\n"; - - if (pat[0] == '@') { /* @netgroup */ - #ifdef NO_NETGRENT -@@ -422,6 +431,21 @@ - tcpd_warn("netgroup support disabled"); - #endif - #endif -+ } else if (pat[0] == '/') { /* /path/name */ -+ if ((fp = fopen(pat, "r")) != 0) { -+ saved_context = tcpd_context; -+ tcpd_context.file = pat; -+ tcpd_context.line = 0; -+ while (fgets(buf, sizeof(buf), fp)) { -+ tcpd_context.line++; -+ for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp)) -+ check_host(cp); -+ } -+ tcpd_context = saved_context; -+ fclose(fp); -+ } else if (errno != ENOENT) { -+ tcpd_warn("open %s: %m", pat); -+ } - } else if (mask = split_at(pat, '/')) { /* network/netmask */ - if (dot_quad_addr(pat) == INADDR_NONE - || dot_quad_addr(mask) == INADDR_NONE) -diff -Naur tcp_wrappers_7.6/try-from.8 tcp_wrappers_7.6.gimli/try-from.8 ---- tcp_wrappers_7.6/try-from.8 1969-12-31 18:00:00.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/try-from.8 2002-01-07 08:50:19.000000000 -0600 -@@ -0,0 +1,28 @@ -+.TH TRY-FROM 8 "21th June 1997" Linux "Linux Programmer's Manual" -+.SH NAME -+try-from \- test program for the tcp_wrapper -+.SH SYNOPSIS -+.B try-from -+.SH DESCRIPTION -+The -+.B try-from -+command can be called via a remote shell command to find out -+if the hostname and address are properly recognized -+by the -+.B tcp_wrapper -+library, if username lookup works, and (SysV only) if the TLI -+on top of IP heuristics work. Diagnostics are reported through -+.BR syslog (3) -+and redirected to stderr. -+ -+Example: -+ -+rsh host /some/where/try-from -+ -+.SH SEE ALSO -+.BR hosts_access (5), -+.BR hosts_options (5), -+.BR tcpd (8) -+.SH AUTHOR -+Wietse Venema, Eindhoven University of Technology, The Netherlands. -+ -diff -Naur tcp_wrappers_7.6/weak_symbols.c tcp_wrappers_7.6.gimli/weak_symbols.c ---- tcp_wrappers_7.6/weak_symbols.c 1969-12-31 18:00:00.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/weak_symbols.c 2002-01-07 08:50:19.000000000 -0600 -@@ -0,0 +1,11 @@ -+ /* -+ * @(#) weak_symbols.h 1.5 99/12/29 23:50 -+ * -+ * Author: Anthony Towns <ajt@debian.org> -+ */ -+ -+#ifdef HAVE_WEAKSYMS -+#include <syslog.h> -+int deny_severity = LOG_WARNING; -+int allow_severity = SEVERITY; -+#endif -diff -Naur tcp_wrappers_7.6/workarounds.c tcp_wrappers_7.6.gimli/workarounds.c ---- tcp_wrappers_7.6/workarounds.c 1996-03-19 09:22:26.000000000 -0600 -+++ tcp_wrappers_7.6.gimli/workarounds.c 2002-01-07 08:50:19.000000000 -0600 -@@ -163,7 +163,11 @@ - int fix_getpeername(sock, sa, len) - int sock; - struct sockaddr *sa; -+#if !defined(__GLIBC__) - int *len; -+#else /* __GLIBC__ */ -+size_t *len; -+#endif /* __GLIBC__ */ - { - int ret; - struct sockaddr_in *sin = (struct sockaddr_in *) sa; diff --git a/abs/core/tcp_wrappers/try-from.8 b/abs/core/tcp_wrappers/try-from.8 deleted file mode 100644 index 9c8f305..0000000 --- a/abs/core/tcp_wrappers/try-from.8 +++ /dev/null @@ -1,28 +0,0 @@ -.TH TRY-FROM 8 "21th June 1997" Linux "Linux Programmer's Manual" -.SH NAME -try-from \- test program for the tcp_wrapper -.SH SYNOPSIS -.B try-from -.SH DESCRIPTION -The -.B try-from -command can be called via a remote shell command to find out -if the hostname and address are properly recognized -by the -.B tcp_wrapper -library, if username lookup works, and (SysV only) if the TLI -on top of IP heuristics work. Diagnostics are reported through -.BR syslog (3) -and redirected to stderr. - -Example: - -rsh host /some/where/try-from - -.SH SEE ALSO -.BR hosts_access (5), -.BR hosts_options (5), -.BR tcpd (8) -.SH AUTHOR -Wietse Venema, Eindhoven University of Technology, The Netherlands. - diff --git a/abs/core/texinfo/ChangeLog b/abs/core/texinfo/ChangeLog deleted file mode 100644 index 46091e7..0000000 --- a/abs/core/texinfo/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -2008-09-26 Eric Belanger <eric@archlinux.org> - - * texinfo 4.13a-1 - * Upstream update - * Moved to base group - * Added install scriptlet to handle info pages - -2008-04-28 Eric Belanger <eric@archlinux.org> - - * texinfo 4.12-2 - * Added to base-devel group - -2008-04-21 Eric Belanger <eric@archlinux.org> - - * texinfo 4.12-1 - * Upstream update - * Updated license diff --git a/abs/core/texinfo/PKGBUILD b/abs/core/texinfo/PKGBUILD index 69aa173..22ef3c6 100644 --- a/abs/core/texinfo/PKGBUILD +++ b/abs/core/texinfo/PKGBUILD @@ -1,26 +1,34 @@ -# $Id: PKGBUILD 13367 2008-09-27 01:52:08Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=1 +pkgrel=7 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64') url="http://www.gnu.org/software/texinfo/" license=('GPL3') groups=('base') -depends=('ncurses') +depends=('ncurses' 'findutils' 'gzip') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('71ba711519209b5fb583fed2b3d86fcb') -sha1sums=('a1533cf8e03ea4fa6c443b73f4c85e4da04dead0') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + texinfo-4.13a-data_types.patch) +md5sums=('71ba711519209b5fb583fed2b3d86fcb' + 'db2ca82c831684cd7cef181234017c46' + 'd8574782ff7def1e2dc5c291dbeaec18') build() { - cd ${srcdir}/${pkgname}-4.13 - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/usr/share/info/dir - gzip ${pkgdir}/usr/share/info/* + cd ${srcdir}/${pkgname}-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-4.13 + make DESTDIR=${pkgdir} install + + # fix this here as it prevents make from trying to rebuild manual pages + sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi } diff --git a/abs/core/texinfo/texinfo-4.13a-data_types.patch b/abs/core/texinfo/texinfo-4.13a-data_types.patch new file mode 100644 index 0000000..2a87c21 --- /dev/null +++ b/abs/core/texinfo/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/abs/core/texinfo/texinfo.install b/abs/core/texinfo/texinfo.install index 87c7ac4..f1554e4 100644 --- a/abs/core/texinfo/texinfo.install +++ b/abs/core/texinfo/texinfo.install @@ -1,18 +1,21 @@ -infodir=/usr/share/info -filelist=(info.info.gz info-stnd.info.gz texinfo.gz texinfo-1.gz texinfo-2.gz texinfo-3.gz) +infodir=usr/share/info +filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3) post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + # Scan *all* info files on install + for file in $(find $infodir -type f ! -name dir); do + install-info $file $infodir/dir 2> /dev/null done } post_upgrade() { - post_install $1 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } pre_remove() { for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } diff --git a/abs/core/tilda/PKGBUILD b/abs/core/tilda/PKGBUILD index f8422bc..19ba559 100644 --- a/abs/core/tilda/PKGBUILD +++ b/abs/core/tilda/PKGBUILD @@ -1,26 +1,42 @@ -# Maintainer: William Rea <sillywilly@gmail.com> +# $Id: PKGBUILD 71879 2012-06-02 18:37:37Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + pkgname=tilda pkgver=0.9.6 -pkgrel=2 -pkgdesc="Linux terminal based on classic terminals from first person shooter games." +pkgrel=6 +pkgdesc="Linux terminal based on classic terminals from first person shooter games" +arch=('i686' 'x86_64') url="http://tilda.sourceforge.net" -license="GPL" -depends=('vte' 'confuse' 'libglade' 'gtk2') +license=('GPL') +depends=('vte' 'confuse' 'libglade') makedepends=('gawk') -source=('tilda-0.9.6.tar.gz' 'config_0') -arch=('i686') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + tilda-fix.patch tilda-glib2.patch tilda-conf-sigsegv.patch) +sha256sums=('b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411' + 'ceac38bb33a0e8141f7b6cbc55807c999729319f2fdfaa3c375aa1a541d29729' + 'c71cdd8cdc1fdd76c919605c6b7a1b89e4929d20630db17145e6c2b584c8aaf9' + 'e28c731c0ca94210d5e4f4b7dd0eee9952405593f1d06e4ab2d87ee299e3e533') + build() { + cd $srcdir/$pkgname-$pkgver + +# gdk && desktop file fix FS#25762 + patch -p0 -i ${srcdir}/$pkgname-fix.patch + +# glib2 fix + patch -p0 -i ${srcdir}/$pkgname-glib2.patch + +# fix segfaults on malformed config files FS#29754 + patch -p0 -i ${srcdir}/$pkgname-conf-sigsegv.patch - cd $startdir/src/tilda-$pkgver/src -# patch -p0 < $startdir/src/tilda.patch - cd $startdir/src/tilda-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} - mkdir -p $startdir/pkg/etc - cp $startdir/src/config_0 $startdir/pkg/etc/tilda_config +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } -md5sums=('b44ebe04fdfd312e9ddc5e0ed77f4289' - '754753190e0990cd6fba27b3c931bd0e') diff --git a/abs/core/tilda/config_0 b/abs/core/tilda/config_0 deleted file mode 100644 index 198afd3..0000000 --- a/abs/core/tilda/config_0 +++ /dev/null @@ -1,53 +0,0 @@ -tilda_config_version = "0.9.6" -# image = "" -# command = "" -font = "Monospace 15" -key = "F3" -title = "Tilda" -background_color = "white" -# working_dir = "" -web_browser = "firefox" -lines = 7000 -max_width = 1612 -max_height = 532 -min_width = 1 -min_height = 1 -transparency = 0 -x_pos = 1114 -y_pos = 0 -tab_pos = 1 -backspace_key = 0 -delete_key = 1 -d_set_title = 3 -command_exit = 2 -scheme = 3 -slide_sleep_usec = 14607 -animation_orientation = 0 -scrollbar_pos = 2 -back_red = 0 -back_green = 0 -back_blue = 0 -text_red = 65535 -text_green = 65535 -text_blue = 65535 -scroll_background = true -scroll_on_output = false -notebook_border = true -antialias = true -scrollbar = false -use_image = false -grab_focus = true -above = true -notaskbar = true -bold = true -blinks = true -scroll_on_key = true -bell = false -run_command = false -pinned = true -animation = false -hidden = true -centered_horizontally = true -centered_vertically = false -enable_transparency = false -double_buffer = false diff --git a/abs/core/tilda/tilda-0.9.6.tar.gz b/abs/core/tilda/tilda-0.9.6.tar.gz Binary files differdeleted file mode 100644 index cb5531c..0000000 --- a/abs/core/tilda/tilda-0.9.6.tar.gz +++ /dev/null diff --git a/abs/core/tilda/tilda-conf-sigsegv.patch b/abs/core/tilda/tilda-conf-sigsegv.patch new file mode 100644 index 0000000..a48aad0 --- /dev/null +++ b/abs/core/tilda/tilda-conf-sigsegv.patch @@ -0,0 +1,11 @@ +--- src/key_grabber.c 2008-04-08 00:12:31.000000000 +0200 ++++ src/key_grabber.c 2012-05-17 19:43:25.227699421 +0200 +@@ -257,7 +257,7 @@ + gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw) + { + /* Empty strings are no good */ +- if (strcmp ("", keystr) == 0) ++ if (!keystr || strcmp ("", keystr) == 0) + return FALSE; + + return tomboy_keybinder_bind (keystr, onKeybindingPull, tw); diff --git a/abs/core/tilda/tilda-fix.patch b/abs/core/tilda/tilda-fix.patch new file mode 100644 index 0000000..a6d273c --- /dev/null +++ b/abs/core/tilda/tilda-fix.patch @@ -0,0 +1,24 @@ +--- src/key_grabber.c 2008-04-08 01:12:31.000000000 +0300 ++++ src/key_grabber.c 2009-10-16 17:39:16.399679408 +0300 +@@ -190,7 +190,7 @@ + * Overriding the user time here seems to work a lot better than calling + * gtk_window_present_with_time() here, or at the end of the function. I have + * no idea why, they should do the same thing. */ +- gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window, ++ gdk_x11_window_set_user_time (GTK_WIDGET(tw->window), + tomboy_keybinder_get_current_event_time()); + gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); + gtk_widget_show (GTK_WIDGET(tw->window)); + +--- tilda.desktop.in 2007-03-16 04:53:34.000000000 +0100 ++++ tilda.desktop.in 2011-08-28 19:08:53.000000000 +0200 +@@ -2 +1,0 @@ +-Encoding=UTF-8 +@@ -4,2 +3,2 @@ +-Exec=@BINDIR@/tilda +-Icon=@PIXMAPSDIR@/tilda.png ++Exec=tilda ++Icon=tilda +@@ -8 +7 @@ +-Categories=GNOME;GTK;Application;Utility;TerminalEmulator; ++Categories=GNOME;GTK;Utility;TerminalEmulator;System; diff --git a/abs/core/tilda/tilda-glib2.patch b/abs/core/tilda/tilda-glib2.patch new file mode 100644 index 0000000..2d048e5 --- /dev/null +++ b/abs/core/tilda/tilda-glib2.patch @@ -0,0 +1,11 @@ +--- src/tomboykeybinder.h 2007-07-15 04:31:19.000000000 +0200 ++++ src/tomboykeybinder.h 2012-05-17 19:42:06.613150329 +0200 +@@ -2,7 +2,7 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include <glib/gtypes.h> ++//#include <glib/gtypes.h> + + G_BEGIN_DECLS + diff --git a/abs/core/tilda/tilda.changelog b/abs/core/tilda/tilda.changelog new file mode 100644 index 0000000..4248e9a --- /dev/null +++ b/abs/core/tilda/tilda.changelog @@ -0,0 +1,20 @@ +2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * FS#29754 fixed + +2011-08-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * FS#25762 fixed + +2008-04-29 Mateusz Herych <heniekk@gmail.com> + + * Updated for x86_64 - 0.9.6 + +2008-04-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * Updated for i686 - 0.9.6 + +2007-12-30 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * Updated to newer version - 0.9.5 + diff --git a/abs/core/tilda/tilda.install b/abs/core/tilda/tilda.install deleted file mode 100644 index 42bc9eb..0000000 --- a/abs/core/tilda/tilda.install +++ /dev/null @@ -1,44 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version -post_install() { - MHOME=`cat /etc/passwd | grep "mythtv" | cut -d":" -f6` - if [ ! -e $MHOME/.keylaunchrc ] - then - echo "setting symlink for keylaunch" - ln -s /etc/keylaunchrc $MHOME/.keylaunchrc -fi -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true - -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* diff --git a/abs/core/tk/ChangeLog b/abs/core/tk/ChangeLog deleted file mode 100644 index fc2998f..0000000 --- a/abs/core/tk/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2008-12-24 Allan McRae <allan@archlinux.org> - * 8.5.6-1 : - new upstream release - -2008-10-16 Allan McRae <allan@archlinux.org> - * 8.5.5-1 : - new upstream release - -2008-08-20 Allan McRae <allan@archlinux.org> - * 8.5.4-2 : - Remove xproto compatibility patch as no longer needed - -2008-08-16 Allan McRae <allan@archlinux.org> - * 8.5.4-1 : - new upstream release - FHS man pages - -2008-07-01 Allan McRae <allan@archlinux.org> - * 8.5.3-1 : - new upstream release - added patch for xproto-7.0.13 compatibility diff --git a/abs/core/tk/PKGBUILD b/abs/core/tk/PKGBUILD index 4b18070..f1d6d46 100644 --- a/abs/core/tk/PKGBUILD +++ b/abs/core/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90372 2010-09-11 03:52:30Z allan $ +# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.9 +pkgver=8.5.11 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('7cdeb9feb61593f58a0ae61f2497580e') +md5sums=('b61b72f0aad230091b100746f078b8f1') build() { cd ${srcdir}/tk${pkgver}/unix @@ -25,6 +25,11 @@ build() { make } +#check() { +# cd ${srcdir}/tk${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tk${pkgver}/unix diff --git a/abs/core/ttf-dejavu/ChangeLog b/abs/core/ttf-dejavu/ChangeLog deleted file mode 100644 index c5c8c4a..0000000 --- a/abs/core/ttf-dejavu/ChangeLog +++ /dev/null @@ -1,24 +0,0 @@ -2009-03-12 Alexander Fehr <pizzapunk gmail com> - - * ttf-dejavu-2.29-1: - New upstream release. - -2008-12-22 Alexander Fehr <pizzapunk gmail com> - - * ttf-dejavu-2.28-1: - New upstream release. - -2008-11-26 Alexander Fehr <pizzapunk gmail com> - - * ttf-dejavu-2.27-1: - New upstream release. - -2008-07-29 Alexander Fehr <pizzapunk gmail com> - - * ttf-dejavu-2.26-1: - New upstream release. - New maintainer. - Renamed ttf.install to ttf-dejavu.install. - Added -s option to fc-cache in install file. - Removed install message. - Added ChangeLog. diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD index a5fd988..0c2fca0 100644 --- a/abs/core/ttf-dejavu/PKGBUILD +++ b/abs/core/ttf-dejavu/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 71355 2010-03-06 19:39:30Z jgc $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 157781 2012-04-29 11:06:40Z allan $ +# Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ttf-dejavu -pkgver=2.30 -pkgrel=2 +pkgver=2.33 +pkgrel=3 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters" arch=('any') -url="http://dejavu.sourceforge.net/" +url="http://dejavu-fonts.org/wiki/Main_Page" license=('custom') -depends=('fontconfig' 'xorg-fonts-encodings') +depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir') install=ttf-dejavu.install source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2) -md5sums=('545b3bfc69893075a90a7c6e6f4a7e67') +md5sums=('8b601e91725b6d69141b0fcf527948c0') -build() { - cd "${srcdir}/dejavu-fonts-ttf-${pkgver}" +package() { + install -dm755 "${pkgdir}"/etc/fonts/conf.avail + install -dm755 "${pkgdir}"/usr/share/fonts/TTF - install -m755 -d "${pkgdir}/usr/share/fonts/TTF" - install -m644 ttf/*.ttf "${pkgdir}/usr/share/fonts/TTF/" || return 1 + cd "${srcdir}"/dejavu-fonts-ttf-${pkgver} + install -m644 ttf/*.ttf "${pkgdir}"/usr/share/fonts/TTF/ + install -m644 fontconfig/*.conf "${pkgdir}"/etc/fonts/conf.avail/ - install -m755 -d "${pkgdir}/etc/fonts/conf.avail" - install -m644 fontconfig/*.conf "${pkgdir}/etc/fonts/conf.avail/" || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/" || return 1 + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/ttf-dejavu/ttf-dejavu.install b/abs/core/ttf-dejavu/ttf-dejavu.install index f831cb1..47ecf87 100644 --- a/abs/core/ttf-dejavu/ttf-dejavu.install +++ b/abs/core/ttf-dejavu/ttf-dejavu.install @@ -4,8 +4,9 @@ configs=(20-unhint-small-dejavu-sans-mono.conf 57-dejavu-sans-mono.conf 57-dejavu-sans.conf 57-dejavu-serif.conf) + post_install() { - pushd /etc/fonts/conf.d > /dev/null + pushd etc/fonts/conf.d > /dev/null for config in "${configs[@]}"; do ln -sf ../conf.avail/${config} . done @@ -17,13 +18,13 @@ post_install() { post_upgrade() { if [ `vercmp 2.30-2 $2` -gt 0 ]; then - pushd /etc/fonts/conf.d > /dev/null + pushd etc/fonts/conf.d > /dev/null for config in "${configs[@]}"; do ln -sf ../conf.avail/${config} . done popd > /dev/null fi - for config in /etc/fonts/conf.d/*; do + for config in etc/fonts/conf.d/*; do if [ ! -f ${config} ]; then rm -f ${config} fi @@ -35,7 +36,7 @@ post_upgrade() { pre_upgrade() { # Link new config files not present on system yet - pushd /etc/fonts/conf.d > /dev/null + pushd etc/fonts/conf.d > /dev/null for config in "${configs[@]}"; do if [ ! -f ../conf.avail/${config} ]; then ln -sf ../conf.avail/${config} . @@ -45,7 +46,7 @@ pre_upgrade() { } post_remove() { - pushd /etc/fonts/conf.d > /dev/null + pushd etc/fonts/conf.d > /dev/null for config in "${configs[@]}"; do rm -f ${config} done diff --git a/abs/core/tzdata/Makefile.patch b/abs/core/tzdata/Makefile.patch deleted file mode 100644 index e88f9d9..0000000 --- a/abs/core/tzdata/Makefile.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile ---- src/Makefile 2007-08-20 16:47:41.000000000 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the "CFLAGS=" line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -367,7 +369,7 @@ - <$? >$@ - chmod +x $@ - --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Naur src/tzselect.ksh src-p/tzselect.ksh ---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 -+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - # '@(#)tzselect.ksh 8.1' - diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD index dcedbd5..1f4c16a 100644 --- a/abs/core/tzdata/PKGBUILD +++ b/abs/core/tzdata/PKGBUILD @@ -1,45 +1,28 @@ -# $Id: PKGBUILD 130868 2011-07-08 14:35:26Z andyrtr $ +# $Id: PKGBUILD 163845 2012-07-21 11:06:11Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata -pkgver=2011h -pkgrel=2 -_tzcode=2011g -_tzdata=2011h +pkgver=2012d +pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" -arch=('i686' 'x86_64') -url="http://www.twinsun.com/tz/tz-link.htm" +arch=('any') +url="http://www.iana.org/time-zones" license=('GPL') -depends=() -makedepends=() -optdepends=('bash: required by tzselect') options=('!emptydirs') -source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ - Makefile.patch) -md5sums=('ecb564279b28c5b184421c525d997d6c' - '546d27b6c1e5e1097bd512651815017f' - 'a64ed97d1fc03c66ee8612c0d9f40507') +source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz) +sha1sums=('65d98727233bfd3f5d20dceafab0a81ae2cb5527') -build() { - cd ${srcdir} - - tar -xf tzcode${_tzcode}.tar.gz - tar -xf ${pkgname}${_tzdata}.tar.gz - - patch -Np1 -i "${srcdir}/Makefile.patch" - - make -} - -check() { - cd ${srcdir} - make check -} +timezones=('africa' 'antarctica' 'asia' 'australasia' + 'europe' 'northamerica' 'southamerica' + 'pacificnew' 'etcetera' 'backward' + 'systemv' 'factory' + 'solar87' 'solar88' 'solar89') package() { cd ${srcdir} - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}/usr/share/zoneinfo/localtime" + zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]} + zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]} + zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]} + zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York + install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone.tab } diff --git a/abs/core/udev/80-drivers.rules b/abs/core/udev/80-drivers.rules deleted file mode 100644 index 56ac06c..0000000 --- a/abs/core/udev/80-drivers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="drivers_end" - -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" -SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" - -LABEL="drivers_end" diff --git a/abs/core/udev/81-CD_DVD_symlinks.rules b/abs/core/udev/81-CD_DVD_symlinks.rules deleted file mode 100644 index 6d278ac..0000000 --- a/abs/core/udev/81-CD_DVD_symlinks.rules +++ /dev/null @@ -1,23 +0,0 @@ -# Udev rules for creating CD/DVD symlinks -# do not edit this file, it will be overwritten on update - - -##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### diff --git a/abs/core/udev/81-OSS_Emulation.rules b/abs/core/udev/81-OSS_Emulation.rules deleted file mode 100644 index 373537e..0000000 --- a/abs/core/udev/81-OSS_Emulation.rules +++ /dev/null @@ -1,6 +0,0 @@ -# Udev rules for OSS Emulation -# do not edit this file, it will be overwritten on update - -# OSS Emulation SOUND addon modules -SUBSYSTEM=="sound", RUN+="/sbin/modprobe snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/sbin/modprobe snd-seq-oss" diff --git a/abs/core/udev/81-SoundGraph.rules b/abs/core/udev/81-SoundGraph.rules deleted file mode 100644 index f3f5c84..0000000 --- a/abs/core/udev/81-SoundGraph.rules +++ /dev/null @@ -1,3 +0,0 @@ -# Udev rules for SoundGraph receivers -KERNEL=="event[0-9]*" , SUBSYSTEMS=="rc" , ENV(.rc_in_path)="true" -KERNEL=="event[0-9]*" , ATTRS{idVendor}=="15c2" , ENV(.rc_in_path)=="true" , SYMLINK+="remotes/SoundGraph" diff --git a/abs/core/udev/81-SoundGraph_LCD.rules b/abs/core/udev/81-SoundGraph_LCD.rules deleted file mode 100644 index 59f0eec..0000000 --- a/abs/core/udev/81-SoundGraph_LCD.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Udev rules for SoundGraph LCDs -KERNEL=="lcd[0-9]*" , ATTRS{idVendor}=="15c2" , SYMLINK+="lcd" diff --git a/abs/core/udev/81-arch.rules b/abs/core/udev/81-arch.rules deleted file mode 100644 index cd4e3e9..0000000 --- a/abs/core/udev/81-arch.rules +++ /dev/null @@ -1,83 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> -# do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# video devices -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="3dfx*", GROUP="video" -KERNEL=="fb[0-9]*", GROUP="video" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" - -# USB devices -KERNEL=="legousbtower*", MODE="0666" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# miscellaneous -KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/abs/core/udev/81-dvicoIR.rules b/abs/core/udev/81-dvicoIR.rules deleted file mode 100644 index 8669f34..0000000 --- a/abs/core/udev/81-dvicoIR.rules +++ /dev/null @@ -1,18 +0,0 @@ -# Udev rules for Dvico remotes -# do not edit this file, it will be overwritten on update - -# This rule is for the Dvico Dual Digital 4 Rev 2. It has 2 IR modules -# identified, only the first of which is connected to the receiver. -# The KERNELS=="*-1" part of this rule makes sure that the first -# device is the one that gets the symlink. -KERNEL=="event*", \ - KERNELS=="*-1", \ - ATTRS{manufacturer}=="Dvico", \ - ATTRS{idVendor}=="0fe9", \ - ATTRS{idProduct}=="db98", \ - SYMLINK="remotes/dvicoDualDigital4" - -# This rule is for the older style USB DVICO remote dongles. -SUBSYSTEMS=="usb", KERNEL=="hiddev*", \ - ATTRS{product}=="DVICO USB HID Remocon V1.00", \ - SYMLINK+="remotes/dvicoIR" diff --git a/abs/core/udev/PKGBUILD b/abs/core/udev/PKGBUILD deleted file mode 100644 index da51c5d..0000000 --- a/abs/core/udev/PKGBUILD +++ /dev/null @@ -1,125 +0,0 @@ -# $Id: PKGBUILD 126202 2011-06-02 14:49:12Z tomegun $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Tom Gundersen <teg@jklm.no> - -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=171 -pkgrel=7 -arch=(i686 x86_64) -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -groups=('base') -# older initscripts versions required start_udev -options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - 81-arch.rules - 81-OSS_Emulation.rules - 81-dvicoIR.rules - 81-CD_DVD_symlinks.rules - 81-SoundGraph_LCD.rules - 81-SoundGraph.rules - static-audio-nodes-group.patch - static-nodes-permissions.patch - cdsymlinks.sh) - -build() { - cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) - patch -Np1 -i ../static-audio-nodes-group.patch - patch -Np1 -i ../static-nodes-permissions.patch - ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ - --disable-rule-generator - make -} - -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf - etc/modprobe.d/framebuffer_blacklist.conf) - conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') - replaces=('devfsd') - - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=${pkgdir} install - # Install our rule for permissions and symlinks - install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules - # Install OSS Emulation rules - install -D -m644 $srcdir/81-OSS_Emulation.rules $pkgdir/lib/udev/rules.d/81-OSS_Emulation.rules - # Install dvicoIR rules - install -D -m644 $srcdir/81-dvicoIR.rules $pkgdir/lib/udev/rules.d/81-dvicoIR.rules - # Install CD/DVD symlink rules - install -D -m644 $srcdir/81-CD_DVD_symlinks.rules $pkgdir/lib/udev/rules.d/81-CD_DVD_symlinks.rules - # Install SoundGraph LCD rules - install -D -m644 $srcdir/81-SoundGraph_LCD.rules $pkgdir/lib/udev/rules.d/81-SoundGraph_LCD.rules - # Install SoundGraph rules - install -D -m644 $srcdir/81-SoundGraph.rules $pkgdir/lib/udev/rules.d/81-SoundGraph.rules - # install cdsymlinks.sh - install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - - # create framebuffer blacklist - mkdir -p $pkgdir/etc/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf - - # create static devices in /lib/udev/devices/ - mkdir ${pkgdir}/lib/udev/devices/pts - mkdir ${pkgdir}/lib/udev/devices/shm - - mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 - mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 - mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 - mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 - - ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd - ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin - ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout - ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr - ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core - - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 - mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - # /dev/net/tun - mkdir ${pkgdir}/lib/udev/devices/net - mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 - # /dev/fuse - mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 - # /dev/ppp - mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - cd $srcdir/$pkgbase-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules -} -md5sums=('bdf4617284be2ecac11767437417e209' - '6ee44e3feb8e0f037947e7d4ca273f12' - '18170020347b181b155ff5a1a8a904b4' - '85798a6599d4b24b68600c5f1d1f223b' - '48845542d8250d6f2eddf07944f78014' - '5401def23fae53db3c94e39eb2debfb4' - '01eeeb532e1c82a12905c67814c1dde2' - '4f625aea95a5597afd8cdf189421f193' - 'f9e50b8dfcd2215f5423ff9bc04ecf68' - '2e808ee78d237c478b57af2a68d43769') diff --git a/abs/core/udev/__changelog b/abs/core/udev/__changelog deleted file mode 100644 index a23df78..0000000 --- a/abs/core/udev/__changelog +++ /dev/null @@ -1,20 +0,0 @@ -7/10/11 Britney Fransen -- Added changelog -- Added 81-LinHES.rules -- Added 81-LinHES.rules to PKGBUILD - -8/9/11 Britney Fransen -- Add cdsymlinks.sh to PKGBUILD - -1/24/2012 -- Renamed changelog to __changelog -- Added 81-dvicoIR.rules -- Moved OSS Emulation rules from 81-LinHES.rules to 81-OSS_Emulation.rules -- Moved CD/DVD rules from 81-LinHES.rules to 81-CD_DVD_symlinks.rules -- Removed 81-LinHES.rules - -3/1/2012 -- Added 81-SoundGraph_LCD.rules - -3/5/2012 -- Added 81-SoundGraph.rules diff --git a/abs/core/udev/cdsymlinks.sh b/abs/core/udev/cdsymlinks.sh deleted file mode 100755 index 498abda..0000000 --- a/abs/core/udev/cdsymlinks.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -# Creates cdsymlinks in /dev -# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> - -# check on cd/dvd drives and if persistant rules file is used -if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then - # remove existing device files - rm /dev/cdrom* - rm /dev/cdrw* - rm /dev/dvd* - rm /dev/dvdrw* - # start creating symlinks - for i in /dev/cd/cdrom-*; do - if [ -h $i ]; then - [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom - [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" - ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER - fi - done - - for i in /dev/cd/cdrw-*; do - if [ -h $i ]; then - [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw - [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" - ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER - fi - done - - for i in /dev/cd/dvd-*; do - if [ -h $i ]; then - [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd - [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" - ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER - fi - done - - for i in /dev/cd/dvdrw-*; do - if [ -h $i ]; then - [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw - [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" - ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER - fi - done -fi diff --git a/abs/core/udev/load-modules.sh b/abs/core/udev/load-modules.sh deleted file mode 100755 index 1e2af91..0000000 --- a/abs/core/udev/load-modules.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Implement blacklisting for udev-loaded modules - -[ $# -ne 1 ] && exit 1 - -. /etc/rc.conf - -# grab modules from rc.conf -BLACKLIST="${MOD_BLACKLIST[@]}" -MODPROBE="/sbin/modprobe" -LOGGER="/usr/bin/logger" -RESOLVEALIAS="${MODPROBE} --resolve-alias" -USEBLACKLIST="--use-blacklist" - -if [ -f /proc/cmdline ]; then - for cmd in $(cat /proc/cmdline); do - case $cmd in - disablemodules=*) eval $cmd ;; - load_modules=off) exit ;; - esac - done - #parse cmdline entries of the form "disablemodules=x,y,z" - if [ -n "$disablemodules" ]; then - BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" - fi -fi - -#MODULES entries in rc.conf that begin with ! are blacklisted -for mod in ${MODULES[@]}; do - if [ "${mod}" != "${mod#!}" ]; then - BLACKLIST="$BLACKLIST ${mod#!}" - fi -done - -if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then - if [ -n "${BLACKLIST}" ]; then - # If an alias name is on the blacklist, load no modules for this device - if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then - $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" - exit - fi - #sanitize the blacklist - BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" - # Try to find all modules for the alias - mods=$($RESOLVEALIAS $1) - # If no modules could be found, try if the alias name is a module name - # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour - [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" - [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" - for mod in ${mods}; do - # Find the module and all its dependencies - deps="$($MODPROBE -i --show-depends ${mod})" - [ $? -ne 0 ] && continue - - #sanitize the module names - deps="$(echo "$deps" | sed \ - -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ - -e 's|-|_|g')" - - # If the module or any of its dependencies is blacklisted, don't load it - for dep in $deps; do - if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then - if [ "${dep}" = "${mod}" ]; then - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" - else - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" - fi - continue 2 - fi - done - # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases - # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists - # module names if we resolved alias names manually above - $MODPROBE $USEBLACKLIST ${mod} - done - else - $MODPROBE $USEBLACKLIST $1 - fi -fi -# vim: set et ts=4: diff --git a/abs/core/udev/static-audio-nodes-group.patch b/abs/core/udev/static-audio-nodes-group.patch deleted file mode 100644 index b1fc4f9..0000000 --- a/abs/core/udev/static-audio-nodes-group.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Fri, 27 May 2011 02:50:29 +0200 -Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} - nodes - ---- - rules/rules.d/50-udev-default.rules | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules -index cd745ef..cacb533 100644 ---- a/rules/rules.d/50-udev-default.rules -+++ b/rules/rules.d/50-udev-default.rules -@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" - SUBSYSTEM=="drm", GROUP="video" - - # sound --SUBSYSTEM=="sound", GROUP="audio" -+SUBSYSTEM=="sound", GROUP="audio", \ -+ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" - - # DVB (video) - SUBSYSTEM=="dvb", GROUP="video" --- -1.7.5.3 - diff --git a/abs/core/udev/static-nodes-permissions.patch b/abs/core/udev/static-nodes-permissions.patch deleted file mode 100644 index 51e6ad6..0000000 --- a/abs/core/udev/static-nodes-permissions.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c112873b5bc9ebbae39c32f502bc6211f33546cc Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Mon, 30 May 2011 02:12:02 +0200 -Subject: [PATCH 1/2] rules: static_node - use 0660 if group is given to get - the cigar - ->> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote: -> -> Close, but no cigar. Looks like the static nodes are not assigned -> permissions 0660 even if a gid is set (the nodes have perms 0600). -> -> Cheers, -> -> Tom ---- - udev/udev-rules.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/udev/udev-rules.c b/udev/udev-rules.c -index 48395e7..56a258d 100644 ---- a/udev/udev-rules.c -+++ b/udev/udev-rules.c -@@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) - case TK_A_STATIC_NODE: { - char filename[UTIL_PATH_SIZE]; - struct stat stats; -+ - /* we assure, that the permissions tokens are sorted before the static token */ -- if (mode == 0 && uid == 0 && gid == 0) -+ if (uid == 0 && gid == 0) - goto next; - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/", - &rules->buf[cur->key.value_off], NULL); -@@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) - goto next; - if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) - goto next; -- if (mode != 0 && mode != (stats.st_mode & 0777)) { -+ -+ if (mode == 0 && gid > 0) -+ mode = 0660; -+ if (mode != (stats.st_mode & 0777)) { - chmod(filename, mode); - info(rules->udev, "chmod '%s' %#o\n", filename, mode); - } -+ - if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) { - chown(filename, uid, gid); - info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid); - } -+ - utimensat(AT_FDCWD, filename, NULL, 0); - break; - } --- -1.7.5.2 - diff --git a/abs/core/udev/udev.install b/abs/core/udev/udev.install deleted file mode 100644 index 5c02dd1..0000000 --- a/abs/core/udev/udev.install +++ /dev/null @@ -1,65 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 100)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" - echo "udev >=098 rules syntax has changed, please update your own rules." - echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." - echo "Please read the instructions carefully before reboot." - echo "They are located in /etc/udev/readme-udev-arch.txt" - echo "----------" - fi - if [ "$(vercmp $2 169)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "---------------" - echo "Kernel 2.6.32 or newer is now required." - echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo "Arch specific cd symlinks are now no longer created." - echo "cd and net persistent rules will no longer be autogenerated," - echo "see <https://wiki.archlinux.org/index.php/Udev> for details." - echo "Errors are now logged (possibly to the console) by default." - echo "---------------" - fi - if [ "$(vercmp $2 172)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "---------------" - echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" - echo "blacklisting in MODULES no longer works." - echo "See 'man modprobe.conf' for a replacement to blacklisting." - echo "To disable a module mod1 on the kernel command line, use" - echo "mod1.disable=1" - echo "or" - echo "modprobe.blacklist=mod1" - echo " --" - echo "The following modules are no longer unconditionally loaded:" - echo " pcspkr irtty-sir analog lp ppdev ide-generic" - echo "Add them to MODULES in rc.conf if you need them." - echo "---------------" - fi -} - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} diff --git a/abs/core/udisks/PKGBUILD b/abs/core/udisks/PKGBUILD index 68017ee..e576d2e 100644 --- a/abs/core/udisks/PKGBUILD +++ b/abs/core/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $ +# $Id: PKGBUILD 160373 2012-06-01 12:58:48Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.4 -pkgrel=1 +pkgrel=4 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -18,13 +18,14 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static - #fix location for bash_completion helper - sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib } diff --git a/abs/core/usbutils/PKGBUILD b/abs/core/usbutils/PKGBUILD index fff0508..08513e5 100644 --- a/abs/core/usbutils/PKGBUILD +++ b/abs/core/usbutils/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 87429 2010-08-13 10:22:39Z tpowa $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> +# Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=0.90 +pkgver=006 pkgrel=1 pkgdesc="USB Device Utilities" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('GPL') groups=('base') -makedepends=('wget') -depends=('glibc' 'libusb') +depends=('libusb' 'hwids') +optdepends=('python2: for lsusb.py usage' + 'coreutils: for lsusb.py usage') url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" + fix-python2.patch) +md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' + '45766196895b4cc50b53cd56e1bbf3d1') build() { cd $srcdir/$pkgname-$pkgver - rm usb.ids - wget http://www.linux-usb.org/usb.ids + # patch lsusb.py to use correct usb.ids file and python2 interpreter + patch -Np1 -i $srcdir/fix-python2.patch ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make || return 1 + make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - # fix pkgconfig file - mkdir -p $pkgdir/usr/lib - mv $pkgdir/usr/share/hwdata/pkgconfig $pkgdir/usr/lib/ + # this is now in the hwids package + rm -rf $pkgdir/usr/{share/hwdata,sbin} } -md5sums=('53f0269e2cba704d5a35dfe291511292') diff --git a/abs/core/usbutils/fix-python2.patch b/abs/core/usbutils/fix-python2.patch new file mode 100644 index 0000000..7e2875e --- /dev/null +++ b/abs/core/usbutils/fix-python2.patch @@ -0,0 +1,17 @@ +--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 ++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # lsusb.py + # Displays your USB devices in reasonable form. + # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. +@@ -16,7 +16,7 @@ + warnsort = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD index 877e013..bfa1517 100644 --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -1,38 +1,68 @@ -# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $ -# Maintainer: +# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.19.1 -pkgrel=2 +pkgver=2.21.2 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" +url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') -replaces=('linux32' 'util-linux-ng') -conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') -provides=('linux32' "util-linux-ng=${pkgver}") +depends=('pam') +conflicts=('util-linux-ng') +provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 - mount-segfault-2.19.1.patch) -optdepends=('perl: for chkdupexe support') -md5sums=('3eab06f05163dfa65479c44e5231932c' - '3247b52f0e4b8044f23f2f7218e2fdea') +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz + pam-login + pam-common + term_utils-agetty.patch) +backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) +install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix https://bugs.archlinux.org/task/24261 - patch -Np1 -i ../mount-segfault-2.19.1.patch - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx + + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --enable-fs-paths-extra=/usr/bin:/usr/sbin \ + --enable-write \ + --enable-raw \ + --disable-wall \ + --enable-new-mount \ + --enable-login-utils + make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -dm755 "${pkgdir}/var/lib/hwclock" + patch -p0 < ${srcdir}/term_utils-agetty.patch || return 1 + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + + # broken tool, going away in next major release, so just remove it now + rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} + + # delete stray empty dir, fixed upstream + rm -r usr/share/man/ru + + # setuid chfn and chsh + chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + + # install PAM files for login-utils + install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" + install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" + install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" } +md5sums=('54ba880f1d66782c2287ee2c898520e9' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'da1e8645a7cff8fbc08e861466e2727e') diff --git a/abs/core/util-linux/__changelog b/abs/core/util-linux/__changelog new file mode 100644 index 0000000..5a06d16 --- /dev/null +++ b/abs/core/util-linux/__changelog @@ -0,0 +1 @@ +utils-agetty-patch diff --git a/abs/core/util-linux/mount-segfault-2.19.1.patch b/abs/core/util-linux/mount-segfault-2.19.1.patch deleted file mode 100644 index 7bcb3bc..0000000 --- a/abs/core/util-linux/mount-segfault-2.19.1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 11 May 2011 16:57:27 +0200 -Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount - options) - - # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab - # mkdir /tmp/x - # mount -a - segfault - -Reported-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - mount/mount.c | 8 +++++--- - mount/mount_mntent.c | 5 +++-- - mount/sundries.c | 2 ++ - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/mount/mount.c b/mount/mount.c -index ba71149..29963c2 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long - res = loopfile_used_with((char *) mnt->m.mnt_fsname, - loopfile, offset); - -- else if ((p = strstr(mnt->m.mnt_opts, "loop="))) { -+ else if (mnt->m.mnt_opts && -+ (p = strstr(mnt->m.mnt_opts, "loop="))) -+ { - char *dev = xstrdup(p+5); - if ((p = strchr(dev, ','))) - *p = '\0'; -@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose) - goto yes; - - /* extra care for loop devices */ -- if ((strstr(mc->m.mnt_opts, "loop=") || -- (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) { -+ if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) || -+ (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) { - - char *p = get_option_value(mc->m.mnt_opts, "offset="); - uintmax_t offset = 0; -diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c -index d90def3..f42c0ad 100644 ---- a/mount/mount_mntent.c -+++ b/mount/mount_mntent.c -@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { - m1 = mangle(mnt->mnt_fsname); - m2 = mangle(mnt->mnt_dir); - m3 = mangle(mnt->mnt_type); -- m4 = mangle(mnt->mnt_opts); -+ m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw"; - - res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n", - m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno); -@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { - free(m1); - free(m2); - free(m3); -- free(m4); -+ if (mnt->mnt_opts) -+ free(m4); - return (res < 0) ? 1 : 0; - } - -diff --git a/mount/sundries.c b/mount/sundries.c -index ae4501a..2dec37f 100644 ---- a/mount/sundries.c -+++ b/mount/sundries.c -@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) { - - if (test_opts == NULL) - return 1; -+ if (options == NULL) -+ options = ""; - - len = strlen(test_opts); - q = alloca(len+1); --- -1.7.5.1 - diff --git a/abs/core/shadow/shadow b/abs/core/util-linux/pam-common index a7bf8a4..a7bf8a4 100644 --- a/abs/core/shadow/shadow +++ b/abs/core/util-linux/pam-common diff --git a/abs/core/util-linux/pam-login b/abs/core/util-linux/pam-login new file mode 100644 index 0000000..1960d94 --- /dev/null +++ b/abs/core/util-linux/pam-login @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login diff --git a/abs/core/util-linux/term_utils-agetty.patch b/abs/core/util-linux/term_utils-agetty.patch new file mode 100644 index 0000000..f0b37b3 --- /dev/null +++ b/abs/core/util-linux/term_utils-agetty.patch @@ -0,0 +1,17 @@ +--- term-utils/agetty.orig 2012-08-02 19:44:36.234757299 +0000 ++++ term-utils/agetty.c 2012-08-02 19:47:15.464752505 +0000 +@@ -961,12 +961,12 @@ + */ + + if ((fcntl(STDIN_FILENO, F_GETFL, 0) & O_RDWR) != O_RDWR) +- log_err(_("%s: not open for read/write"), tty); ++ log_warn(_("%s: not open for read/write"), tty); + + } + + if (tcsetpgrp(STDIN_FILENO, pid)) +- log_err("/dev/%s: cannot set process group: %m", tty); ++ log_warn("/dev/%s: cannot set process group: %m", tty); + + /* Get rid of the present outputs. */ + close(STDOUT_FILENO); diff --git a/abs/core/util-linux/util-linux.install b/abs/core/util-linux/util-linux.install new file mode 100644 index 0000000..90ce5bd --- /dev/null +++ b/abs/core/util-linux/util-linux.install @@ -0,0 +1,10 @@ +post_upgrade() { + if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then + if [ -f /var/lib/hwclock/adjtime ]; then + mv /var/lib/hwclock/adjtime /etc/adjtime + fi + if [ -d /var/lib/hwclock ]; then + rmdir /var/lib/hwclock + fi + fi +} diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD index b18f42b..62ec3d6 100644 --- a/abs/core/v4l-utils/PKGBUILD +++ b/abs/core/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id$ +# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.5 +pkgver=0.8.8 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ conflicts=('libv4l') license=('LGPL') makedepends=('qt') optdepends=('qt') -depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg') -source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') +depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') +source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 + http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,4 +28,8 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make install PREFIX="/usr" DESTDIR="${pkgdir}/" rm -f "${pkgdir}/usr/bin/ivtv-ctl" + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rm -rf "${pkgdir}/lib" } +md5sums=('40fdda3f4055ed818012d7a7b5ef5be5' + 'cceb1325f35789c95f875b705b3eb373') diff --git a/abs/core/v4l-utils/_changelog b/abs/core/v4l-utils/_changelog deleted file mode 100644 index f3adef7..0000000 --- a/abs/core/v4l-utils/_changelog +++ /dev/null @@ -1 +0,0 @@ --changed libjpeg-turbo to libjpeg diff --git a/abs/core/vi/PKGBUILD b/abs/core/vi/PKGBUILD index 83151a8..0a5c7f8 100644 --- a/abs/core/vi/PKGBUILD +++ b/abs/core/vi/PKGBUILD @@ -1,40 +1,47 @@ -# $Id: PKGBUILD 71573 2010-03-07 19:09:56Z paul $ +# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi pkgver=050325 -pkgrel=3 +pkgrel=2 +epoch=1 pkgdesc='The original ex/vi text editor.' arch=('i686' 'x86_64') url='http://ex-vi.sourceforge.net/' license=('custom:ex') depends=('ncurses') +optdepends=('mailx: used by the preserve command for notification') groups=('base') -options=(force strip !libtool emptydirs) +options=(strip !libtool emptydirs) source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2 - navkeys.patch increase-tube.patch exrc.sample) -md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3' - 'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668') + exrc.sample + navkeys.patch + increase-tube.patch + preserve_dir.patch) +md5sums=('e668595254233e4d96811083a3e4e2f3' + 'd3b483c994d859232ce369b82a4b5668' + 'aac133930047eafa4f28736cfaf976b3' + 'e596e05a00a24187b576e389fa1de45d' + '419a8755e0dd16e95542bc107e6d2b24') build() { - cd ${srcdir}/ex-${pkgver} || return 1 + cd "${srcdir}/ex-${pkgver}" # apply patches - patch -Np1 -i ../navkeys.patch || return 1 - patch -Np0 -i ../increase-tube.patch || return 1 - - # correct paths in manpages - sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1 \ - || return 1 - sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1 \ - || return 1 + patch -Np1 -i ../navkeys.patch + patch -Np0 -i ../increase-tube.patch + # FS#20653 + patch -Np1 -i ../preserve_dir.patch make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \ - 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses \ - || return 1 - make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \ - "DESTDIR=$pkgdir" install || return 1 + 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses +} + +package() { + cd "${srcdir}/ex-${pkgver}" + + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/usr/bin/install \ + DESTDIR="$pkgdir" install - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE \ - || return 1 + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/core/vi/preserve_dir.patch b/abs/core/vi/preserve_dir.patch new file mode 100644 index 0000000..5209f7b --- /dev/null +++ b/abs/core/vi/preserve_dir.patch @@ -0,0 +1,81 @@ +diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1 +--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500 ++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500 +@@ -1950,7 +1950,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH DOCUMENTATION + The document +diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c +--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500 +@@ -272,7 +272,7 @@ + #ifdef notdef + char pattern[] = "/usr/preserve/Exaa`XXXXX"; + #else +-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX"; ++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX"; + #endif + + /* +@@ -296,7 +296,7 @@ + timestamp = ctime(&time); + timestamp[16] = 0; /* blast from seconds on */ + putenv("MAILRC=/dev/null"); +- sprintf(cmd, "/bin/mail %s", pp->pw_name); ++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name); + setuid(getuid()); + mf = popen(cmd, "w"); + if (mf == NULL) +diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c +--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500 +@@ -167,7 +167,7 @@ + #ifdef notdef + char mydir[] = "/usr/preserve"; + #else +-char mydir[] = "/var/preserve"; ++char mydir[] = "/var/lib/ex"; + #endif + + /* +diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec +--- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500 +@@ -20,7 +20,7 @@ + %define libexecdir %{prefix}/5lib + %define mandir %{prefix}/share/man/5man + +-%define preservedir /var/preserve ++%define preservedir /var/lib/ex + + # install command + %define ucbinstall install +diff -Naur ex-050325.ori/Makefile ex-050325/Makefile +--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500 +@@ -83,7 +83,7 @@ + BINDIR = $(PREFIX)/bin + LIBEXECDIR = $(PREFIX)/libexec + MANDIR = $(PREFIX)/share/man +-PRESERVEDIR = /var/preserve ++PRESERVEDIR = /var/lib/ex + + # + # DESTDIR is prepended to the installation paths. It is mostly useful +diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1 +--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500 ++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500 +@@ -979,7 +979,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH SEE ALSO + ex(1), diff --git a/abs/core/videoproto/PKGBUILD b/abs/core/videoproto/PKGBUILD index 7cff84a..8d86ff4 100644 --- a/abs/core/videoproto/PKGBUILD +++ b/abs/core/videoproto/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 151202 2012-02-25 07:30:12Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=videoproto -pkgver=2.3.0 -pkgrel=1 +pkgver=2.3.1 +pkgrel=2 pkgdesc="X11 Video extension wire protocol" -arch=(i686 x86_64) +arch=('any') url="http://xorg.freedesktop.org/" +license=('custom') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('bb8b366687a7f345e3a8697bac516cb436cbf4b2') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -md5sums=('fb762146a18207a1e8bc9f299dfc7ac0') diff --git a/abs/core/w3m/PKGBUILD b/abs/core/w3m/PKGBUILD new file mode 100644 index 0000000..438d25c --- /dev/null +++ b/abs/core/w3m/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 149346 2012-02-07 01:25:49Z bisson $ +# Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=w3m +pkgver=0.5.3 +pkgrel=3 +pkgdesc='Text-based Web browser, as well as pager' +url='http://w3m.sourceforge.net/' +license=('custom') +arch=('i686' 'x86_64') +makedepends=('imlib2') +optdepends=('imlib2: for graphics support') +depends=('openssl' 'gc' 'ncurses') +source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" + 'https-segfault.patch') +sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '66affb2f695fe0bdde25cf774642bfd6a9404e88') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed 's/file_handle/file_handle_rofl/g' -i istream.* + patch -p1 -i ../https-segfault.patch + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-image=x11,fb \ + --with-imagelib=imlib2 \ + --with-termlib=ncurses \ + --disable-w3mmailer \ + --disable-mouse \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}" + ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/abs/core/w3m/https-segfault.patch b/abs/core/w3m/https-segfault.patch new file mode 100644 index 0000000..31286a7 --- /dev/null +++ b/abs/core/w3m/https-segfault.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/abs/core/wget/PKGBUILD b/abs/core/wget/PKGBUILD index 44a6477..4258f04 100644 --- a/abs/core/wget/PKGBUILD +++ b/abs/core/wget/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 138218 2011-09-19 05:03:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> @@ -19,7 +19,7 @@ md5sums=('7f518b3a71e9efd330e9a0c3714f8463') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + sed -i '/gets is a security hole/d' lib/stdio.in.h # Note : We do not build with --enable-nls, because there is a bug in wget causing # international domain names to be not properly converted to punycode if # the current locale is a UTF-8 one @@ -31,6 +31,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install cat >> "$pkgdir/etc/wgetrc" <<EOF diff --git a/abs/core/wget/__changelog b/abs/core/wget/__changelog new file mode 100644 index 0000000..55fb64e --- /dev/null +++ b/abs/core/wget/__changelog @@ -0,0 +1,2 @@ +sed -i '/gets is a security hole/d' \ + gettext-{runtime/gnulib-lib,tools/{gnulib-lib,libgettextpo}}/stdio.in.h diff --git a/abs/core/which/PKGBUILD b/abs/core/which/PKGBUILD index 41e0b60..65495fe 100644 --- a/abs/core/which/PKGBUILD +++ b/abs/core/which/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 12859 2008-09-22 17:33:50Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 142082 2011-11-04 23:36:20Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=which pkgver=2.20 -pkgrel=10 +pkgrel=5 pkgdesc="A utility to show the full path of commands" arch=('i686' 'x86_64') url="http://www.xs4all.nl/~carlo17/which" license=('GPL3') -install=which.install groups=('base') -depends=('glibc' 'texinfo') +depends=('glibc' 'sh') +install=which.install source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('95be0501a466e515422cde4af46b2744') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} - rm -f ${pkgdir}/usr/share/info/dir +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/abs/core/which/which.install b/abs/core/which/which.install index 899bd6f..167e250 100644 --- a/abs/core/which/which.install +++ b/abs/core/which/which.install @@ -2,8 +2,9 @@ infodir=/usr/share/info filelist=(which.info) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,9 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/windowmaker/PKGBUILD b/abs/core/windowmaker/PKGBUILD index e9a9853..3b20bf5 100644 --- a/abs/core/windowmaker/PKGBUILD +++ b/abs/core/windowmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150208 2012-02-14 20:50:29Z daniel $ +# $Id: PKGBUILD 159727 2012-05-26 10:06:04Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker -pkgver=0.95.2 +pkgver=0.95.3 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('ae62bad9c4dee504066e0f172b565ff0' +md5sums=('305af9d862e853a5d7977e801cb66ca3' '2fba97bebfd691836b92b8f0db79ff13') build() { diff --git a/abs/core/wireless_tools/PKGBUILD b/abs/core/wireless_tools/PKGBUILD index cb68362..cb6de3c 100644 --- a/abs/core/wireless_tools/PKGBUILD +++ b/abs/core/wireless_tools/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributer: Jason Chu <jchu@xentac.net> +# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jchu@xentac.net> + pkgname=wireless_tools pkgver=29 -pkgrel=2 -pkgdesc="Wireless Tools" -arch=(i686 x86_64) -url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" +pkgrel=6 +pkgdesc='Wireless Tools' +url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' +arch=('i686' 'x86_64') license=('GPL') -depends=('glibc') -backup=('etc/conf.d/wireless') -source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz wireless.conf.d) -md5sums=('e06c222e186f7cc013fd272d023710cb' - '027576534885b8d5dded9be546057b12') +source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz") +sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710') build() { - cd $startdir/src/wireless_tools.29 - make || return 1 - mkdir -p $startdir/pkg/usr/sbin - mkdir -p $startdir/pkg/usr/lib - mkdir -p $startdir/pkg/usr/include - mkdir -p $startdir/pkg/usr/man/man8 -# make INSTALL_DIR=$startdir/pkg/usr/sbin/ INSTALL_LIB=$startdir/pkg/usr/lib/ INSTALL_INC=$startdir/pkg/usr/include/ INSTALL_MAN=$startdir/pkg/usr/man/ install - make PREFIX=$startdir/pkg/usr install - install -D -m644 ../wireless.conf.d $startdir/pkg/etc/conf.d/wireless + cd "${srcdir}/${pkgname}.${pkgver}" + make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_LIB="${pkgdir}/usr/lib" \ + INSTALL_INC="${pkgdir}/usr/include" \ + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install } diff --git a/abs/core/wireless_tools/wireless.conf.d b/abs/core/wireless_tools/wireless.conf.d deleted file mode 100644 index 47540ef..0000000 --- a/abs/core/wireless_tools/wireless.conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# -# Settings for wireless cards -# -# For each wireless interface declared in INTERFACES (in rc.conf), declare -# a wlan_${IF} variable that contains the arguments to be passed to -# iwconfig(8). Then list the original interface name in the -# WLAN_INTERFACES array. -# - -#wlan_eth0="eth0 mode managed essid default" -#WLAN_INTERFACES=(eth0) - diff --git a/abs/core/wpa_actiond/PKGBUILD b/abs/core/wpa_actiond/PKGBUILD new file mode 100644 index 0000000..ea23e8b --- /dev/null +++ b/abs/core/wpa_actiond/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 155389 2012-04-03 08:18:09Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=wpa_actiond +pkgver=1.2 +pkgrel=1 +pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/wpa_actiond.git/" +license=('GPL') +depends=('glibc' 'wpa_supplicant') +source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz) +sha256sums=('578efa1141fbf1acb56efff8061f4ac7ab99f257f8a3e1588db51a8ce77ac2b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond" +} +# vim:set ts=2 sw=2 et: diff --git a/abs/core/wpa_supplicant/PKGBUILD b/abs/core/wpa_supplicant/PKGBUILD index 9a22a1b..5a7db18 100644 --- a/abs/core/wpa_supplicant/PKGBUILD +++ b/abs/core/wpa_supplicant/PKGBUILD @@ -1,42 +1,56 @@ -# $Id: PKGBUILD 90602 2010-09-13 18:07:52Z thomas $ +# $Id: PKGBUILD 162909 2012-07-03 19:16:48Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant -pkgver=0.7.3 +pkgver=1.0 pkgrel=1 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') -depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl') +depends=('openssl' 'dbus-core' 'readline' 'libnl') optdepends=('wpa_supplicant_gui: wpa_gui program') license=('GPL') groups=('base') -backup=('etc/wpa_supplicant.conf') -source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config) -sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d') +backup=('etc/wpa_supplicant/wpa_supplicant.conf') +source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz" + config hostap_allow-linking-with-libnl-3.2.patch) +md5sums=('8650f6aa23646ef634402552d0669640' + '380d8d1fe24bccb2a2636cb2a6038c39' + '473fb6b77909ec5a50b6f4d91370e86b') build() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}/" + + # from fedora + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd "${pkgname}" + cp "${srcdir}/config" ./.config + sed -i 's@/usr/local@$(PREFIX)@g' Makefile - make + + make PREFIX=/usr } package() { cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" make PREFIX=/usr DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc" - install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" + + install -d -m755 "${pkgdir}/etc/wpa_supplicant" + install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf" + install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 - install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" + install -d -m755 "${pkgdir}/usr/share/dbus-1/system-services" install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" - sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service - install -m755 -d "${pkgdir}/etc/dbus-1/system.d" + + install -d -m755 "${pkgdir}/etc/dbus-1/system.d" install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" + + install -d -m755 "${pkgdir}/usr/lib/systemd/system" + install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" } diff --git a/abs/core/wpa_supplicant/config b/abs/core/wpa_supplicant/config index 192e338..59da1e2 100644 --- a/abs/core/wpa_supplicant/config +++ b/abs/core/wpa_supplicant/config @@ -78,6 +78,11 @@ #CONFIG_DRIVER_RALINK=y # Driver interface for generic Linux wireless extensions +# Note: WEXT is deprecated in the current Linux kernel version and no new +# functionality is added to it. nl80211-based interface is the new +# replacement for WEXT and its use allows wpa_supplicant to properly control +# the driver to improve existing functionality like roaming and to support new +# functionality. CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface @@ -109,11 +114,6 @@ CONFIG_DRIVER_NL80211=y # Driver interface for development testing #CONFIG_DRIVER_TEST=y -# Include client MLME (management frame processing) for test driver -# This can be used to test MLME operations in hostapd with the test interface. -# space. -#CONFIG_CLIENT_MLME=y - # Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y @@ -123,6 +123,10 @@ CONFIG_DRIVER_WIRED=y # Driver interface for no driver (e.g., WPS ER only) #CONFIG_DRIVER_NONE=y +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + # Enable IEEE 802.1X Supplicant (automatically included if any EAP method is # included) CONFIG_IEEE8021X_EAPOL=y @@ -161,6 +165,9 @@ CONFIG_EAP_OTP=y # EAP-PSK (experimental; this is _not_ needed for WPA-PSK) #CONFIG_EAP_PSK=y +# EAP-pwd (secure authentication using only a password) +#CONFIG_EAP_PWD=y + # EAP-PAX #CONFIG_EAP_PAX=y @@ -190,6 +197,13 @@ CONFIG_EAP_LEAP=y # Wi-Fi Protected Setup (WPS) CONFIG_WPS=y +# Enable WSC 2.0 support +#CONFIG_WPS2=y +# Enable WPS external registrar functionality +#CONFIG_WPS_ER=y +# Disable credentials for an open network by default when acting as a WPS +# registrar. +#CONFIG_WPS_REG_DISABLE_OPEN=y # EAP-IKEv2 #CONFIG_EAP_IKEV2=y @@ -224,6 +238,10 @@ CONFIG_CTRL_IFACE=y # the resulting binary. CONFIG_READLINE=y +# Include internal line edit mode in wpa_cli. This can be used as a replacement +# for GNU Readline to provide limited command line editing and history support. +#CONFIG_WPA_CLI_EDIT=y + # Remove debugging code that is printing out debug message to stdout. # This can be used to reduce the size of the wpa_supplicant considerably # if debugging code is not needed. The size reduction can be around 35% @@ -305,18 +323,17 @@ CONFIG_PEERKEY=y # Select TLS implementation # openssl = OpenSSL (default) -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) +# gnutls = GnuTLS # internal = Internal TLSv1 implementation (experimental) # none = Empty template #CONFIG_TLS=openssl -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -# even though the core GnuTLS library is released under LGPL, this extra -# library uses GPL and as such, the terms of GPL apply to the combination -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -# apply for distribution of the resulting binary. -#CONFIG_GNUTLS_EXTRA=y +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. It should be noted that some existing TLS v1.0 -based +# implementation may not be compatible with TLS v1.1 message (ClientHello is +# sent prior to negotiating which version will be used) +#CONFIG_TLSV11=y # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of @@ -378,6 +395,11 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) CONFIG_DEBUG_FILE=y +# Send debug messages to syslog instead of stdout +#CONFIG_DEBUG_SYSLOG=y +# Set syslog facility for debug messages +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + # Enable privilege separation (see README 'Privilege separation' for details) #CONFIG_PRIVSEP=y @@ -389,7 +411,7 @@ CONFIG_DEBUG_FILE=y # This tracks use of memory allocations and other registrations and reports # incorrect use with a backtrace of call (or allocation) location. #CONFIG_WPA_TRACE=y -# For BSD, comment out these. +# For BSD, uncomment these. #LIBS += -lexecinfo #LIBS_p += -lexecinfo #LIBS_c += -lexecinfo @@ -398,7 +420,49 @@ CONFIG_DEBUG_FILE=y # This enables use of libbfd to get more detailed symbols for the backtraces # generated by CONFIG_WPA_TRACE=y. #CONFIG_WPA_TRACE_BFD=y -# For BSD, comment out these. +# For BSD, uncomment these. #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz + +# wpa_supplicant depends on strong random number generation being available +# from the operating system. os_get_random() function is used to fetch random +# data when needed, e.g., for key generation. On Linux and BSD systems, this +# works by reading /dev/urandom. It should be noted that the OS entropy pool +# needs to be properly initialized before wpa_supplicant is started. This is +# important especially on embedded devices that do not have a hardware random +# number generator and may by default start up with minimal entropy available +# for random number generation. +# +# As a safety net, wpa_supplicant is by default trying to internally collect +# additional entropy for generating random data to mix in with the data fetched +# from the OS. This by itself is not considered to be very strong, but it may +# help in cases where the system pool is not initialized properly. However, it +# is very strongly recommended that the system pool is initialized with enough +# entropy either by using hardware assisted random number generator or by +# storing state over device reboots. +# +# wpa_supplicant can be configured to maintain its own entropy store over +# restarts to enhance random number generation. This is not perfect, but it is +# much more secure than using the same sequence of random numbers after every +# reboot. This can be enabled with -e<entropy file> command line option. The +# specified file needs to be readable and writable by wpa_supplicant. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal wpa_supplicant random pool can be +# disabled. This will save some in binary size and CPU use. However, this +# should only be considered for builds that are known to be used on devices +# that meet the requirements described above. +CONFIG_NO_RANDOM_POOL=y + +# IEEE 802.11n (High Throughput) support (mainly for AP mode) +#CONFIG_IEEE80211N=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks (GAS/ANQP to learn more about the networks and network +# selection based on available credentials). +#CONFIG_INTERWORKING=y + +CONFIG_LIBNL32=y diff --git a/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 0000000..5d89039 --- /dev/null +++ b/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,12 @@ +diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak +--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 ++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 +@@ -48,7 +48,7 @@ NEED_RFKILL=y + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index c482e04..4c986ee 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -1,37 +1,35 @@ -# $Id: PKGBUILD 36085 2009-04-19 22:58:09Z eric $ +# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> -# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20110803 +pkgver=20120705 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') -optdepends=('gpac: For gpac support') -makedepends=('yasm' 'gpac') -source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${pkgver}-2245.tar.bz2) +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) +md5sums=('81e5bec5d5774a4a3f567f14bd94289c') build() { - cd "${srcdir}/${pkgname}-snapshot-${pkgver}-2245" || return 1 + cd "$pkgname-snapshot-$pkgver-2245-stable" - ./configure \ - --enable-visualize \ - --enable-shared \ - --enable-pic || return 1 + ./configure --enable-shared - make || return 1 + make } package() { - cd "${srcdir}/${pkgname}-snapshot-${pkgver}-2245" || return 1 - make DESTDIR="${pkgdir}" \ + cd "$pkgname-snapshot-$pkgver-2245-stable" + + make DESTDIR="$pkgdir" \ bindir=/usr/bin \ libdir=/usr/lib \ includedir=/usr/include \ - install || return 1 + install } # vim:set ts=2 sw=2 et: -md5sums=('6148c89b85b1136e8047882037a57c07') diff --git a/abs/core/xbitmaps/LICENSE b/abs/core/xbitmaps/LICENSE deleted file mode 100644 index c5fe9b0..0000000 --- a/abs/core/xbitmaps/LICENSE +++ /dev/null @@ -1,50 +0,0 @@ -Copyright 1988, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - - -/*****************************************************************************/ -/** Copyright 1988 by Evans & Sutherland Computer Corporation, **/ -/** Salt Lake City, Utah **/ -/** **/ -/** All Rights Reserved **/ -/** **/ -/** Permission to use, copy, modify, and distribute this software and **/ -/** its documentation for any purpose and without fee is hereby **/ -/** granted, provided that the above copyright notice appear in all **/ -/** copies and that both that copyright notice and this permis- **/ -/** sion notice appear in supporting documentation, and that the **/ -/** name of Evans & Sutherland not be used in advertising or publi- **/ -/** city pertaining to distribution of the software without specif- **/ -/** ic, written prior permission. **/ -/** **/ -/** EVANS & SUTHERLAND DISCLAIMS ALL WARRANTIES WITH REGARD TO **/ -/** THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILI- **/ -/** TY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND BE LIABLE **/ -/** FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAM- **/ -/** AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, **/ -/** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS **/ -/** ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PER- **/ -/** FORMANCE OF THIS SOFTWARE. **/ -/*****************************************************************************/ - diff --git a/abs/core/xbitmaps/PKGBUILD b/abs/core/xbitmaps/PKGBUILD index ba46954..2fc3e77 100644 --- a/abs/core/xbitmaps/PKGBUILD +++ b/abs/core/xbitmaps/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 56379 2009-10-21 19:00:03Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 151200 2012-02-25 07:27:18Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xbitmaps pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Bitmap files" arch=('any') url="http://xorg.freedesktop.org/" license=('custom') -makedepends=('pkgconfig') -source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2 LICENSE) +makedepends=('xorg-util-macros') +source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('578afff7e4912192b524c25254cf7f54c16e57d8') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -md5sums=('7444bbbd999b53bec6a60608a5301f4c' - '8d6c2d0109ea72abdcbf6846a908f399') diff --git a/abs/core/xcb-proto/PKGBUILD b/abs/core/xcb-proto/PKGBUILD index 5f4d1d3..81635de 100644 --- a/abs/core/xcb-proto/PKGBUILD +++ b/abs/core/xcb-proto/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 61568 2009-12-19 19:52:55Z jgc $ +# $Id: PKGBUILD 154172 2012-03-23 20:55:53Z andyrtr $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xcb-proto -pkgver=1.6 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="XML-XCB protocol descriptions" arch=(any) url="http://xcb.freedesktop.org/" license=('custom') makedepends=('python2' 'libxml2') -source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e82418557c7f59f29da9ec18e0906d6d78e3a164') +source=($url/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('82a568559235fc6e26d0a38911c5ea18f8e8455c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/abs/core/xcmiscproto/PKGBUILD b/abs/core/xcmiscproto/PKGBUILD index f7803b4..48eddf9 100644 --- a/abs/core/xcmiscproto/PKGBUILD +++ b/abs/core/xcmiscproto/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 97539 2010-10-31 15:37:25Z jgc $ +# $Id: PKGBUILD 154142 2012-03-23 17:22:50Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xcmiscproto -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="X11 XC-Miscellaneous extension wire protocol" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ff7ddb6e5698bf4461a524ca30f3b32e2a9dce8a') +sha1sums=('59ae9ec6414964440bf654b207618e5dd66a32fb') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/xdotool/PKGBUILD b/abs/core/xdotool/PKGBUILD index ca3b071..0ce58a3 100644 --- a/abs/core/xdotool/PKGBUILD +++ b/abs/core/xdotool/PKGBUILD @@ -4,10 +4,9 @@ pkgname=xdotool pkgver=2.20110530.1 -pkgrel=3 +pkgrel=1 pkgdesc="Command-line X11 automation tool" arch=('i686' 'x86_64') -epoch=3 url="http://www.semicomplete.com/projects/xdotool/" license=('BSD') depends=('libxtst' 'libxinerama') diff --git a/abs/core/xextproto/PKGBUILD b/abs/core/xextproto/PKGBUILD index 62cd13b..c7bdb79 100644 --- a/abs/core/xextproto/PKGBUILD +++ b/abs/core/xextproto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87593 2010-08-17 07:49:50Z jgc $ +# $Id: PKGBUILD 154144 2012-03-23 17:24:05Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xextproto -pkgver=7.1.2 +pkgver=7.2.1 pkgrel=1 pkgdesc="X11 various extension wire protocol" arch=('any') @@ -10,17 +10,16 @@ license=('custom') makedepends=('xmlto' 'xorg-util-macros' 'docbook-xsl') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('be6303a9449277af58f38e1be57e442d98f400fe') +sha1sums=('f969e02009adf2d51fd1ba4583a859984728a461') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff new file mode 100644 index 0000000..93c54d3 --- /dev/null +++ b/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff @@ -0,0 +1,27 @@ +From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 15 Mar 2012 05:46:32 +0000 +Subject: Fix inverted horizontal scroll (#46205) + +REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL. + +X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205> + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +--- +diff --git a/src/evdev.c b/src/evdev.c +index d540b87..8cf630c 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) + else if (axis == REL_DIAL) + SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE); + else if (axis == REL_HWHEEL) +- SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE); ++ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE); + #endif + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index c6776bd..00cdc8b 100644 --- a/abs/core/xf86-input-evdev/PKGBUILD +++ b/abs/core/xf86-input-evdev/PKGBUILD @@ -1,24 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 153700 2012-03-18 08:50:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev -pkgver=2.6.0 -pkgrel=4 +pkgver=2.7.0 +pkgrel=2 pkgdesc="X.org evdev input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.9.0') +makedepends=('xorg-server-devel>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + Fix_inverted_horizontal_scroll.diff) +sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa' + 'e959e710d9a0c60a3af967148b9d5e014544993c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff ./configure --prefix=/usr make } diff --git a/abs/core/xf86-video-vesa/PKGBUILD b/abs/core/xf86-video-vesa/PKGBUILD index 0b5dbf3..565aeab 100644 --- a/abs/core/xf86-video-vesa/PKGBUILD +++ b/abs/core/xf86-video-vesa/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 88551 2010-08-24 08:35:22Z jgc $ +# $Id: PKGBUILD 163838 2012-07-21 10:36:33Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vesa -pkgver=2.3.0 -pkgrel=3 +pkgver=2.3.2 +pkgrel=1 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel') -conflicts=('xorg-server<1.9.0') -groups=('xorg' 'xorg-video-drivers') +makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903') +conflicts=('xorg-server<1.11.99.903') +groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4689b7c295d7a8d7326302dafecb812739617134') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + revert-kernelcheck.patch) +sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' + 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/xf86-video-vesa/revert-kernelcheck.patch b/abs/core/xf86-video-vesa/revert-kernelcheck.patch new file mode 100644 index 0000000..37418cc --- /dev/null +++ b/abs/core/xf86-video-vesa/revert-kernelcheck.patch @@ -0,0 +1,31 @@ +From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 08 Dec 2010 18:45:32 +0000 +Subject: Refuse to load if there's a kernel driver bound to the device + +Ported from the equivalent check in nv. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/vesa.c b/src/vesa.c +index 168fde1..2523d76 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, + NULL, NULL, NULL, NULL, NULL); + if (pScrn != NULL) { +- VESAPtr pVesa = VESAGetRec(pScrn); ++ VESAPtr pVesa; + ++ if (pci_device_has_kernel_driver(dev)) { ++ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); ++ return FALSE; ++ } ++ ++ pVesa = VESAGetRec(pScrn); + VESAInitScrn(pScrn); + pVesa->pciInfo = dev; + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/core/xf86dgaproto/PKGBUILD b/abs/core/xf86dgaproto/PKGBUILD index ff665d0..fd610b7 100644 --- a/abs/core/xf86dgaproto/PKGBUILD +++ b/abs/core/xf86dgaproto/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 56536 2009-10-22 16:45:57Z jgc $ +# $Id: PKGBUILD 141646 2011-11-01 09:52:46Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86dgaproto pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Direct Graphics Access extension wire protocol" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +source=("${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2") md5sums=('a036dc2fcbf052ec10621fd48b68dbb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}" || return 1 + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xf86driproto/LICENSE b/abs/core/xf86driproto/LICENSE deleted file mode 100644 index 07a911b..0000000 --- a/abs/core/xf86driproto/LICENSE +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- - - -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -Copyright 2000 VA Linux Systems, Inc. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ diff --git a/abs/core/xf86driproto/PKGBUILD b/abs/core/xf86driproto/PKGBUILD index 197c37f..860e1e7 100644 --- a/abs/core/xf86driproto/PKGBUILD +++ b/abs/core/xf86driproto/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 50995 2009-09-04 12:48:43Z jgc $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 151192 2012-02-25 07:11:08Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=xf86driproto -pkgver=2.1.0 -pkgrel=1 +pkgver=2.1.1 +pkgrel=2 pkgdesc="X11 DRI extension wire protocol" -arch=(any) +arch=('any') +makedepends=('xorg-util-macros') url="http://xorg.freedesktop.org/" license=('custom') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2 - LICENSE) -sha1sums=('0dfc6616ffc68ca3c3b5decb1e365aaa93be8548' - '32bab65dd9c0b49333146abf16602967041b0d92') +source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('23e861f40ba0f0cbbfd7db7ba2ef623762ffca17') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xf86vidmodeproto/PKGBUILD b/abs/core/xf86vidmodeproto/PKGBUILD index c2e310e..19230e6 100644 --- a/abs/core/xf86vidmodeproto/PKGBUILD +++ b/abs/core/xf86vidmodeproto/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 56538 2009-10-22 16:47:03Z jgc $ +# $Id: PKGBUILD 151190 2012-02-25 07:08:10Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86vidmodeproto -pkgver=2.3 -pkgrel=1 +pkgver=2.3.1 +pkgrel=2 pkgdesc="X11 Video Mode extension wire protocol" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4434894fc7d4eeb4a22e6b876d56fdaa') +sha1sums=('11d54c3210887631ea71e8f8030a77692e964fc4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD index 8d2e53b..0f28ad9 100644 --- a/abs/core/xfsprogs/PKGBUILD +++ b/abs/core/xfsprogs/PKGBUILD @@ -1,23 +1,24 @@ -# $Id$ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $ +# pkgname=xfsprogs -pkgver=3.1.5 -pkgrel=1 +pkgver=3.1.8 +pkgrel=2 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') -depends=('util-linux-ng>=2.16') +depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('b1db37749e2b4149a0dd178abff956be') +md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG + ./configure --prefix=/usr make } @@ -26,4 +27,7 @@ package() { make DIST_ROOT="${pkgdir}" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir + # add hack as we cannot set rootlibdir + mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/" + rm -rf "${pkgdir}/lib" } diff --git a/abs/core/xineramaproto/PKGBUILD b/abs/core/xineramaproto/PKGBUILD index 2ce1b5d..68c7965 100644 --- a/abs/core/xineramaproto/PKGBUILD +++ b/abs/core/xineramaproto/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 151186 2012-02-25 07:05:52Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xineramaproto -pkgver=1.2 -pkgrel=1 +pkgver=1.2.1 +pkgrel=2 pkgdesc="X11 Xinerama extension wire protocol" -arch=(i686 x86_64) +arch=('any') url="http://xorg.freedesktop.org/" +license=('custom') +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('818bffc16139d6e3de4344c83f00c495d3536753') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -md5sums=('a8aadcb281b9c11a91303e24cdea45f5') diff --git a/abs/core/xkeyboard-config/PKGBUILD b/abs/core/xkeyboard-config/PKGBUILD index b9a9fb2..a0a0f80 100644 --- a/abs/core/xkeyboard-config/PKGBUILD +++ b/abs/core/xkeyboard-config/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 94925 2010-10-12 14:48:05Z jgc $ +# $Id: PKGBUILD 160209 2012-05-30 19:44:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=xkeyboard-config -pkgver=2.0 +pkgver=2.6 pkgrel=1 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" -depends=('xorg-xkb-utils') -makedepends=('intltool' 'pkgconfig') +depends=('xorg-xkbcomp') +makedepends=('intltool') provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(http://people.freedesktop.org/~svu/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bb8a98ee61cdc4bd835fdfd2b5cee3e6') +source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('22a1594116bf0ee3165f48487bdca4e5f25b2a1436e35e188b3ee38c543dabda') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,13 +23,13 @@ build() { --with-xkb-rules-symlink=xorg \ --enable-compat-rules=yes make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" + } + + package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/X11/xkb/compiled" install -m755 -d "${pkgdir}/var/lib/xkb" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/xorg-bdftopcf/PKGBUILD b/abs/core/xorg-bdftopcf/PKGBUILD new file mode 100644 index 0000000..af1cc4e --- /dev/null +++ b/abs/core/xorg-bdftopcf/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 150979 2012-02-24 12:29:18Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-bdftopcf +pkgver=1.0.3 +pkgrel=2 +pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxfont') +makedepends=('xorg-util-macros' 'xproto') +groups=('xorg' 'xorg-apps') +source=(http://xorg.freedesktop.org/archive/individual/app/bdftopcf-${pkgver}.tar.bz2) +sha1sums=('146b4ece2867479045c3b4593b22c9f1d21da14a') + +build() { + cd "${srcdir}/bdftopcf-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/bdftopcf-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-docs/PKGBUILD b/abs/core/xorg-docs/PKGBUILD new file mode 100644 index 0000000..94c8fc5 --- /dev/null +++ b/abs/core/xorg-docs/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 160907 2012-06-06 16:56:36Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-docs +pkgver=1.7 +pkgrel=1 +pkgdesc="X.org documentations" +arch=(any) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('man-db') +groups=('xorg') +source=(${url}/archive/individual/doc/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + cd "${pkgdir}/usr/share/licenses/${pkgname}" + ln -vsf /usr/share/doc/xorg-docs/License.xml . +} diff --git a/abs/core/xorg-font-util/PKGBUILD b/abs/core/xorg-font-util/PKGBUILD new file mode 100644 index 0000000..2589f10 --- /dev/null +++ b/abs/core/xorg-font-util/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 151743 2012-03-01 23:01:51Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-font-util +pkgver=1.3.0 +pkgrel=1 +pkgdesc='X.Org font utilities' +url='http://xorg.freedesktop.org/' +arch=('i686' 'x86_64') +license=('custom') +makedepends=('xorg-util-macros') +source=("${url}/releases/individual/font/font-util-${pkgver}.tar.bz2") +sha1sums=('a015f4c5a35d98af72835797293697e0eb9cd506') + +replaces=('font-util') +provides=('font-util') +conflicts=('font-util') +groups=('xorg-fonts' 'xorg') + +build() { + cd "${srcdir}/font-util-${pkgver}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-mapdir=/usr/share/fonts/util \ + --with-fontrootdir=/usr/share/fonts \ + + make +} + +package() { + cd "${srcdir}/font-util-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-font-utils/PKGBUILD b/abs/core/xorg-font-utils/PKGBUILD index 6fbb899..e646d3e 100644 --- a/abs/core/xorg-font-utils/PKGBUILD +++ b/abs/core/xorg-font-utils/PKGBUILD @@ -1,58 +1,12 @@ -# $Id: PKGBUILD 57485 2009-10-31 18:25:03Z jgc $ +# $Id: PKGBUILD 150983 2012-02-24 12:38:10Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-font-utils -pkgver=7.5 +pkgver=7.6 pkgrel=3 -pkgdesc="X.Org font utilities" -arch=('i686' 'x86_64') +pkgdesc="Transitional package depending on xorg font utilities" +arch=(any) url="http://xorg.freedesktop.org/" -license=('custom') -depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.16') -makedepends=('pkgconfig' 'bigreqsproto>=1.1.0') -replaces=('font-util') -provides=('font-util') -conflicts=('font-util') -install=xorg-font-utils.install -source=(${url}/releases/individual/app/bdftopcf-1.0.2.tar.bz2 - ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2 - ${url}/releases/individual/app/mkfontdir-1.0.5.tar.bz2 - ${url}/releases/individual/app/mkfontscale-1.0.7.tar.bz2 - ${url}/releases/individual/font/font-util-1.1.1.tar.bz2 - http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2 - ttmkfdir.patch - gcc-4.3.patch) -md5sums=('148f20d28caaa69bbe7dcca7c2674fb6' - '07607b26fce3bdc2b204ff3bc43d3ac3' - '9365ac66d19186eaf030482d312fca06' - '96ca346f185c0ab48e42bf5bb0375da5' - '5c735ae6916b65186f3c876d76c27ce3' - '79e0401393c9728865aa73bb2bd68dd4' - '099278628ad63631e872bc5590bade74' - '92ef5f77a467cc188f8dec87b0fdb664') - -build() { - cd "${srcdir}" - - for i in *; do - if [ -d "${i}" ]; then - pushd "${i}" - if [ "${i}" = "ttmkfdir2" ]; then - patch -Np0 -i "${srcdir}/ttmkfdir.patch" || return 1 - patch -Np1 -i "${srcdir}/gcc-4.3.patch" || return 1 - make || return 1 - install -m755 -d "${pkgdir}/usr/bin" - install -m755 ttmkfdir "${pkgdir}/usr/bin/" || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - echo "Unknown license" > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.ttmkfdir2" || return 1 - else - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1 - fi - popd - fi - done -} +license=('GPL') +depends=('xorg-bdftopcf' 'xorg-mkfontdir' 'xorg-mkfontscale' 'xorg-font-util') +md5sums=() diff --git a/abs/core/xorg-font-utils/gcc-4.3.patch b/abs/core/xorg-font-utils/gcc-4.3.patch deleted file mode 100644 index 817df3a..0000000 --- a/abs/core/xorg-font-utils/gcc-4.3.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ttmkfdir2/directory.cpp.orig 2008-12-05 10:45:28.000000000 +0100 -+++ ttmkfdir2/directory.cpp 2008-12-05 10:45:38.000000000 +0100 -@@ -1,4 +1,5 @@ - #include <cctype> -+#include <cstring> - #include <dirent.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/abs/core/xorg-font-utils/ttmkfdir.patch b/abs/core/xorg-font-utils/ttmkfdir.patch deleted file mode 100644 index 983c18b..0000000 --- a/abs/core/xorg-font-utils/ttmkfdir.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- encoding.cpp.orig Tue Mar 12 15:40:09 2002 -+++ encoding.cpp Sun Mar 21 22:33:00 2004 -@@ -2,7 +2,7 @@ - #include <cstdio> - #include <cstdlib> - #include <cstring> --#include "freetype/freetype.h" -+#include <ft2build.h> - - #include "ttmkfdir.h" - #include "encoding.h" - ---- encoding.h.orig Tue Mar 12 15:41:27 2002 -+++ encoding.h Sun Mar 21 22:35:15 2004 -@@ -6,7 +6,8 @@ - #include <map> - #include <string> - --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #include "util.h" - ---- ttf.h.orig Wed Mar 13 19:16:38 2002 -+++ ttf.h Sun Mar 21 22:30:16 2004 -@@ -3,15 +3,18 @@ - #define TTF_H__ - - #include <string> --#include "freetype/freetype.h" --#include "freetype/tttables.h" --#include "freetype/ftsnames.h" --#include "freetype/ttnameid.h" --#include "freetype/fterrors.h" --#include "freetype/ftmodule.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H -+#include FT_TRUETYPE_TABLES_H -+#include FT_SFNT_NAMES_H -+#include FT_TRUETYPE_IDS_H -+#include FT_ERRORS_H -+#include FT_MODULE_H - - #include "util.h" - #include "encoding.h" -+ -+using namespace std; - - namespace ttf { - ---- Makefile.orig Thu Mar 14 14:03:49 2002 -+++ Makefile Sun Jan 22 20:15:17 2006 -@@ -1,10 +1,7 @@ --FREETYPE_BASE=/usr/include/freetype2 --FREETYPE_INCL=-I$(FREETYPE_BASE)/. --FREETYPE_LIB=/usr/lib/libfreetype.so -- --DEBUG=-ggdb --CXX=g++ --CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) -+FREETYPE_INCL=`freetype-config --cflags` -+FREETYPE_LIB=`freetype-config --libs` - --LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -+CXXFLAGS+=$(FREETYPE_INCL) -+ -+LDFLAGS+=$(FREETYPE_LIB) - -@@ -21,3 +18,3 @@ - parser.cpp: encoding.l -- flex -i -8 -o$@ $< -+ lex -i -8 -o$@ $< - ---- ttf.cpp.orig 2002-11-07 06:30:04.000000000 +0100 -+++ ttf.cpp -@@ -226,7 +226,7 @@ Face::FontFamilyName (void) const - for (i = 0; i < n; i++) { - if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) { - std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl; -- return; -+ return "unknown"; - }; - platform = NamePtr.platform_id; - encoding = NamePtr.encoding_id; - diff --git a/abs/core/xorg-font-utils/xorg-font-utils.install b/abs/core/xorg-font-utils/xorg-font-utils.install deleted file mode 100644 index 067a3a2..0000000 --- a/abs/core/xorg-font-utils/xorg-font-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - ldconfig -r . -} diff --git a/abs/core/xorg-fonts-100dpi/PKGBUILD b/abs/core/xorg-fonts-100dpi/PKGBUILD index 514311a..aae5499 100644 --- a/abs/core/xorg-fonts-100dpi/PKGBUILD +++ b/abs/core/xorg-fonts-100dpi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $ +# $Id: PKGBUILD 150386 2012-02-17 11:05:50Z allan $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-100dpi pkgver=1.0.1 pkgrel=4 pkgdesc="X.org 100dpi fonts" -arch=(any) +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig') @@ -24,20 +24,27 @@ md5sums=('c754c3f4a5e08442bf6972b9466625ed' build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - for dir in font-*-100dpi*; do if [ -d "${dir}" ]; then pushd ${dir} ./configure --prefix=/usr \ --with-fontdir=/usr/share/fonts/100dpi - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1 + make popd fi done - rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* } +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in font-*-100dpi*; do + if [ -d "${dir}" ]; then + pushd ${dir} + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" + popd + fi + done + rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* +} diff --git a/abs/core/xorg-fonts-100dpi/xfonts.install b/abs/core/xorg-fonts-100dpi/xfonts.install index 9400b64..5c5e8a2 100644 --- a/abs/core/xorg-fonts-100dpi/xfonts.install +++ b/abs/core/xorg-fonts-100dpi/xfonts.install @@ -13,8 +13,3 @@ post_upgrade() { post_remove() { post_install $1 } - -op=$1 -shift - -$op $* diff --git a/abs/core/xorg-fonts-alias/LICENSE b/abs/core/xorg-fonts-alias/LICENSE index 76947d1..3c83d9f 100644 --- a/abs/core/xorg-fonts-alias/LICENSE +++ b/abs/core/xorg-fonts-alias/LICENSE @@ -46,4 +46,3 @@ from the XFree86 Project. OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - diff --git a/abs/core/xorg-fonts-alias/PKGBUILD b/abs/core/xorg-fonts-alias/PKGBUILD index fcc64d2..40f3ee5 100644 --- a/abs/core/xorg-fonts-alias/PKGBUILD +++ b/abs/core/xorg-fonts-alias/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57479 2009-10-31 18:08:56Z jgc $ +# $Id: PKGBUILD 141648 2011-11-01 09:57:08Z pierre $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-alias @@ -8,19 +8,19 @@ pkgdesc="X.org font alias files" arch=('any') url="http://xorg.freedesktop.org/" license=('custom') -source=(${url}/releases/individual/font/font-alias-${pkgver}.tar.bz2 LICENSE) +source=("${url}/releases/individual/font/font-alias-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('9d40dba6fb8cb58dacb433fc7bcaafca' + 'ff91ae6d96d76130482d04653e7a836a') build() { cd "${srcdir}/font-alias-${pkgver}" - ./configure --prefix=/usr --with-fontrootdir=/usr/share/fonts || return 1 - make || return 1 + ./configure --prefix=/usr --with-fontrootdir=/usr/share/fonts + make } + package() { cd "${srcdir}/font-alias-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } - -md5sums=('9d40dba6fb8cb58dacb433fc7bcaafca' - '8a4f7b210c3cf793f7b6de272f7b70d9') diff --git a/abs/core/xorg-fonts-encodings/PKGBUILD b/abs/core/xorg-fonts-encodings/PKGBUILD index c465a74..992e3ac 100644 --- a/abs/core/xorg-fonts-encodings/PKGBUILD +++ b/abs/core/xorg-fonts-encodings/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 57486 2009-10-31 18:28:17Z jgc $ +# $Id: PKGBUILD 152267 2012-03-06 08:39:49Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-encodings -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=3 pkgdesc="X.org font encoding files" arch=(any) url="http://xorg.freedesktop.org/" license=('custom') -depends=('xorg-font-utils') -install=xorg-fonts-encodings.install +makedepends=('xorg-mkfontscale' 'xorg-util-macros' 'xorg-font-util') +groups=('xorg-fonts' 'xorg') +options=(!makeflags) source=(${url}/releases/individual/font/encodings-${pkgver}.tar.bz2) -md5sums=('29637480e7ce12546668631067c19ced') +sha1sums=('24ace2470403f85a0d393769204029bd8247992a') build() { cd "${srcdir}/encodings-${pkgver}" - ./configure --prefix=/usr \ - --with-encodingsdir=/usr/share/fonts/encodings || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/encodings-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + + # regenerate encodngs file not to include non-compressed versions + cd $pkgdir/usr/share/fonts/encodings/large + mkfontscale -b -s -l -n -r -p /usr/share/fonts/encodings/large -e . . + cd $pkgdir/usr/share/fonts/encodings/ + mkfontscale -b -s -l -n -r -p /usr/share/fonts/encodings -e . -e large . } diff --git a/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install b/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install deleted file mode 100644 index 37eac40..0000000 --- a/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install +++ /dev/null @@ -1,16 +0,0 @@ -# arg 1: the new package version -post_install() { - echo -n "Regenerating font encodings... " - pushd usr/share/fonts/encodings &>/dev/null - mkfontscale -n -e "/usr/share/fonts/encodings" -e "/usr/share/fonts/encodings/large" - popd &>/dev/null - echo "done." -} - -post_upgrade() { - post_install -} - -op=$1 -shift -$op $* diff --git a/abs/core/xorg-fonts-misc/PKGBUILD b/abs/core/xorg-fonts-misc/PKGBUILD index 61a4a85..ad87867 100644 --- a/abs/core/xorg-fonts-misc/PKGBUILD +++ b/abs/core/xorg-fonts-misc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71692 2010-03-08 13:10:38Z jgc $ +# $Id: PKGBUILD 150380 2012-02-17 10:25:47Z allan $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-misc @@ -37,17 +37,27 @@ md5sums=('817ceb99636c873ad7679fe2a468678d' build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" for dir in *; do if [ -d "${dir}" ]; then pushd "${dir}" ./configure --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --with-fontdir=/usr/share/fonts/misc + make + popd + fi + done +} + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in *; do + if [ -d "${dir}" ]; then + pushd "${dir}" + make DESTDIR="${pkgdir}" install install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*} popd fi done rm -f ${pkgdir}/usr/share/fonts/*/fonts.* -} +}
\ No newline at end of file diff --git a/abs/core/xorg-fonts-misc/xfonts.install b/abs/core/xorg-fonts-misc/xfonts.install index 6b5cf74..7d21ab5 100644 --- a/abs/core/xorg-fonts-misc/xfonts.install +++ b/abs/core/xorg-fonts-misc/xfonts.install @@ -13,8 +13,3 @@ post_upgrade() { post_remove() { post_install $1 } - -op=$1 -shift - -$op $* diff --git a/abs/core/xorg-iceauth/PKGBUILD b/abs/core/xorg-iceauth/PKGBUILD new file mode 100644 index 0000000..9063e3a --- /dev/null +++ b/abs/core/xorg-iceauth/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-iceauth +pkgver=1.0.5 +pkgrel=1 +pkgdesc="ICE authority file utility" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libice') +makedepends=('xorg-util-macros' 'xproto') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) +sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') + +build() { + cd "${srcdir}/iceauth-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/iceauth-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-luit/PKGBUILD b/abs/core/xorg-luit/PKGBUILD index 69b019b..16f9ceb 100644 --- a/abs/core/xorg-luit/PKGBUILD +++ b/abs/core/xorg-luit/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: $ +# $Id: PKGBUILD 154146 2012-03-23 17:27:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-luit -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Filter that can be run between an arbitrary application and UTF-8 terminal emulator" -arch=('i686' 'x86_64') +pkgver=1.1.1 +pkgrel=1 +pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libfontenc') +groups=('xorg' 'xorg-apps') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2) -sha1sums=('fa974b417f6b65c241398d8d011207c6facb0766') +sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0') build() { cd "${srcdir}/luit-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/luit-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/xorg-mkfontdir/PKGBUILD b/abs/core/xorg-mkfontdir/PKGBUILD new file mode 100644 index 0000000..2089bd9 --- /dev/null +++ b/abs/core/xorg-mkfontdir/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 149832 2012-02-11 10:00:49Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-mkfontdir +pkgver=1.0.7 +pkgrel=1 +pkgdesc="Create an index of X font files in a directory" +arch=(any) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('sh' 'xorg-mkfontscale') +makedepends=('xorg-util-macros') +groups=('xorg' 'xorg-apps') +source=(http://xorg.freedesktop.org/archive/individual/app/mkfontdir-${pkgver}.tar.bz2) +sha1sums=('3c06dad8a5fbf7362b51fb7d6b1ab805eba40336') + +build() { + cd "${srcdir}/mkfontdir-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/mkfontdir-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-mkfontscale/PKGBUILD b/abs/core/xorg-mkfontscale/PKGBUILD new file mode 100644 index 0000000..089af1e --- /dev/null +++ b/abs/core/xorg-mkfontscale/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 149834 2012-02-11 10:04:54Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-mkfontscale +pkgver=1.1.0 +pkgrel=1 +pkgdesc="Create an index of scalable font files for X" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('freetype2' 'libfontenc') +makedepends=('xorg-util-macros' 'xproto') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) +sha1sums=('ba021369ae3b364ba083b9eb5e570e54b21fd583') + +build() { + cd "${srcdir}/mkfontscale-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/mkfontscale-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/abs/core/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff new file mode 100644 index 0000000..12c1101 --- /dev/null +++ b/abs/core/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff @@ -0,0 +1,116 @@ +--- xorg-server-1.12.1/exa/exa_glyphs.c 2012-03-30 04:57:25.000000000 +0200 ++++ xorg-server-1.12.1/exa_glyphs.c.new 2012-04-15 11:48:51.683214230 +0200 +@@ -686,6 +686,7 @@ + PixmapPtr pMaskPixmap = 0; + PicturePtr pMask = NULL; + ScreenPtr pScreen = pDst->pDrawable->pScreen; ++ ExaScreenPriv(pScreen); + int width = 0, height = 0; + int x, y; + int first_xOff = list->xOff, first_yOff = list->yOff; +@@ -697,7 +698,6 @@ + ExaGlyphBuffer buffer; + + if (maskFormat) { +- ExaScreenPriv(pScreen); + GCPtr pGC; + xRectangle rect; + +@@ -719,22 +719,20 @@ + maskFormat->depth, + CREATE_PIXMAP_USAGE_SCRATCH); + if (!pMaskPixmap) +- return; ++ goto fallback; + component_alpha = NeedsComponent(maskFormat->format); + pMask = CreatePicture(0, &pMaskPixmap->drawable, + maskFormat, CPComponentAlpha, &component_alpha, + serverClient, &error); +- if (!pMask || +- (!component_alpha && pExaScr->info->CheckComposite && +- !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))) ++ (*pScreen->DestroyPixmap) (pMaskPixmap); ++ if (!pMask) ++ goto fallback; ++ ++ if (!component_alpha && pExaScr->info->CheckComposite && ++ !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)) + { + PictFormatPtr argbFormat; + +- (*pScreen->DestroyPixmap) (pMaskPixmap); +- +- if (!pMask) +- return; +- + /* The driver can't seem to composite to a8, let's try argb (but + * without component-alpha) */ + FreePicture((pointer) pMask, (XID) 0); +@@ -748,15 +746,25 @@ + maskFormat->depth, + CREATE_PIXMAP_USAGE_SCRATCH); + if (!pMaskPixmap) +- return; ++ goto fallback; + + pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, + serverClient, &error); +- if (!pMask) { +- (*pScreen->DestroyPixmap) (pMaskPixmap); +- return; +- } ++ (*pScreen->DestroyPixmap) (pMaskPixmap); ++ if (!pMask) ++ goto fallback; + } ++ ++ if (pExaScr->info->CheckComposite && ++ (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) || ++ (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) && ++ (op != PictOpOver || ++ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) || ++ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) { ++ FreePicture ((pointer) pMask, (XID) 0); ++ goto fallback; ++ } ++ + pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen); + ValidateGC(&pMaskPixmap->drawable, pGC); + rect.x = 0; +@@ -769,6 +777,13 @@ + y = -extents.y1; + } + else { ++ if (pExaScr->info->CheckComposite && ++ !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) && ++ (op != PictOpOver || ++ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) || ++ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst))) ++ goto fallback; ++ + x = 0; + y = 0; + } +@@ -834,6 +849,10 @@ + xSrc + x - first_xOff, + ySrc + y - first_yOff, 0, 0, x, y, width, height); + FreePicture((pointer) pMask, (XID) 0); +- (*pScreen->DestroyPixmap) (pMaskPixmap); + } ++ ++ return; ++ ++fallback: ++ ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); + } +--- xorg-server-1.12.1/exa/exa_render.c 2012-03-30 04:57:25.000000000 +0200 ++++ xorg-server-1.12.1/exa_render.c.new 2012-04-15 11:50:35.272482047 +0200 +@@ -878,7 +878,7 @@ + Bool saveMaskRepeat = pMask ? pMask->repeat : 0; + RegionRec region; + +- if (pExaScr->swappedOut) ++ if (pExaScr->fallback_counter || pExaScr->swappedOut) + goto fallback; + + /* Remove repeat in source if useless */ diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD index 91144d8..747eeca 100644 --- a/abs/core/xorg-server/PKGBUILD +++ b/abs/core/xorg-server/PKGBUILD @@ -1,33 +1,51 @@ -# $Id: PKGBUILD 97822 2010-11-01 22:35:02Z jgc $ +# $Id: PKGBUILD 163203 2012-07-09 16:05:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.9.2 +pkgver=1.12.3 pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' + 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' + 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' + 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - xorg-redhat-die-ugly-pattern-die-die-die.patch + autoconfig-nvidia.patch + autoconfig-sis.patch + #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff + #git-fixes.patch xvfb-run xvfb-run.1 - 10-quirks.conf crash.patch) -md5sums=('5c8773499a6a8c1ddaedf33577ec9634' - '1a336eb22e27cbf443ec5a2ecddfa93c' - '52fd3effd80d7bc6c1660d4ecf23d31c' - '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') + 10-quirks.conf) +sha256sums=('3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe' + '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' + 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Get rid of the ugly pattern - patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" - patch -Np1 -i "${srcdir}/crash.patch" + # Use nouveau/nv/nvidia drivers for nvidia devices + patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + # Use unofficial imedia SiS driver for supported SiS devices + patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + + # fix glitches and crashes with EXA and cairo 1.12 + # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266 + # and reworked for 1.12.1 changes +# patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff + + # Add post-release patches from 1.12 branch +# patch -Np1 -i ${srcdir}/git-fixes.patch + + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -40,6 +58,9 @@ build() { --enable-xephyr \ --enable-glx-tls \ --enable-kdrive \ + --enable-kdrive-evdev \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ --enable-install-setuid \ --enable-config-udev \ --disable-config-dbus \ @@ -51,10 +72,10 @@ build() { --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-dri-driver-path=/usr/lib/xorg/modules/dri \ --with-fontrootdir=/usr/share/fonts make + # Disable subdirs for make install rule to make splitting easier sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ @@ -64,7 +85,7 @@ build() { package_xorg-server-common() { pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkb-utils' 'xorg-fonts-misc') + depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') cd "${srcdir}/${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -73,7 +94,7 @@ package_xorg-server-common() { make -C xkb DESTDIR="${pkgdir}" install-data install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/" + install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" install -m755 -d "${pkgdir}/usr/lib/xorg" install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" @@ -85,6 +106,7 @@ package_xorg-server() { backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') provides=('x-server') groups=('xorg') + conflicts=('nvidia-utils<=290.10') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -176,9 +198,3 @@ package_xorg-server-devel() { install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" } -md5sums=('5c8773499a6a8c1ddaedf33577ec9634' - '1a336eb22e27cbf443ec5a2ecddfa93c' - '52fd3effd80d7bc6c1660d4ecf23d31c' - '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' - 'f46bf7abb53b6d80b665c0c14c7346dd') diff --git a/abs/core/xorg-server/__changelog b/abs/core/xorg-server/__changelog deleted file mode 100644 index cd15789..0000000 --- a/abs/core/xorg-server/__changelog +++ /dev/null @@ -1 +0,0 @@ -add patch to stop xorg from crashing with qt diff --git a/abs/core/xorg-server/autoconfig-nvidia.patch b/abs/core/xorg-server/autoconfig-nvidia.patch new file mode 100644 index 0000000..6d5220a --- /dev/null +++ b/abs/core/xorg-server/autoconfig-nvidia.patch @@ -0,0 +1,28 @@ +diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c +--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 ++++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 +@@ -1144,7 +1144,23 @@ + int idx = 0; + + #ifdef __linux__ +- driverList[idx++] = "nouveau"; ++ switch (dev->device_id) ++ { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[idx++] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[idx++] = "nouveau"; ++ break; ++ default: ++ driverList[idx++] = "nouveau"; ++ driverList[idx++] = "nvidia"; ++ break; ++ } + #endif + driverList[idx++] = "nv"; + break; diff --git a/abs/core/xorg-server/autoconfig-sis.patch b/abs/core/xorg-server/autoconfig-sis.patch new file mode 100644 index 0000000..0b50049 --- /dev/null +++ b/abs/core/xorg-server/autoconfig-sis.patch @@ -0,0 +1,21 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: + driverList[0] = "siliconmotion"; + break; diff --git a/abs/core/xorg-server/crash.patch b/abs/core/xorg-server/crash.patch deleted file mode 100644 index 1e10d1a..0000000 --- a/abs/core/xorg-server/crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Xext/panoramiXprocs.c -+++ b/Xext/panoramiXprocs.c -@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client) - rep.dstX = x - pDst->drawable.x; - rep.dstY = y - pDst->drawable.y; - if((pDst == screenInfo.screens[0]->root) || -- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) -+ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid)) - { - rep.dstX += screenInfo.screens[0]->x; - rep.dstY += screenInfo.screens[0]->y; diff --git a/abs/core/xorg-server/git-fixes.patch b/abs/core/xorg-server/git-fixes.patch new file mode 100644 index 0000000..f6ca242 --- /dev/null +++ b/abs/core/xorg-server/git-fixes.patch @@ -0,0 +1,1717 @@ +From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Wed, 11 Apr 2012 16:28:21 +0000 +Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly + +Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the +function definition for xf86VidModeNotifyEvent had an extra ');' +before the prototype argument declarations. This was harmless for the +compiler as the code never gets used, but completely messed up the +file re-indentation. This patch removes the spurious characters in +preparation for re-indenting the file. + +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4) +--- +diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c +index 6e2a8e9..9f64f8e 100644 +--- a/hw/xfree86/dixmods/extmod/xf86vmode.c ++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c +@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; + #ifdef XF86VIDMODE_EVENTS + static int XF86VidModeEventBase = 0; + +-static void SXF86VidModeNotifyEvent(); ++static void SXF86VidModeNotifyEvent( + xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ + ); + +-- +cgit v0.9.0.2-2-gbebe +From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Wed, 11 Apr 2012 16:33:54 +0000 +Subject: hw/xfree86: Re-indent xf86vmode.c + +This is the result of re-running the 'x-indent.sh' script over +xf86vmode.c to clean up the disaster caused by broken syntax in the +file. + +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc) +--- +diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c +index 9f64f8e..68c4b58 100644 +--- a/hw/xfree86/dixmods/extmod/xf86vmode.c ++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c +@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; + #ifdef XF86VIDMODE_EVENTS + static int XF86VidModeEventBase = 0; + +-static void SXF86VidModeNotifyEvent( +-xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ ++static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ + ); + + static RESTYPE EventType; /* resource type for event masks */ +@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec; + #define DEBUG_P(x) /**/ + #endif + static int +- ClientMajorVersion(ClientPtr client) { ++ClientMajorVersion(ClientPtr client) ++{ + VidModePrivPtr pPriv; + +- pPriv = VM_GETPRIV(client); ++ pPriv = VM_GETPRIV(client); + if (!pPriv) +- return 0; ++ return 0; + else +- return pPriv->major; ++ return pPriv->major; + } ++ + #ifdef XF86VIDMODE_EVENTS + static void +- CheckScreenPrivate(pScreen) ++CheckScreenPrivate(pScreen) + ScreenPtr +- pScreen; ++ pScreen; + { + SetupScreen(pScreen); + +@@ -142,9 +143,10 @@ ScreenPtr + } + } + +-static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen) ++static XF86VidModeScreenPrivatePtr ++MakeScreenPrivate(pScreen) + ScreenPtr +- pScreen; ++ pScreen; + { + SetupScreen(pScreen); + +@@ -160,18 +162,22 @@ ScreenPtr + } + + static unsigned long +- getEventMask(ScreenPtr pScreen, ClientPtr client) { ++getEventMask(ScreenPtr pScreen, ClientPtr client) ++{ + SetupScreen(pScreen); + XF86VidModeEventPtr pEv; + + if (!pPriv) +- return 0; ++ return 0; + for (pEv = pPriv->events; pEv; pEv = pEv->next) + if (pEv->client == client) + return pEv->mask; +- return 0; +-} static Bool +- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) { ++ return 0; ++} ++ ++static Bool ++setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) ++{ + SetupScreen(pScreen); + XF86VidModeEventPtr pEv, *pPrev; + +@@ -181,7 +187,8 @@ static unsigned long + pPriv = MakeScreenPrivate(pScreen); + if (!pPriv) + return FALSE; +- } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) ++ } ++ for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) + if (pEv->client == client) + break; + if (mask == 0) { +@@ -208,38 +215,43 @@ static unsigned long + } + + static int +- XF86VidModeFreeEvents(pointer value, XID id) { ++XF86VidModeFreeEvents(pointer value, XID id) ++{ + XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value; + ScreenPtr pScreen = pOld->screen; +- SetupScreen(pScreen); ++ ++ SetupScreen(pScreen); + XF86VidModeEventPtr pEv, *pPrev; + + if (!pPriv) +- return TRUE; ++ return TRUE; + for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) + if (pEv == pOld) + break; + if (!pEv) +- return TRUE; ++ return TRUE; + *pPrev = pEv->next; +- free(pEv); +- CheckScreenPrivate(pScreen); +- return TRUE; +-} static void +- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) { ++ free(pEv); ++ CheckScreenPrivate(pScreen); ++ return TRUE; ++} ++ ++static void ++SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) ++{ + XF86VidModeScreenPrivatePtr pPriv; + XF86VidModeEventPtr pEv; + unsigned long mask; + xXF86VidModeNotifyEvent ev; + int kind; + +- UpdateCurrentTimeIf(); +- mask = XF86VidModeNotifyMask; +- pScreen = screenInfo.screens[pScreen->myNum]; +- pPriv = GetScreenPrivate(pScreen); ++ UpdateCurrentTimeIf(); ++ mask = XF86VidModeNotifyMask; ++ pScreen = screenInfo.screens[pScreen->myNum]; ++ pPriv = GetScreenPrivate(pScreen); + if (!pPriv) +- return; +- kind = XF86VidModeModeChange; ++ return; ++ kind = XF86VidModeModeChange; + for (pEv = pPriv->events; pEv; pEv = pEv->next) { + if (!(pEv->mask & mask)) + continue; +@@ -251,8 +263,10 @@ static int + ev.forced = forced; + WriteEventsToClient(pEv->client, 1, (xEvent *) &ev); + }} static void +- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, +- xXF86VidModeNotifyEvent * to) { ++ ++SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, ++ xXF86VidModeNotifyEvent * to) ++{ + to->type = from->type; + to->state = from->state; + cpswaps(from->sequenceNumber, to->sequenceNumber); +@@ -264,29 +278,31 @@ static int + #endif + + static int +- ProcXF86VidModeQueryVersion(ClientPtr client) { ++ProcXF86VidModeQueryVersion(ClientPtr client) ++{ + xXF86VidModeQueryVersionReply rep; + +- DEBUG_P("XF86VidModeQueryVersion"); ++ DEBUG_P("XF86VidModeQueryVersion"); + +- REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); +- rep.type = X_Reply; +- rep.length = 0; +- rep.sequenceNumber = client->sequence; +- rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; +- rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; ++ REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; ++ rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swaps(&rep.majorVersion); + swaps(&rep.minorVersion); +- } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), +- (char *) &rep); ++ } ++ WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep); + return Success; + } + + static int +- ProcXF86VidModeGetModeLine(ClientPtr client) { ++ProcXF86VidModeGetModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetModeLineReq); + xXF86VidModeGetModeLineReply rep; + xXF86OldVidModeGetModeLineReply oldrep; +@@ -294,11 +310,11 @@ static int + int dotClock; + int ver; + +- DEBUG_P("XF86VidModeGetModeline"); ++ DEBUG_P("XF86VidModeGetModeline"); + +- ver = ClientMajorVersion(client); +- REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); +- rep.type = X_Reply; ++ ver = ClientMajorVersion(client); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); ++ rep.type = X_Reply; + if (ver < 2) { + rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) - + SIZEOF(xGenericReply)); +@@ -386,7 +402,8 @@ static int + } + + static int +- ProcXF86VidModeGetAllModeLines(ClientPtr client) { ++ProcXF86VidModeGetAllModeLines(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetAllModeLinesReq); + xXF86VidModeGetAllModeLinesReply rep; + xXF86VidModeModeInfo mdinf; +@@ -395,38 +412,39 @@ static int + int modecount, dotClock; + int ver; + +- DEBUG_P("XF86VidModeGetAllModelines"); ++ DEBUG_P("XF86VidModeGetAllModelines"); + +- REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + +- modecount = VidModeGetNumOfModes(stuff->screen); ++ modecount = VidModeGetNumOfModes(stuff->screen); + if (modecount < 1) +- return VidModeErrorBase + XF86VidModeExtensionDisabled; ++ return VidModeErrorBase + XF86VidModeExtensionDisabled; + + if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) +- return BadValue; ++ return BadValue; + +- rep.type = X_Reply; +- rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - ++ rep.type = X_Reply; ++ rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - + SIZEOF(xGenericReply); + if (ver < 2) +- rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); ++ rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); + else +- rep.length += modecount * sizeof(xXF86VidModeModeInfo); +- rep.length >>= 2; +- rep.sequenceNumber = client->sequence; +- rep.modecount = modecount; ++ rep.length += modecount * sizeof(xXF86VidModeModeInfo); ++ rep.length >>= 2; ++ rep.sequenceNumber = client->sequence; ++ rep.modecount = modecount; + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.modecount); +- } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), +- (char *) &rep); ++ } ++ WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), ++ (char *) &rep); + + do { + mdinf.dotclock = dotClock; +@@ -492,7 +510,8 @@ static int + && VidModeGetModeValue(mode, VIDMODE_FLAGS) == stuff->flags ) + + static int +- ProcXF86VidModeAddModeLine(ClientPtr client) { ++ProcXF86VidModeAddModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeAddModeLineReq); + xXF86OldVidModeAddModeLineReq *oldstuff = + (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; +@@ -502,9 +521,9 @@ static int + int dotClock; + int ver; + +- DEBUG_P("XF86VidModeAddModeline"); ++ DEBUG_P("XF86VidModeAddModeline"); + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + /* convert from old format */ + stuff = &newstuff; +@@ -533,7 +552,8 @@ static int + stuff->after_vsyncend = oldstuff->after_vsyncend; + stuff->after_vtotal = oldstuff->after_vtotal; + stuff->after_flags = oldstuff->after_flags; +- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { ++ } ++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { + ErrorF("AddModeLine - scrn: %d clock: %ld\n", + (int) stuff->screen, (unsigned long) stuff->dotclock); + ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", +@@ -654,7 +674,8 @@ static int + } + + static int +- ProcXF86VidModeDeleteModeLine(ClientPtr client) { ++ProcXF86VidModeDeleteModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeDeleteModeLineReq); + xXF86OldVidModeDeleteModeLineReq *oldstuff = + (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; +@@ -663,9 +684,9 @@ static int + int len, dotClock; + int ver; + +- DEBUG_P("XF86VidModeDeleteModeline"); ++ DEBUG_P("XF86VidModeDeleteModeline"); + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + /* convert from old format */ + stuff = &newstuff; +@@ -683,7 +704,8 @@ static int + stuff->vtotal = oldstuff->vtotal; + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; +- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { ++ } ++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { + ErrorF("DeleteModeLine - scrn: %d clock: %ld\n", + (int) stuff->screen, (unsigned long) stuff->dotclock); + ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", +@@ -777,7 +799,8 @@ static int + } + + static int +- ProcXF86VidModeModModeLine(ClientPtr client) { ++ProcXF86VidModeModModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeModModeLineReq); + xXF86OldVidModeModModeLineReq *oldstuff = + (xXF86OldVidModeModModeLineReq *) client->requestBuffer; +@@ -786,9 +809,9 @@ static int + int len, dotClock; + int ver; + +- DEBUG_P("XF86VidModeModModeline"); ++ DEBUG_P("XF86VidModeModModeline"); + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + /* convert from old format */ + stuff = &newstuff; +@@ -805,7 +828,8 @@ static int + stuff->vtotal = oldstuff->vtotal; + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; +- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { ++ } ++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { + ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n", + (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart, + stuff->hsyncend, stuff->htotal); +@@ -903,7 +927,8 @@ static int + } + + static int +- ProcXF86VidModeValidateModeLine(ClientPtr client) { ++ProcXF86VidModeValidateModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeValidateModeLineReq); + xXF86OldVidModeValidateModeLineReq *oldstuff = + (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; +@@ -913,9 +938,9 @@ static int + int len, status, dotClock; + int ver; + +- DEBUG_P("XF86VidModeValidateModeline"); ++ DEBUG_P("XF86VidModeValidateModeline"); + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + /* convert from old format */ + stuff = &newstuff; +@@ -933,7 +958,8 @@ static int + stuff->vtotal = oldstuff->vtotal; + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; +- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { ++ } ++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { + ErrorF("ValidateModeLine - scrn: %d clock: %ld\n", + (int) stuff->screen, (unsigned long) stuff->dotclock); + ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", +@@ -1022,7 +1048,8 @@ static int + } + + static int +- ProcXF86VidModeSwitchMode(ClientPtr client) { ++ProcXF86VidModeSwitchMode(ClientPtr client) ++{ + REQUEST(xXF86VidModeSwitchModeReq); + + DEBUG_P("XF86VidModeSwitchMode"); +@@ -1035,8 +1062,11 @@ static int + VidModeZoomViewport(stuff->screen, (short) stuff->zoom); + + return Success; +-} static int +- ProcXF86VidModeSwitchToMode(ClientPtr client) { ++} ++ ++static int ++ProcXF86VidModeSwitchToMode(ClientPtr client) ++{ + REQUEST(xXF86VidModeSwitchToModeReq); + xXF86OldVidModeSwitchToModeReq *oldstuff = + (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer; +@@ -1045,9 +1075,9 @@ static int + int len, dotClock; + int ver; + +- DEBUG_P("XF86VidModeSwitchToMode"); ++ DEBUG_P("XF86VidModeSwitchToMode"); + +- ver = ClientMajorVersion(client); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + /* convert from old format */ + stuff = &newstuff; +@@ -1065,7 +1095,8 @@ static int + stuff->vtotal = oldstuff->vtotal; + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; +- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { ++ } ++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { + ErrorF("SwitchToMode - scrn: %d clock: %ld\n", + (int) stuff->screen, (unsigned long) stuff->dotclock); + ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", +@@ -1138,7 +1169,8 @@ static int + } + + static int +- ProcXF86VidModeLockModeSwitch(ClientPtr client) { ++ProcXF86VidModeLockModeSwitch(ClientPtr client) ++{ + REQUEST(xXF86VidModeLockModeSwitchReq); + + REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); +@@ -1152,53 +1184,57 @@ static int + return VidModeErrorBase + XF86VidModeZoomLocked; + + return Success; +-} static int +- ProcXF86VidModeGetMonitor(ClientPtr client) { ++} ++ ++static int ++ProcXF86VidModeGetMonitor(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetMonitorReq); + xXF86VidModeGetMonitorReply rep; + CARD32 *hsyncdata, *vsyncdata; + int i, nHsync, nVrefresh; + pointer monitor; + +- DEBUG_P("XF86VidModeGetMonitor"); ++ DEBUG_P("XF86VidModeGetMonitor"); + +- REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + + if (!VidModeGetMonitor(stuff->screen, &monitor)) +- return BadValue; ++ return BadValue; + +- nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; +- nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; ++ nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; ++ nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; + +- rep.type = X_Reply; ++ rep.type = X_Reply; + if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr) +- rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, +- VIDMODE_MON_VENDOR, +- 0)).ptr); ++ rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, ++ VIDMODE_MON_VENDOR, ++ 0)).ptr); + else +- rep.vendorLength = 0; ++ rep.vendorLength = 0; + if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr) +- rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, +- VIDMODE_MON_MODEL, +- 0)).ptr); ++ rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, ++ VIDMODE_MON_MODEL, ++ 0)).ptr); + else +- rep.modelLength = 0; +- rep.length = ++ rep.modelLength = 0; ++ rep.length = + bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) - + SIZEOF(xGenericReply) + (nHsync + + nVrefresh) * sizeof(CARD32) + + pad_to_int32(rep.vendorLength) + + pad_to_int32(rep.modelLength)); +- rep.sequenceNumber = client->sequence; +- rep.nhsync = nHsync; +- rep.nvsync = nVrefresh; +- hsyncdata = malloc(nHsync * sizeof(CARD32)); ++ rep.sequenceNumber = client->sequence; ++ rep.nhsync = nHsync; ++ rep.nvsync = nVrefresh; ++ hsyncdata = malloc(nHsync * sizeof(CARD32)); + if (!hsyncdata) { + return BadAlloc; +- } vsyncdata = malloc(nVrefresh * sizeof(CARD32)); ++ } ++ vsyncdata = malloc(nVrefresh * sizeof(CARD32)); + + if (!vsyncdata) { + free(hsyncdata); +@@ -1208,19 +1244,18 @@ static int + for (i = 0; i < nHsync; i++) { + hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, + VIDMODE_MON_HSYNC_LO, +- i)). +- f | (unsigned +- short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, +- i)).f << 16; ++ i)).f | ++ (unsigned ++ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, ++ i)).f << 16; + } + for (i = 0; i < nVrefresh; i++) { + vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, + VIDMODE_MON_VREFRESH_LO, +- i)). +- f | (unsigned +- short) (VidModeGetMonitorValue(monitor, +- VIDMODE_MON_VREFRESH_HI, +- i)).f << 16; ++ i)).f | ++ (unsigned ++ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI, ++ i)).f << 16; + } + + if (client->swapped) { +@@ -1249,38 +1284,40 @@ static int + } + + static int +- ProcXF86VidModeGetViewPort(ClientPtr client) { ++ProcXF86VidModeGetViewPort(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetViewPortReq); + xXF86VidModeGetViewPortReply rep; + int x, y; + +- DEBUG_P("XF86VidModeGetViewPort"); ++ DEBUG_P("XF86VidModeGetViewPort"); + +- REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- rep.type = X_Reply; +- rep.length = 0; +- rep.sequenceNumber = client->sequence; ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; + +- VidModeGetViewPort(stuff->screen, &x, &y); +- rep.x = x; +- rep.y = y; ++ VidModeGetViewPort(stuff->screen, &x, &y); ++ rep.x = x; ++ rep.y = y; + + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.x); + swapl(&rep.y); +- } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), +- (char *) &rep); ++ } ++ WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep); + return Success; + } + + static int +- ProcXF86VidModeSetViewPort(ClientPtr client) { ++ProcXF86VidModeSetViewPort(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetViewPortReq); + + DEBUG_P("XF86VidModeSetViewPort"); +@@ -1294,8 +1331,11 @@ static int + return BadValue; + + return Success; +-} static int +- ProcXF86VidModeGetDotClocks(ClientPtr client) { ++} ++ ++static int ++ProcXF86VidModeGetDotClocks(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetDotClocksReq); + xXF86VidModeGetDotClocksReply rep; + int n; +@@ -1304,31 +1344,33 @@ static int + int *Clocks = NULL; + Bool ClockProg; + +- DEBUG_P("XF86VidModeGetDotClocks"); ++ DEBUG_P("XF86VidModeGetDotClocks"); + +- REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); ++ numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); + +- rep.type = X_Reply; +- rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) +- - SIZEOF(xGenericReply) + numClocks); +- rep.sequenceNumber = client->sequence; +- rep.clocks = numClocks; +- rep.maxclocks = MAXCLOCKS; +- rep.flags = 0; ++ rep.type = X_Reply; ++ rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) ++ - SIZEOF(xGenericReply) + numClocks); ++ rep.sequenceNumber = client->sequence; ++ rep.clocks = numClocks; ++ rep.maxclocks = MAXCLOCKS; ++ rep.flags = 0; + + if (!ClockProg) { + Clocks = malloc(numClocks * sizeof(int)); + if (!Clocks) +- return BadValue; ++ return BadValue; + if (!VidModeGetClocks(stuff->screen, Clocks)) { + free(Clocks); + return BadValue; +- }} if (ClockProg) { ++ } ++ } ++ if (ClockProg) { + rep.flags |= CLKFLAG_PROGRAMABLE; + } + if (client->swapped) { +@@ -1356,7 +1398,8 @@ static int + } + + static int +- ProcXF86VidModeSetGamma(ClientPtr client) { ++ProcXF86VidModeSetGamma(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetGammaReq); + + DEBUG_P("XF86VidModeSetGamma"); +@@ -1372,79 +1415,89 @@ static int + return BadValue; + + return Success; +-} static int +- ProcXF86VidModeGetGamma(ClientPtr client) { ++} ++ ++static int ++ProcXF86VidModeGetGamma(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetGammaReq); + xXF86VidModeGetGammaReply rep; + float red, green, blue; + +- DEBUG_P("XF86VidModeGetGamma"); ++ DEBUG_P("XF86VidModeGetGamma"); + +- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- rep.type = X_Reply; +- rep.length = 0; +- rep.sequenceNumber = client->sequence; ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; + if (!VidModeGetGamma(stuff->screen, &red, &green, &blue)) +- return BadValue; +- rep.red = (CARD32) (red * 10000.); +- rep.green = (CARD32) (green * 10000.); +- rep.blue = (CARD32) (blue * 10000.); ++ return BadValue; ++ rep.red = (CARD32) (red * 10000.); ++ rep.green = (CARD32) (green * 10000.); ++ rep.blue = (CARD32) (blue * 10000.); + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.red); + swapl(&rep.green); + swapl(&rep.blue); +- } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); ++ } ++ WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); + + return Success; + } + + static int +- ProcXF86VidModeSetGammaRamp(ClientPtr client) { ++ProcXF86VidModeSetGammaRamp(ClientPtr client) ++{ + CARD16 *r, *g, *b; + int length; +- REQUEST(xXF86VidModeSetGammaRampReq); ++ ++ REQUEST(xXF86VidModeSetGammaRampReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + + if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) +- return BadValue; ++ return BadValue; + +- length = (stuff->size + 1) & ~1; ++ length = (stuff->size + 1) & ~1; + +- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); ++ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); + +- r = (CARD16 *) &stuff[1]; +- g = r + length; +- b = g + length; ++ r = (CARD16 *) &stuff[1]; ++ g = r + length; ++ b = g + length; + + if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b)) +- return BadValue; ++ return BadValue; + +- return Success; +-} static int +- ProcXF86VidModeGetGammaRamp(ClientPtr client) { ++ return Success; ++} ++ ++static int ++ProcXF86VidModeGetGammaRamp(ClientPtr client) ++{ + CARD16 *ramp = NULL; + int length; + size_t ramplen = 0; + xXF86VidModeGetGammaRampReply rep; +- REQUEST(xXF86VidModeGetGammaRampReq); ++ ++ REQUEST(xXF86VidModeGetGammaRampReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + + if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) +- return BadValue; ++ return BadValue; + +- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); + +- length = (stuff->size + 1) & ~1; ++ length = (stuff->size + 1) & ~1; + + if (stuff->size) { + ramplen = length * 3 * sizeof(CARD16); +@@ -1455,7 +1508,9 @@ static int + ramp, ramp + length, ramp + (length * 2))) { + free(ramp); + return BadValue; +- }} rep.type = X_Reply; ++ } ++ } ++ rep.type = X_Reply; + rep.length = (length >> 1) * 3; + rep.sequenceNumber = client->sequence; + rep.size = stuff->size; +@@ -1476,47 +1531,53 @@ static int + } + + static int +- ProcXF86VidModeGetGammaRampSize(ClientPtr client) { ++ProcXF86VidModeGetGammaRampSize(ClientPtr client) ++{ + xXF86VidModeGetGammaRampSizeReply rep; +- REQUEST(xXF86VidModeGetGammaRampSizeReq); ++ ++ REQUEST(xXF86VidModeGetGammaRampSizeReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); + +- rep.type = X_Reply; +- rep.length = 0; +- rep.sequenceNumber = client->sequence; +- rep.size = VidModeGetGammaRampSize(stuff->screen); ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.size = VidModeGetGammaRampSize(stuff->screen); + if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swaps(&rep.size); +- } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), +- (char *) &rep); ++ } ++ WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), ++ (char *) &rep); + + return Success; + } + + static int +- ProcXF86VidModeGetPermissions(ClientPtr client) { ++ProcXF86VidModeGetPermissions(ClientPtr client) ++{ + xXF86VidModeGetPermissionsReply rep; +- REQUEST(xXF86VidModeGetPermissionsReq); ++ ++ REQUEST(xXF86VidModeGetPermissionsReq); + + if (stuff->screen >= screenInfo.numScreens) +- return BadValue; ++ return BadValue; + +- REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); + +- rep.type = X_Reply; +- rep.length = 0; +- rep.sequenceNumber = client->sequence; +- rep.permissions = XF86VM_READ_PERMISSION; ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.permissions = XF86VM_READ_PERMISSION; + if (xf86GetVidModeEnabled() && + (xf86GetVidModeAllowNonLocal() || LocalClient(client))) { + rep.permissions |= XF86VM_WRITE_PERMISSION; +- } if (client->swapped) { ++ } ++ if (client->swapped) { + swaps(&rep.sequenceNumber); + swapl(&rep.length); + swapl(&rep.permissions); +@@ -1528,21 +1589,23 @@ static int + } + + static int +- ProcXF86VidModeSetClientVersion(ClientPtr client) { ++ProcXF86VidModeSetClientVersion(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetClientVersionReq); + + VidModePrivPtr pPriv; + +- DEBUG_P("XF86VidModeSetClientVersion"); ++ DEBUG_P("XF86VidModeSetClientVersion"); + +- REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); ++ REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); + + if ((pPriv = VM_GETPRIV(client)) == NULL) { + pPriv = malloc(sizeof(VidModePrivRec)); + if (!pPriv) + return BadAlloc; + VM_SETPRIV(client, pPriv); +- } pPriv->major = stuff->major; ++ } ++ pPriv->major = stuff->major; + + pPriv->minor = stuff->minor; + +@@ -1550,85 +1613,103 @@ static int + } + + static int +- ProcXF86VidModeDispatch(ClientPtr client) { ++ProcXF86VidModeDispatch(ClientPtr client) ++{ + REQUEST(xReq); + switch (stuff->data) { + case X_XF86VidModeQueryVersion: + return ProcXF86VidModeQueryVersion(client); +- case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client); +- case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client); +- case X_XF86VidModeGetAllModeLines:return +- ProcXF86VidModeGetAllModeLines(client); +- case X_XF86VidModeValidateModeLine:return +- ProcXF86VidModeValidateModeLine(client); +- case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client); +- case X_XF86VidModeGetDotClocks:return +- ProcXF86VidModeGetDotClocks(client); +- case X_XF86VidModeSetClientVersion:return +- ProcXF86VidModeSetClientVersion(client); +- case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client); +- case X_XF86VidModeGetGammaRamp:return +- ProcXF86VidModeGetGammaRamp(client); +- case X_XF86VidModeGetGammaRampSize:return +- ProcXF86VidModeGetGammaRampSize(client); +- case X_XF86VidModeGetPermissions:return +- ProcXF86VidModeGetPermissions(client); +- default:if (!xf86GetVidModeEnabled()) ++ case X_XF86VidModeGetModeLine: ++ return ProcXF86VidModeGetModeLine(client); ++ case X_XF86VidModeGetMonitor: ++ return ProcXF86VidModeGetMonitor(client); ++ case X_XF86VidModeGetAllModeLines: ++ return ProcXF86VidModeGetAllModeLines(client); ++ case X_XF86VidModeValidateModeLine: ++ return ProcXF86VidModeValidateModeLine(client); ++ case X_XF86VidModeGetViewPort: ++ return ProcXF86VidModeGetViewPort(client); ++ case X_XF86VidModeGetDotClocks: ++ return ProcXF86VidModeGetDotClocks(client); ++ case X_XF86VidModeSetClientVersion: ++ return ProcXF86VidModeSetClientVersion(client); ++ case X_XF86VidModeGetGamma: ++ return ProcXF86VidModeGetGamma(client); ++ case X_XF86VidModeGetGammaRamp: ++ return ProcXF86VidModeGetGammaRamp(client); ++ case X_XF86VidModeGetGammaRampSize: ++ return ProcXF86VidModeGetGammaRampSize(client); ++ case X_XF86VidModeGetPermissions: ++ return ProcXF86VidModeGetPermissions(client); ++ default: ++ if (!xf86GetVidModeEnabled()) + return VidModeErrorBase + XF86VidModeExtensionDisabled; + if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { + switch (stuff->data) { + case X_XF86VidModeAddModeLine: + return ProcXF86VidModeAddModeLine(client); +- case X_XF86VidModeDeleteModeLine:return +- ProcXF86VidModeDeleteModeLine(client); +- case X_XF86VidModeModModeLine:return +- ProcXF86VidModeModModeLine(client); +- case X_XF86VidModeSwitchMode:return +- ProcXF86VidModeSwitchMode(client); +- case X_XF86VidModeSwitchToMode:return +- ProcXF86VidModeSwitchToMode(client); +- case X_XF86VidModeLockModeSwitch:return +- ProcXF86VidModeLockModeSwitch(client); +- case X_XF86VidModeSetViewPort:return +- ProcXF86VidModeSetViewPort(client); +- case X_XF86VidModeSetGamma:return +- ProcXF86VidModeSetGamma(client); +- case X_XF86VidModeSetGammaRamp:return +- ProcXF86VidModeSetGammaRamp(client); +- default:return BadRequest; +- }} ++ case X_XF86VidModeDeleteModeLine: ++ return ProcXF86VidModeDeleteModeLine(client); ++ case X_XF86VidModeModModeLine: ++ return ProcXF86VidModeModModeLine(client); ++ case X_XF86VidModeSwitchMode: ++ return ProcXF86VidModeSwitchMode(client); ++ case X_XF86VidModeSwitchToMode: ++ return ProcXF86VidModeSwitchToMode(client); ++ case X_XF86VidModeLockModeSwitch: ++ return ProcXF86VidModeLockModeSwitch(client); ++ case X_XF86VidModeSetViewPort: ++ return ProcXF86VidModeSetViewPort(client); ++ case X_XF86VidModeSetGamma: ++ return ProcXF86VidModeSetGamma(client); ++ case X_XF86VidModeSetGammaRamp: ++ return ProcXF86VidModeSetGammaRamp(client); ++ default: ++ return BadRequest; ++ } ++ } + else +- return VidModeErrorBase + XF86VidModeClientNotLocal; ++ return VidModeErrorBase + XF86VidModeClientNotLocal; + } + } + + static int +- SProcXF86VidModeQueryVersion(ClientPtr client) { ++SProcXF86VidModeQueryVersion(ClientPtr client) ++{ + REQUEST(xXF86VidModeQueryVersionReq); + swaps(&stuff->length); + return ProcXF86VidModeQueryVersion(client); +-} static int +- SProcXF86VidModeGetModeLine(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetModeLine(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetModeLineReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetModeLine(client); +-} static int +- SProcXF86VidModeGetAllModeLines(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetAllModeLines(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetAllModeLinesReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetAllModeLines(client); +-} static int +- SProcXF86VidModeAddModeLine(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeAddModeLine(ClientPtr client) ++{ + xXF86OldVidModeAddModeLineReq *oldstuff = + (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; + int ver; + +- REQUEST(xXF86VidModeAddModeLineReq); +- ver = ClientMajorVersion(client); ++ REQUEST(xXF86VidModeAddModeLineReq); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + swaps(&oldstuff->length); + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq); +@@ -1666,13 +1747,14 @@ static int + } + + static int +- SProcXF86VidModeDeleteModeLine(ClientPtr client) { ++SProcXF86VidModeDeleteModeLine(ClientPtr client) ++{ + xXF86OldVidModeDeleteModeLineReq *oldstuff = + (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; + int ver; + +- REQUEST(xXF86VidModeDeleteModeLineReq); +- ver = ClientMajorVersion(client); ++ REQUEST(xXF86VidModeDeleteModeLineReq); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + swaps(&oldstuff->length); + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq); +@@ -1710,13 +1792,14 @@ static int + } + + static int +- SProcXF86VidModeModModeLine(ClientPtr client) { ++SProcXF86VidModeModModeLine(ClientPtr client) ++{ + xXF86OldVidModeModModeLineReq *oldstuff = + (xXF86OldVidModeModModeLineReq *) client->requestBuffer; + int ver; + +- REQUEST(xXF86VidModeModModeLineReq); +- ver = ClientMajorVersion(client); ++ REQUEST(xXF86VidModeModModeLineReq); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + swaps(&oldstuff->length); + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq); +@@ -1754,13 +1837,14 @@ static int + } + + static int +- SProcXF86VidModeValidateModeLine(ClientPtr client) { ++SProcXF86VidModeValidateModeLine(ClientPtr client) ++{ + xXF86OldVidModeValidateModeLineReq *oldstuff = + (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; + int ver; + +- REQUEST(xXF86VidModeValidateModeLineReq); +- ver = ClientMajorVersion(client); ++ REQUEST(xXF86VidModeValidateModeLineReq); ++ ver = ClientMajorVersion(client); + if (ver < 2) { + swaps(&oldstuff->length); + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq); +@@ -1798,44 +1882,60 @@ static int + } + + static int +- SProcXF86VidModeSwitchMode(ClientPtr client) { ++SProcXF86VidModeSwitchMode(ClientPtr client) ++{ + REQUEST(xXF86VidModeSwitchModeReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq); + swaps(&stuff->screen); + swaps(&stuff->zoom); + return ProcXF86VidModeSwitchMode(client); +-} static int +- SProcXF86VidModeSwitchToMode(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeSwitchToMode(ClientPtr client) ++{ + REQUEST(xXF86VidModeSwitchToModeReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq); + swapl(&stuff->screen); + return ProcXF86VidModeSwitchToMode(client); +-} static int +- SProcXF86VidModeLockModeSwitch(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeLockModeSwitch(ClientPtr client) ++{ + REQUEST(xXF86VidModeLockModeSwitchReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); + swaps(&stuff->screen); + swaps(&stuff->lock); + return ProcXF86VidModeLockModeSwitch(client); +-} static int +- SProcXF86VidModeGetMonitor(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetMonitor(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetMonitorReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetMonitor(client); +-} static int +- SProcXF86VidModeGetViewPort(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetViewPort(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetViewPortReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetViewPort(client); +-} static int +- SProcXF86VidModeSetViewPort(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeSetViewPort(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetViewPortReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq); +@@ -1843,23 +1943,32 @@ static int + swapl(&stuff->x); + swapl(&stuff->y); + return ProcXF86VidModeSetViewPort(client); +-} static int +- SProcXF86VidModeGetDotClocks(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetDotClocks(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetDotClocksReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetDotClocks(client); +-} static int +- SProcXF86VidModeSetClientVersion(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeSetClientVersion(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetClientVersionReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); + swaps(&stuff->major); + swaps(&stuff->minor); + return ProcXF86VidModeSetClientVersion(client); +-} static int +- SProcXF86VidModeSetGamma(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeSetGamma(ClientPtr client) ++{ + REQUEST(xXF86VidModeSetGammaReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq); +@@ -1868,120 +1977,145 @@ static int + swapl(&stuff->green); + swapl(&stuff->blue); + return ProcXF86VidModeSetGamma(client); +-} static int +- SProcXF86VidModeGetGamma(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetGamma(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetGammaReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetGamma(client); +-} static int +- SProcXF86VidModeSetGammaRamp(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeSetGammaRamp(ClientPtr client) ++{ + int length; +- REQUEST(xXF86VidModeSetGammaRampReq); +- swaps(&stuff->length); +- REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); +- swaps(&stuff->size); +- swaps(&stuff->screen); +- length = ((stuff->size + 1) & ~1) * 6; +- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); +- SwapRestS(stuff); +- return ProcXF86VidModeSetGammaRamp(client); +-} static int +- SProcXF86VidModeGetGammaRamp(ClientPtr client) { ++ ++ REQUEST(xXF86VidModeSetGammaRampReq); ++ swaps(&stuff->length); ++ REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); ++ swaps(&stuff->size); ++ swaps(&stuff->screen); ++ length = ((stuff->size + 1) & ~1) * 6; ++ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); ++ SwapRestS(stuff); ++ return ProcXF86VidModeSetGammaRamp(client); ++} ++ ++static int ++SProcXF86VidModeGetGammaRamp(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetGammaRampReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); + swaps(&stuff->size); + swaps(&stuff->screen); + return ProcXF86VidModeGetGammaRamp(client); +-} static int +- SProcXF86VidModeGetGammaRampSize(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetGammaRampSize(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetGammaRampSizeReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetGammaRampSize(client); +-} static int +- SProcXF86VidModeGetPermissions(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeGetPermissions(ClientPtr client) ++{ + REQUEST(xXF86VidModeGetPermissionsReq); + swaps(&stuff->length); + REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); + swaps(&stuff->screen); + return ProcXF86VidModeGetPermissions(client); +-} static int +- SProcXF86VidModeDispatch(ClientPtr client) { ++} ++ ++static int ++SProcXF86VidModeDispatch(ClientPtr client) ++{ + REQUEST(xReq); + switch (stuff->data) { + case X_XF86VidModeQueryVersion: + return SProcXF86VidModeQueryVersion(client); +- case X_XF86VidModeGetModeLine:return +- SProcXF86VidModeGetModeLine(client); +- case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client); +- case X_XF86VidModeGetAllModeLines:return +- SProcXF86VidModeGetAllModeLines(client); +- case X_XF86VidModeGetViewPort:return +- SProcXF86VidModeGetViewPort(client); +- case X_XF86VidModeValidateModeLine:return +- SProcXF86VidModeValidateModeLine(client); +- case X_XF86VidModeGetDotClocks:return +- SProcXF86VidModeGetDotClocks(client); +- case X_XF86VidModeSetClientVersion:return +- SProcXF86VidModeSetClientVersion(client); +- case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client); +- case X_XF86VidModeGetGammaRamp:return +- SProcXF86VidModeGetGammaRamp(client); +- case X_XF86VidModeGetGammaRampSize:return +- SProcXF86VidModeGetGammaRampSize(client); +- case X_XF86VidModeGetPermissions:return +- SProcXF86VidModeGetPermissions(client); +- default:if (!xf86GetVidModeEnabled()) ++ case X_XF86VidModeGetModeLine: ++ return SProcXF86VidModeGetModeLine(client); ++ case X_XF86VidModeGetMonitor: ++ return SProcXF86VidModeGetMonitor(client); ++ case X_XF86VidModeGetAllModeLines: ++ return SProcXF86VidModeGetAllModeLines(client); ++ case X_XF86VidModeGetViewPort: ++ return SProcXF86VidModeGetViewPort(client); ++ case X_XF86VidModeValidateModeLine: ++ return SProcXF86VidModeValidateModeLine(client); ++ case X_XF86VidModeGetDotClocks: ++ return SProcXF86VidModeGetDotClocks(client); ++ case X_XF86VidModeSetClientVersion: ++ return SProcXF86VidModeSetClientVersion(client); ++ case X_XF86VidModeGetGamma: ++ return SProcXF86VidModeGetGamma(client); ++ case X_XF86VidModeGetGammaRamp: ++ return SProcXF86VidModeGetGammaRamp(client); ++ case X_XF86VidModeGetGammaRampSize: ++ return SProcXF86VidModeGetGammaRampSize(client); ++ case X_XF86VidModeGetPermissions: ++ return SProcXF86VidModeGetPermissions(client); ++ default: ++ if (!xf86GetVidModeEnabled()) + return VidModeErrorBase + XF86VidModeExtensionDisabled; + if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { + switch (stuff->data) { + case X_XF86VidModeAddModeLine: + return SProcXF86VidModeAddModeLine(client); +- case X_XF86VidModeDeleteModeLine:return +- SProcXF86VidModeDeleteModeLine(client); +- case X_XF86VidModeModModeLine:return +- SProcXF86VidModeModModeLine(client); +- case X_XF86VidModeSwitchMode:return +- SProcXF86VidModeSwitchMode(client); +- case X_XF86VidModeSwitchToMode:return +- SProcXF86VidModeSwitchToMode(client); +- case X_XF86VidModeLockModeSwitch:return +- SProcXF86VidModeLockModeSwitch(client); +- case X_XF86VidModeSetViewPort:return +- SProcXF86VidModeSetViewPort(client); +- case X_XF86VidModeSetGamma:return +- SProcXF86VidModeSetGamma(client); +- case X_XF86VidModeSetGammaRamp:return +- SProcXF86VidModeSetGammaRamp(client); +- default:return BadRequest; +- }} ++ case X_XF86VidModeDeleteModeLine: ++ return SProcXF86VidModeDeleteModeLine(client); ++ case X_XF86VidModeModModeLine: ++ return SProcXF86VidModeModModeLine(client); ++ case X_XF86VidModeSwitchMode: ++ return SProcXF86VidModeSwitchMode(client); ++ case X_XF86VidModeSwitchToMode: ++ return SProcXF86VidModeSwitchToMode(client); ++ case X_XF86VidModeLockModeSwitch: ++ return SProcXF86VidModeLockModeSwitch(client); ++ case X_XF86VidModeSetViewPort: ++ return SProcXF86VidModeSetViewPort(client); ++ case X_XF86VidModeSetGamma: ++ return SProcXF86VidModeSetGamma(client); ++ case X_XF86VidModeSetGammaRamp: ++ return SProcXF86VidModeSetGammaRamp(client); ++ default: ++ return BadRequest; ++ } ++ } + else +- return VidModeErrorBase + XF86VidModeClientNotLocal; ++ return VidModeErrorBase + XF86VidModeClientNotLocal; + } + } + + void +- XFree86VidModeExtensionInit(void) { ++XFree86VidModeExtensionInit(void) ++{ + ExtensionEntry *extEntry; + ScreenPtr pScreen; + int i; + Bool enabled = FALSE; + +- DEBUG_P("XFree86VidModeExtensionInit"); ++ DEBUG_P("XFree86VidModeExtensionInit"); + + if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0)) +- return; ++ return; + #ifdef XF86VIDMODE_EVENTS + if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) +- return; ++ return; + #endif + + #ifdef XF86VIDMODE_EVENTS +- EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); ++ EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); + #endif + + for (i = 0; i < screenInfo.numScreens; i++) { +@@ -1990,8 +2124,8 @@ void + enabled = TRUE; + } + /* This means that the DDX doesn't want the vidmode extension enabled */ +- if (!enabled) +- return; ++ if (!enabled) ++ return; + + if ( + #ifdef XF86VIDMODE_EVENTS +-- +cgit v0.9.0.2-2-gbebe +From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001 +From: Daniel Kurtz <djkurtz@chromium.org> +Date: Thu, 12 Apr 2012 00:11:10 +0000 +Subject: dix: don't BUG_WARN for button events from button-only device + +Events from button-only devices still need coordinates, and they get them +from scale_to_desktop(). Therefore, a dev without valuators is not a bug. +However, a dev with valuators, but less than two of them still is a bug. + +This was noticed when unplugging a "Creative Technology SB Arena Headset", +which has some BTNs and some KEYs, but no REL or ABS valuators. +It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN. + +Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328) +--- +diff --git a/dix/getevents.c b/dix/getevents.c +index 4e0af45..9dc9617 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask, + ScreenPtr scr = miPointerGetScreen(dev); + double x, y; + +- BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2); ++ BUG_WARN(dev->valuator && dev->valuator->numAxes < 2); + if (!dev->valuator || dev->valuator->numAxes < 2) { + /* if we have no axes, last.valuators must be in screen coords + * anyway */ +-- +cgit v0.9.0.2-2-gbebe +From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed, 18 Apr 2012 05:56:37 +0000 +Subject: dix: indentation fix + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05) +--- +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 9a2e22f..d971805 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -416,8 +416,8 @@ Dispatch(void) + if (XSERVER_REQUEST_START_ENABLED()) + XSERVER_REQUEST_START(LookupMajorName(client->majorOp), + client->majorOp, +- ((xReq *) client->requestBuffer)-> +- length, client->index, ++ ((xReq *) client->requestBuffer)->length, ++ client->index, + client->requestBuffer); + #endif + if (result > (maxBigRequestSize << 2)) +-- +cgit v0.9.0.2-2-gbebe +From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001 +From: Michal Suchanek <hramrach@gmail.com> +Date: Thu, 26 Apr 2012 13:11:20 +0000 +Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN + +and fix resulting printf warning in dmxLogVisual + +Signed-off-by: Michal Suchanek <hramrach@gmail.com> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd) +--- +diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c +index b56bb93..151f672 100644 +--- a/hw/dmx/dmxlog.c ++++ b/hw/dmx/dmxlog.c +@@ -86,6 +86,8 @@ ErrorF(const char *format, ...) + + /** Provide an VFatalError function when used stand-alone. */ + static void ++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; ++static void + VFatalError(const char *format, va_list args) + { + vfprintf(stderr, format, args); /* RATS: We assume the format string +@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args) + } + #else + /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */ +-extern void AbortServer(void); ++extern void AbortServer(void) _X_NORETURN; ++static void ++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; + static void + VFatalError(const char *format, va_list args) + { +@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput, + /* Prints the error message with the appropriate low-level X output + * routine. */ + static void ++dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0); ++static void + dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) + { + if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) { +@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) + class = "DirectColor"; + break; + } ++#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n" + + if (dmxScreen) { + dmxLogOutput(dmxScreen, +- "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", ++ VisualLogFormat, + vi->visualid, class, vi->depth, vi->bits_per_rgb, + vi->colormap_size, + vi->red_mask, vi->green_mask, vi->blue_mask, +@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) + } + else { + dmxLog(dmxInfo, +- " 0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", ++ " " VisualLogFormat, + vi->visualid, class, vi->depth, vi->bits_per_rgb, + vi->colormap_size, + vi->red_mask, vi->green_mask, vi->blue_mask, +diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h +index 4d4cd26..162484b 100644 +--- a/hw/dmx/dmxlog.h ++++ b/hw/dmx/dmxlog.h +@@ -55,18 +55,23 @@ typedef enum { + /* Logging functions used by Xserver/hw/dmx routines. */ + extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel); + extern dmxLogLevel dmxGetLogLevel(void); +-extern void dmxLog(dmxLogLevel logLevel, const char *format, ...); +-extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...); ++extern void dmxLog(dmxLogLevel logLevel, const char *format, ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); ++extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); + extern const char *dmxEventName(int type); + + #ifndef DMX_LOG_STANDALONE +-extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...); ++extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); + extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format, +- ...); ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); + extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format, +- ...); +-extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...); +-extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...); ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); ++extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); ++extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ++ ...) _X_ATTRIBUTE_PRINTF(2, 3); + extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv); + extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, + int defaultVisual); +-- +cgit v0.9.0.2-2-gbebe +From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Thu, 10 May 2012 07:53:20 +0000 +Subject: Revert "dix: when disabling a device, release all buttons and keys" + +This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7. + +The commit being reverted triggered a segfault on server shutdown when a +device posts raw events after the root windows are forced to NULL. + +https://lists.debian.org/debian-x/2012/05/msg00240.html + +Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> +--- +diff --git a/dix/devices.c b/dix/devices.c +index d0e99bd..0125504 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent) + if (*prev != dev) + return FALSE; + +- ReleaseButtonsAndKeys(dev); +- + /* float attached devices */ + if (IsMaster(dev)) { + for (other = inputInfo.devices; other; other = other->next) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/abs/core/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch b/abs/core/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch deleted file mode 100644 index 4e782f1..0000000 --- a/abs/core/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove the default root window grey stipple pattern, replacing it with -blackness. - ---- xc/programs/Xserver/dix/window.c.die-ugly-pattern-die-die-die Tue Feb 12 16:33:04 2002 -+++ xc/programs/Xserver/dix/window.c Tue Feb 12 16:45:32 2002 -@@ -119,8 +119,8 @@ - * - ******/ - --static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; --static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; -+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; -+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; - - int screenIsSaved = SCREEN_SAVER_OFF; - diff --git a/abs/core/xorg-sessreg/PKGBUILD b/abs/core/xorg-sessreg/PKGBUILD new file mode 100644 index 0000000..aa97c8f --- /dev/null +++ b/abs/core/xorg-sessreg/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-sessreg +pkgver=1.0.7 +pkgrel=1 +pkgdesc="Register X sessions in system utmp/utmpx databases" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-util-macros' 'xproto') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2) +sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52') + +build() { + cd "${srcdir}/sessreg-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-setxkbmap/PKGBUILD b/abs/core/xorg-setxkbmap/PKGBUILD new file mode 100644 index 0000000..f48a852 --- /dev/null +++ b/abs/core/xorg-setxkbmap/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 154148 2012-03-23 17:34:14Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-setxkbmap +pkgver=1.3.0 +pkgrel=1 +pkgdesc='Set the keyboard using the X Keyboard Extension' +url='http://xorg.freedesktop.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('libxkbfile') +makedepends=('xorg-util-macros') +source=("${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2") +sha1sums=('d10885d6215b06789961c67557df46406f99c2b7') + +groups=('xorg-apps' 'xorg') + +build() { + cd "${srcdir}/setxkbmap-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/setxkbmap-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-util-macros/PKGBUILD b/abs/core/xorg-util-macros/PKGBUILD index 49d073c..f550a1f 100644 --- a/abs/core/xorg-util-macros/PKGBUILD +++ b/abs/core/xorg-util-macros/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 97536 2010-10-31 15:33:40Z jgc $ +# $Id: PKGBUILD 153461 2012-03-14 17:38:45Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-util-macros -pkgver=1.11.0 -pkgrel=2 +pkgver=1.17 +pkgrel=1 pkgdesc="X.Org Autotools macros" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2) -sha1sums=('646188eeca4fa319d95aba7a271149bcbf9ee49e') +sha1sums=('c424a09fa6f628e24eff74496acebef13e8093b9') build() { cd "${srcdir}/util-macros-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/util-macros-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/xorg-x11perf/PKGBUILD b/abs/core/xorg-x11perf/PKGBUILD index 3d9f84d..7c7479dc 100644 --- a/abs/core/xorg-x11perf/PKGBUILD +++ b/abs/core/xorg-x11perf/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: $ +# $Id: PKGBUILD 134289 2011-08-02 18:59:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-x11perf -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.4 +pkgrel=1 pkgdesc="Simple X server performance benchmarker" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext') makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/x11perf-${pkgver}.tar.bz2) -sha1sums=('ca693d23cd343df51baac76e693e769ce5ef6a30') +sha256sums=('24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184') build() { cd "${srcdir}/x11perf-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/x11perf-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/xorg-xauth/PKGBUILD b/abs/core/xorg-xauth/PKGBUILD index 4736f05..cc8d300 100644 --- a/abs/core/xorg-xauth/PKGBUILD +++ b/abs/core/xorg-xauth/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 57490 2009-10-31 18:31:09Z jgc $ +# $Id: PKGBUILD 154150 2012-03-23 19:14:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=xorg-xauth -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X.Org authorization settings program" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('libxmu') -makedepends=('pkgconfig') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -md5sums=('fa00078c414c4a57cab7a6d89a0c8734') +sha1sums=('54f93f0539a98900c36c4f7c8ae933f77699dc7b') build() { cd "${srcdir}/xauth-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } + package() { cd "${srcdir}/xauth-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/xorg-xbacklight/PKGBUILD b/abs/core/xorg-xbacklight/PKGBUILD new file mode 100644 index 0000000..fd40c61 --- /dev/null +++ b/abs/core/xorg-xbacklight/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151182 2012-02-25 07:02:48Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xbacklight +pkgver=1.1.2 +pkgrel=3 +pkgdesc="RandR-based backlight control application" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxrandr' 'libx11') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xbacklight-${pkgver}.tar.bz2) +sha1sums=('e297b359ab83f3844ca5ea1c23280b2f8bb71cfd') + +build() { + cd "${srcdir}/xbacklight-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xbacklight-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xcmsdb/PKGBUILD b/abs/core/xorg-xcmsdb/PKGBUILD new file mode 100644 index 0000000..37346f9 --- /dev/null +++ b/abs/core/xorg-xcmsdb/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 150238 2012-02-15 16:35:38Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xcmsdb +pkgver=1.0.4 +pkgrel=1 +pkgdesc="Device Color Characterization utility for X Color Management System" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xcmsdb-${pkgver}.tar.bz2) +sha1sums=('a633f76af38ea40b33d55c3ac820fd19f17f9428') + +build() { + cd "${srcdir}/xcmsdb-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xcmsdb-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xcursorgen/PKGBUILD b/abs/core/xorg-xcursorgen/PKGBUILD index 146cdd6..df9997a 100644 --- a/abs/core/xorg-xcursorgen/PKGBUILD +++ b/abs/core/xorg-xcursorgen/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: $ +# $Id: PKGBUILD 154152 2012-03-23 19:18:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcursorgen -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Create an X cursor file from PNG images" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxcursor' 'libpng') makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2) -sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a') +sha1sums=('1d0ca82422d328522b06b218f86b5901a7d5521b') build() { cd "${srcdir}/xcursorgen-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/xcursorgen-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/xorg-xdpyinfo/PKGBUILD b/abs/core/xorg-xdpyinfo/PKGBUILD index 9ee844a..b410125 100644 --- a/abs/core/xorg-xdpyinfo/PKGBUILD +++ b/abs/core/xorg-xdpyinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo diff --git a/abs/core/xorg-xdriinfo/PKGBUILD b/abs/core/xorg-xdriinfo/PKGBUILD new file mode 100644 index 0000000..e2fb4a3 --- /dev/null +++ b/abs/core/xorg-xdriinfo/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 150958 2012-02-24 10:06:30Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xdriinfo +pkgver=1.0.4 +pkgrel=3 +pkgdesc="Query configuration information of DRI drivers" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libgl') +makedepends=('xorg-util-macros' 'glproto' 'mesa') +groups=('xorg-apps' 'xorg') +source=("http://xorg.freedesktop.org/archive/individual/app/xdriinfo-${pkgver}.tar.bz2") +sha1sums=('723482b3fc627d7cc6124fec43dd1c21d102daaa') + +build() { + cd "${srcdir}/xdriinfo-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xdriinfo-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xev/PKGBUILD b/abs/core/xorg-xev/PKGBUILD new file mode 100644 index 0000000..c0380e6 --- /dev/null +++ b/abs/core/xorg-xev/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 150821 2012-02-23 07:20:15Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-xev +pkgver=1.2.0 +pkgrel=1 +pkgdesc='Print contents of X events' +url='http://xorg.freedesktop.org/' +arch=('i686' 'x86_64') +license=('custom') +depends=('libx11' 'libxrandr') +makedepends=('xorg-util-macros' 'xproto') +source=("http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2") +sha1sums=('6b05706ed39382b5d08c5351c00ba7e127709eec') +groups=('xorg-apps' 'xorg') + +build() { + cd "${srcdir}/xev-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xev-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xgamma/PKGBUILD b/abs/core/xorg-xgamma/PKGBUILD new file mode 100644 index 0000000..e77997d --- /dev/null +++ b/abs/core/xorg-xgamma/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 154160 2012-03-23 20:11:06Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xgamma +pkgver=1.0.5 +pkgrel=1 +pkgdesc="Alter a monitor's gamma correction" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxxf86vm') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xgamma-${pkgver}.tar.bz2) +sha1sums=('9cd3272fd24f51b75223cf9c59949ded6df04800') + +build() { + cd "${srcdir}/xgamma-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xgamma-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xhost/PKGBUILD b/abs/core/xorg-xhost/PKGBUILD new file mode 100644 index 0000000..0703110 --- /dev/null +++ b/abs/core/xorg-xhost/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 154154 2012-03-23 19:23:30Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xhost +pkgver=1.0.5 +pkgrel=1 +pkgdesc="Server access control program for X" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxmu') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xhost-${pkgver}.tar.bz2) +sha1sums=('c9ad0447c709fc7a9a2afbbca712cf47fbb29757') + +build() { + cd "${srcdir}/xhost-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xhost-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xinit/PKGBUILD b/abs/core/xorg-xinit/PKGBUILD index 9bbf6f6..f4d5673 100644 --- a/abs/core/xorg-xinit/PKGBUILD +++ b/abs/core/xorg-xinit/PKGBUILD @@ -1,39 +1,44 @@ -# $Id: PKGBUILD 99539 2010-11-15 11:06:22Z jgc $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149821 2012-02-11 08:52:05Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=xorg-xinit -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libx11' 'xorg-xauth') +depends=('libx11' 'xorg-xauth' 'inetutils') makedepends=('xorg-util-macros') optdepends=('xorg-twm' 'xterm') backup=('etc/skel/.xinitrc' 'etc/skel/.xsession' 'etc/X11/xinit/xserverrc' 'etc/X11/xinit/xinitrc') -groups=('xorg') source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 06_move_serverauthfile_into_tmp.diff + fs25361.patch xinitrc xsession xserverrc) options=(!emptydirs) -md5sums=('bc4e8b7d1919597cc37a0d24aa149dda' +md5sums=('9c0943cbd83e489ad1b05221b97efd44' 'abd072ec435ce084cf4e89c58f83d45c' - 'cee2d70748a089fbc7db64a4a6e8fdb1' + '73a597d3fb7f5b9487318ac8cfd4bedf' + 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' '7873d97db30d6c279ed37e3559e7c59d' - 'bb550d3b9a2d2b6cbe6e2667a3a7cd03') + 'c5baef10fdb7239594daee72a94ddab3') build() { cd "${srcdir}/xinit-${pkgver}" patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" + patch -Np1 -i "${srcdir}/fs25361.patch" + sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit make } + package() { cd "${srcdir}/xinit-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/xorg-xinit/fs25361.patch b/abs/core/xorg-xinit/fs25361.patch new file mode 100644 index 0000000..4596122 --- /dev/null +++ b/abs/core/xorg-xinit/fs25361.patch @@ -0,0 +1,16 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -290,9 +290,9 @@ + XCOMM now add the same credentials to the client authority file + XCOMM if '$displayname' already exists do not overwrite it as another + XCOMM server man need it. Add them to the '$xserverauthfile' instead. +- for displayname in $authdisplay $hostname$authdisplay; do ++ for displayname in $authdisplay $hostname/unix$authdisplay; do + authcookie=`XAUTH list "$displayname" @@ +- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + if [ "z${authcookie}" = "z" ] ; then + XAUTH -q << EOF + add $displayname . $mcookie diff --git a/abs/core/xorg-xinit/xinitrc b/abs/core/xorg-xinit/xinitrc index a5a3527..dbd080d 100644 --- a/abs/core/xorg-xinit/xinitrc +++ b/abs/core/xorg-xinit/xinitrc @@ -4,6 +4,13 @@ # # Executed by startx (run your window manager from here) +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + # exec gnome-session # exec startkde # exec startxfce4 diff --git a/abs/core/xorg-xinit/xserverrc b/abs/core/xorg-xinit/xserverrc index 6a636c1..6f746cd 100644 --- a/abs/core/xorg-xinit/xserverrc +++ b/abs/core/xorg-xinit/xserverrc @@ -1 +1 @@ -exec /usr/bin/X -nolisten tcp +exec /usr/bin/X -nolisten tcp "$@" diff --git a/abs/core/xorg-xinput/PKGBUILD b/abs/core/xorg-xinput/PKGBUILD new file mode 100644 index 0000000..f111082 --- /dev/null +++ b/abs/core/xorg-xinput/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 159187 2012-05-17 13:48:28Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xinput +pkgver=1.6.0 +pkgrel=1 +pkgdesc="Small commandline tool to configure devices" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama') +makedepends=('xorg-util-macros' 'inputproto') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) +sha256sums=('4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e') + +build() { + cd "${srcdir}/xinput-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xinput-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xkbcomp/PKGBUILD b/abs/core/xorg-xkbcomp/PKGBUILD new file mode 100644 index 0000000..35dce4f --- /dev/null +++ b/abs/core/xorg-xkbcomp/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 154156 2012-03-23 20:01:59Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xkbcomp +pkgver=1.2.4 +pkgrel=1 +pkgdesc="X Keyboard description compiler" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxkbfile') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2) +sha1sums=('695d2f2824884d9e54aa1419282ae167fdea163b') + +build() { + cd "${srcdir}/xkbcomp-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xkbcomp-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xkbevd/PKGBUILD b/abs/core/xorg-xkbevd/PKGBUILD new file mode 100644 index 0000000..0f523d9 --- /dev/null +++ b/abs/core/xorg-xkbevd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 154162 2012-03-23 20:16:23Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xkbevd +pkgver=1.1.3 +pkgrel=1 +pkgdesc="XKB event daemon" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxkbfile') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=("${url}/releases/individual/app/xkbevd-${pkgver}.tar.bz2") +sha1sums=('543963ba22b019b4e059e8605eb418f8a712b76e') + +build() { + cd "${srcdir}/xkbevd-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xkbevd-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xkbutils/PKGBUILD b/abs/core/xorg-xkbutils/PKGBUILD new file mode 100644 index 0000000..6584c6a --- /dev/null +++ b/abs/core/xorg-xkbutils/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151027 2012-02-24 13:40:04Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xkbutils +pkgver=1.0.3 +pkgrel=3 +pkgdesc="XKB utility demos" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxaw' 'libxt' 'libx11') +makedepends=('xorg-util-macros' 'xproto' 'inputproto') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2) +sha1sums=('e5a2619b9449f95e02b520b492de0575bc4551d6') + +build() { + cd "${srcdir}/xkbutils-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xkbutils-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xkill/PKGBUILD b/abs/core/xorg-xkill/PKGBUILD index 9dc8133..867f20a 100644 --- a/abs/core/xorg-xkill/PKGBUILD +++ b/abs/core/xorg-xkill/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: $ +# $Id: PKGBUILD 151025 2012-02-24 13:37:13Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xkill pkgver=1.0.3 -pkgrel=1 +pkgrel=3 pkgdesc="Kill a client by its X resource" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxmu') makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2) sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5') @@ -18,9 +19,9 @@ build() { ./configure --prefix=/usr make } + package() { cd "${srcdir}/xkill-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xorg-xlsatoms/PKGBUILD b/abs/core/xorg-xlsatoms/PKGBUILD new file mode 100644 index 0000000..eef3139 --- /dev/null +++ b/abs/core/xorg-xlsatoms/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 154999 2012-04-01 10:01:56Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xlsatoms +pkgver=1.1.1 +pkgrel=1 +pkgdesc="List interned atoms defined on server" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxcb') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xlsatoms-${pkgver}.tar.bz2) +sha1sums=('271880bf9dcd37b85b08e5f4a43e6015747b45e1') + +build() { + cd "${srcdir}/xlsatoms-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsatoms-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xlsclients/PKGBUILD b/abs/core/xorg-xlsclients/PKGBUILD new file mode 100644 index 0000000..a79dddb --- /dev/null +++ b/abs/core/xorg-xlsclients/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151015 2012-02-24 13:22:35Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xlsclients +pkgver=1.1.2 +pkgrel=2 +pkgdesc="List client applications running on a display" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxcb') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xlsclients-${pkgver}.tar.bz2) +sha1sums=('c4051429c190444ae9ba327f0ad776a74eb7b27b') + +build() { + cd "${srcdir}/xlsclients-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsclients-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xmodmap/PKGBUILD b/abs/core/xorg-xmodmap/PKGBUILD new file mode 100644 index 0000000..3005831 --- /dev/null +++ b/abs/core/xorg-xmodmap/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 156637 2012-04-21 23:46:44Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xmodmap +pkgver=1.0.7 +pkgrel=1 +pkgdesc="Utility for modifying keymaps and button mappings" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2) +sha1sums=('9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef') + +build() { + cd "${srcdir}/xmodmap-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xmodmap-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xpr/PKGBUILD b/abs/core/xorg-xpr/PKGBUILD index 9fa513a..11ba4ba 100644 --- a/abs/core/xorg-xpr/PKGBUILD +++ b/abs/core/xorg-xpr/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: $ +# $Id: PKGBUILD 155001 2012-04-01 10:04:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xpr -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Print an X window dump from xwd" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11' 'libxmu') +depends=('libx11' 'libxmu' 'sh') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2 - copyright.patch) -sha1sums=('9dbd0ff136b612285e00d92d0c7675a4207b1c4a' - 'd2649781330400b83cf3553d9cfd6e02dd93a2bd') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2) +sha1sums=('0645404e9aa2c9f979e4d006c483633bf6cfc2d9') build() { cd "${srcdir}/xpr-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xpr-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xorg-xpr/copyright.patch b/abs/core/xorg-xpr/copyright.patch deleted file mode 100644 index 18e7182..0000000 --- a/abs/core/xorg-xpr/copyright.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 11569289123fb178e23fd1aa284e9fa10e6c1e8c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 06 Aug 2010 22:09:48 +0000 -Subject: Fill in COPYING file with copyright notices from source code - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/COPYING b/COPYING -index 7f33cbf..0f9d8e0 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,53 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. - --Please submit updated COPYING files to the Xorg bugzilla: -+Copyright (c) 1985, 1988 X Consortium - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation the rights to use, copy, modify, merge, publish, -+distribute, sublicense, and/or sell copies of the Software, and to -+permit persons to whom the Software is furnished to do so, subject to -+the following conditions: - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+The above copyright notice and this permission notice shall be included -+in all copies or substantial portions of the Software. - --http://lists.freedesktop.org/mailman/listinfo/xorg -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the X Consortium shall -+not be used in advertising or otherwise to promote the sale, use or -+other dealings in this Software without prior written authorization -+from the X Consortium. -+ -+Copyright 1986 by Marvin Solomon and the University of Wisconsin -+ -+Permission to use, copy, modify, and distribute this -+software and its documentation for any purpose and without -+fee is hereby granted, provided that the above copyright -+notice appear in all copies and that both that copyright -+notice and this permission notice appear in supporting -+documentation, and that the names of Marvin Solomon and -+the University of Wisconsin not be used in -+advertising or publicity pertaining to distribution of the -+software without specific, written prior permission. -+Neither Marvin Solomon nor the University of Wisconsin -+makes any representations about the suitability of -+this software for any purpose. It is provided "as is" -+without express or implied warranty. -+ -+Copyright (c) 1988 by Hewlett-Packard Company -+ -+Permission to use, copy, modify, and distribute this software -+and its documentation for any purpose and without fee is hereby -+granted, provided that the above copyright notice appear in all -+copies and that both that copyright notice and this permission -+notice appear in supporting documentation, and that -+Hewlett-Packard not be used in advertising or publicity -+pertaining to distribution of the software without specific, written -+prior permission. --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core/xorg-xcursorgen/xorg-xkill/PKGBUILD b/abs/core/xorg-xprop/PKGBUILD index 10f354d..32e1211 100644 --- a/abs/core/xorg-xcursorgen/xorg-xkill/PKGBUILD +++ b/abs/core/xorg-xprop/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: $ +# $Id: PKGBUILD 130748 2011-07-07 22:27:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=xorg-xkill -pkgver=1.0.3 +pkgname=xorg-xprop +pkgver=1.2.1 pkgrel=1 -pkgdesc="Kill a client by its X resource" +pkgdesc="Property displayer for X" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11' 'libxmu') +depends=('libx11') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2) -sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xprop-${pkgver}.tar.bz2) +sha1sums=('d531be0f5f2b7758216ea4d7890f88c42c5fa3fd') build() { - cd "${srcdir}/xkill-${pkgver}" + cd "${srcdir}/xprop-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xprop-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/xorg-xrandr/PKGBUILD b/abs/core/xorg-xrandr/PKGBUILD new file mode 100644 index 0000000..a208b1e --- /dev/null +++ b/abs/core/xorg-xrandr/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 130753 2011-07-07 22:30:11Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xrandr +pkgver=1.3.5 +pkgrel=1 +pkgdesc="Primitive command line interface to RandR extension" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxrandr' 'libx11') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) +sha1sums=('ef45925d5b0e72c73d21798d65a41d476fdb0d3f') + +build() { + cd "${srcdir}/xrandr-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xrandr-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + rm -f "${pkgdir}/usr/bin/xkeystone" +} diff --git a/abs/core/xorg-xrdb/PKGBUILD b/abs/core/xorg-xrdb/PKGBUILD new file mode 100644 index 0000000..85b9266 --- /dev/null +++ b/abs/core/xorg-xrdb/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151003 2012-02-24 13:05:19Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xrdb +pkgver=1.0.9 +pkgrel=2 +pkgdesc="X server resource database utility" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxmu' 'mcpp') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2) +sha1sums=('efa5f2420411988d6a6e142934393fd272507857') + +build() { + cd "${srcdir}/xrdb-${pkgver}" + ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp + make +} + +package() { + cd "${srcdir}/xrdb-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xrefresh/PKGBUILD b/abs/core/xorg-xrefresh/PKGBUILD new file mode 100644 index 0000000..c5e36f9 --- /dev/null +++ b/abs/core/xorg-xrefresh/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151005 2012-02-24 13:07:46Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xrefresh +pkgver=1.0.4 +pkgrel=3 +pkgdesc="Refresh all or part of an X screen" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xrefresh-${pkgver}.tar.bz2) +sha1sums=('5e85ee14ea9a357c1d4372bbc068a8d452a134aa') + +build() { + cd "${srcdir}/xrefresh-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xrefresh-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xset/PKGBUILD b/abs/core/xorg-xset/PKGBUILD new file mode 100644 index 0000000..e483f06 --- /dev/null +++ b/abs/core/xorg-xset/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 134284 2011-08-02 18:56:04Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xset +pkgver=1.2.2 +pkgrel=1 +pkgdesc="User preference utility for X" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxmu') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xset-${pkgver}.tar.bz2) +sha256sums=('61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8') + +build() { + cd "${srcdir}/xset-${pkgver}" + ./configure --prefix=/usr --without-fontcache --without-xf86misc + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xsetroot/PKGBUILD b/abs/core/xorg-xsetroot/PKGBUILD new file mode 100644 index 0000000..3af6da3 --- /dev/null +++ b/abs/core/xorg-xsetroot/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151001 2012-02-24 13:02:20Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xsetroot +pkgver=1.1.0 +pkgrel=3 +pkgdesc="Classic X utility to set your root window background to a given pattern or color" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxmu' 'libx11' 'libxcursor') +makedepends=('xorg-util-macros' 'xbitmaps') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xsetroot-${pkgver}.tar.bz2) +sha1sums=('1ef9ddd80c7013dc6d33e5c421537eb8b0427da4') + +build() { + cd "${srcdir}/xsetroot-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xsetroot-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xvinfo/PKGBUILD b/abs/core/xorg-xvinfo/PKGBUILD new file mode 100644 index 0000000..84f5541 --- /dev/null +++ b/abs/core/xorg-xvinfo/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 151163 2012-02-25 06:42:49Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xvinfo +pkgver=1.1.1 +pkgrel=3 +pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxv') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xvinfo-${pkgver}.tar.bz2) +sha1sums=('dc326464748fa608da50386112a89024804c1910') + +build() { + cd "${srcdir}/xvinfo-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xvinfo-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/abs/core/xorg-xwd/PKGBUILD b/abs/core/xorg-xwd/PKGBUILD index 5fd334d..5773cb3 100644 --- a/abs/core/xorg-xwd/PKGBUILD +++ b/abs/core/xorg-xwd/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: $ +# $Id: PKGBUILD 150997 2012-02-24 12:58:04Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwd -pkgver=1.0.4 -pkgrel=5 +pkgver=1.0.5 +pkgrel=2 pkgdesc="X Window System image dumping utility" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11') -makedepends=('xorg-util-macros') +makedepends=('xorg-util-macros' 'libxt') +groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwd-${pkgver}.tar.bz2) -sha1sums=('4ef4fd9072a507e9a1ee88ba1d28b314006cc109') +sha1sums=('3b0e4f3f9d28a07444e72952342e21544d4785b6') build() { cd "${srcdir}/xwd-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/xwd-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xorg-xwininfo/PKGBUILD b/abs/core/xorg-xwininfo/PKGBUILD new file mode 100644 index 0000000..1e16302 --- /dev/null +++ b/abs/core/xorg-xwininfo/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 130758 2011-07-07 22:32:22Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xorg-xwininfo +pkgver=1.1.2 +pkgrel=1 +pkgdesc="Command-line utility to print information about windows on an X server" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libxcb') +makedepends=('xorg-util-macros' 'libx11') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2) +sha1sums=('c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3') + +build() { + cd "${srcdir}/xwininfo-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xwininfo-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/core/xorg-xwud/PKGBUILD b/abs/core/xorg-xwud/PKGBUILD index aaef609..b2a30dc 100644 --- a/abs/core/xorg-xwud/PKGBUILD +++ b/abs/core/xorg-xwud/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: $ +# $Id: PKGBUILD 155003 2012-04-01 10:06:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwud -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=1 pkgdesc="X Window System image undumping utility" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11') makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwud-${pkgver}.tar.bz2) -sha1sums=('2e706d50c7039e3daa4963d36ab703e48aa652ed') +sha1sums=('786cd4b18bf576fae3ffd417545b1394b27c7f06') build() { cd "${srcdir}/xwud-${pkgver}" ./configure --prefix=/usr make } + package() { cd "${srcdir}/xwud-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/xosd/PKGBUILD b/abs/core/xosd/PKGBUILD index 45130c8..fdbb2e8 100644 --- a/abs/core/xosd/PKGBUILD +++ b/abs/core/xosd/PKGBUILD @@ -10,7 +10,7 @@ arch=("i686" "x86_64") license=('GPL2') url="http://www.ignavus.net/software.html" depends=('libxt' 'libxinerama' 'gdk-pixbuf') -makedepends=('xmms' 'bmp') +#makedepends=('xmms' 'bmp') options=(!libtool) backup=(etc/osd_cat.cfg) #source=("http://www.ignavus.net/xosd-$pkgver.tar.bz2") diff --git a/abs/core/xosd/__changelog b/abs/core/xosd/__changelog index 33e7879..de4a8d3 100644 --- a/abs/core/xosd/__changelog +++ b/abs/core/xosd/__changelog @@ -5,3 +5,5 @@ build() { mkdir -p $startdir/pkg/etc cp -f $startdir/src/osd_cat.cfg $startdir/pkg/etc/osd_cat.cfg } + +removed bmp and xmms diff --git a/abs/core/xproto/PKGBUILD b/abs/core/xproto/PKGBUILD index b29feb0..5940df8 100644 --- a/abs/core/xproto/PKGBUILD +++ b/abs/core/xproto/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 99386 2010-11-14 16:32:03Z jgc $ +# $Id: PKGBUILD 153611 2012-03-16 17:10:15Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xproto -pkgver=7.0.19 +pkgver=7.0.23 pkgrel=1 pkgdesc="X11 core wire protocol and auxiliary headers" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" +makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c080da482474dd422cb90b52202bd616cf0854e1') +sha1sums=('5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/xterm/PKGBUILD b/abs/core/xterm/PKGBUILD index f65898e..73295c4 100644 --- a/abs/core/xterm/PKGBUILD +++ b/abs/core/xterm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96985 2010-10-25 20:41:05Z jgc $ +# $Id: PKGBUILD 162381 2012-06-26 16:12:16Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=xterm -pkgver=266 +pkgver=281 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') url="http://invisible-island.net/xterm/" license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') -groups=('xorg') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('bb53ddd4933736a50e6391cef3472c12' +md5sums=('bca2eb95bdd57653f8e3f2f57952c1c5' '10ecc3f8ee91e3189863a172f68282d2') build() { @@ -42,7 +42,8 @@ build() { --enable-mini-luit \ --enable-narrowproto \ --enable-exec-xterm \ - --with-tty-group=tty + --with-tty-group=tty \ + --with-utmp-setgid=utmp make } @@ -54,4 +55,6 @@ package() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 "${srcdir}/LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m755 -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/${pkgname}-${pkgver}/{xterm,uxterm}.desktop ${pkgdir}/usr/share/applications/ } diff --git a/abs/core/xvidcore/PKGBUILD b/abs/core/xvidcore/PKGBUILD index 2685393..360ddd8 100644 --- a/abs/core/xvidcore/PKGBUILD +++ b/abs/core/xvidcore/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 60177 2009-12-01 17:36:38Z giovanni $ +# $Id: PKGBUILD 126345 2011-06-04 23:54:53Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=xvidcore -pkgver=1.2.2 +pkgver=1.3.2 pkgrel=1 pkgdesc="XviD is an open source MPEG-4 video codec" arch=('i686' 'x86_64') -license=('GPL') url="http://www.xvid.org/" +license=('GPL') depends=('glibc') makedepends=('nasm') source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6a3473a12c8a1fa7bdc2b5cb829fab58') +md5sums=('34389e980d4f849688f8b1e168f4e2f9') +sha1sums=('74f9ce9c1bebcc9806bf21cb53274b8102700309') build() { - cd ${srcdir}/${pkgname}/build/generic + cd "${srcdir}/${pkgname}/build/generic" ./configure --prefix=/usr - make || return 1 + make } + package() { - cd ${srcdir}/${pkgname}/build/generic - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}/build/generic" + make DESTDIR="${pkgdir}" install #Fix dynamic libraries - cd ${pkgdir}/usr/lib - mylib=$(basename libxvidcore.so.*) - ln -sf ${mylib} libxvidcore.so.4 - ln -sf ${mylib} libxvidcore.so + cd "${pkgdir}/usr/lib" + _mylib=$(basename libxvidcore.so.*) + ln -sf ${_mylib} libxvidcore.so.4 + ln -sf ${_mylib} libxvidcore.so } diff --git a/abs/core/xz/PKGBUILD b/abs/core/xz/PKGBUILD index 1425582..ef2581b 100644 --- a/abs/core/xz/PKGBUILD +++ b/abs/core/xz/PKGBUILD @@ -1,40 +1,39 @@ -# $Id: PKGBUILD 96828 2010-10-25 05:57:12Z pierre $ +# $Id: PKGBUILD 162329 2012-06-25 09:10:55Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz -pkgver=5.0.0 -pkgrel=2 +pkgver=5.0.4 +pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64') url='http://tukaani.org/xz/' license=('GPL' 'LGPL' 'custom') depends=('sh') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('f3c0706d100ad2b6d63327584d026c50') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('df3df690aef18384e1e031be7ec3a964' + '6e203465ee9b8f646d85cf84755e2b32') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-werror + make +} - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-werror - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 } diff --git a/abs/core/yasm/PKGBUILD b/abs/core/yasm/PKGBUILD index 7741fbf..d1096c2 100644 --- a/abs/core/yasm/PKGBUILD +++ b/abs/core/yasm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98381 2010-11-08 19:21:18Z andrea $ -# Maintainer: +# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $ +# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=yasm -pkgver=1.1.0 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64') license=('custom') @@ -13,12 +13,17 @@ url="http://www.tortall.net/projects/yasm/" depends=('glibc') source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('8392e5f2235c2c2a981e1a633f2698cb') +md5sums=('4cfc0686cf5350dd1305c4d905eb55a6') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check } package() { diff --git a/abs/core/zd1211-firmware/PKGBUILD b/abs/core/zd1211-firmware/PKGBUILD index a583f8e..91ad30e 100644 --- a/abs/core/zd1211-firmware/PKGBUILD +++ b/abs/core/zd1211-firmware/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 59439 2009-11-23 22:50:09Z giovanni $ +# $Id: PKGBUILD 156466 2012-04-18 14:54:36Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=zd1211-firmware pkgver=1.4 -pkgrel=3 +pkgrel=6 pkgdesc="Firmware for the in-kernel26 zd1211rw wireless driver" arch=('any') url="http://zd1211.wiki.sourceforge.net/" license=('GPL') provides=('zd1211') -source=(http://downloads.sourceforge.net/zd1211/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/zd1211/${pkgname}-${pkgver}.tar.bz2") md5sums=('19f28781d76569af8551c9d11294c870') -build() { +package() { cd "${srcdir}/${pkgname}" # Install firmware - for i in zd1211* WS11U* - do - install -D -m 644 $i "${pkgdir}/lib/firmware/zd1211/$i" || return 1 + for i in zd1211* + do + install -D -m 644 $i "${pkgdir}/usr/lib/firmware/zd1211/$i" done } diff --git a/abs/core/zlib/PKGBUILD b/abs/core/zlib/PKGBUILD index f320d37..e9a9866 100644 --- a/abs/core/zlib/PKGBUILD +++ b/abs/core/zlib/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 80715 2010-05-20 20:58:22Z pierre $ +# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib -pkgver=1.2.5 -pkgrel=2 +pkgver=1.2.7 +pkgrel=1 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64') license=('custom') url="http://www.zlib.net/" depends=('glibc') -options=('!makeflags') -source=("http://zlib.net/zlib-${pkgver}.tar.gz" - 'zlib-1.2.5-lfs-decls.patch') -md5sums=('c735eab2d659a96e5a594c9e8541ad63' - '4cb279ea3beab621f3526bf7b7ab99e5') +source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") +md5sums=('60df6a37c56e7c1366cca812414f7b85') build() { cd ${srcdir}/zlib-$pkgver - # see http://bugs.archlinux.org/task/19280 - patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch || return 1 - export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK" ./configure --prefix=/usr - make || return 1 + make grep -A 24 '^ Copyright' zlib.h > LICENSE } +check() { + cd ${srcdir}/zlib-$pkgver + make test +} + package() { cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} || return 1 + make install DESTDIR=${pkgdir} install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE } diff --git a/abs/core/zlib/zlib-1.2.5-lfs-decls.patch b/abs/core/zlib/zlib-1.2.5-lfs-decls.patch deleted file mode 100644 index 36e26af..0000000 --- a/abs/core/zlib/zlib-1.2.5-lfs-decls.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zlib-1.2.5/zlib.h -=================================================================== ---- zlib-1.2.5.orig/zlib.h -+++ zlib-1.2.5/zlib.h -@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |