summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-03 13:36:36 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-03 13:36:36 -0300
commit8c1cd392b43a7018099ce64f9359b76c2de14640 (patch)
treeb3c0d54454025b6bc478768a07b9cf7bdcca2289
parent5a01c45ea1ee67df43e376e2e4aa1833edd2ff30 (diff)
parent991d38faccf4e1fb27f31f236ad58ee840103734 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/apvlv/PKGBUILD community/i3-wm/PKGBUILD community/jack2/PKGBUILD community/perl-list-moreutils/PKGBUILD community/qc-usb-messenger/PKGBUILD community/sword/PKGBUILD community/virtualbox/PKGBUILD community/vuze/PKGBUILD extra/archboot/PKGBUILD extra/ardour/PKGBUILD extra/boost/PKGBUILD extra/digikam/PKGBUILD extra/jack/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdebase-runtime/PKGBUILD extra/kdebindings-kimono/PKGBUILD extra/kdebindings-korundum/PKGBUILD extra/kdebindings-kross/PKGBUILD extra/kdebindings-perlkde/PKGBUILD extra/kdebindings-perlqt/PKGBUILD extra/kdebindings-python/PKGBUILD extra/kdebindings-qtruby/PKGBUILD extra/kdebindings-qyoto/PKGBUILD extra/kdebindings-smokegen/PKGBUILD extra/kdebindings-smokekde/PKGBUILD extra/kdebindings-smokeqt/PKGBUILD extra/kdebindings/PKGBUILD extra/kdeedu-blinken/PKGBUILD extra/kdeedu-blinken/kdeedu-blinken.install extra/kdeedu-cantor/PKGBUILD extra/kdeedu-cantor/kdeedu-cantor.install extra/kdeedu-kalgebra/PKGBUILD extra/kdeedu-kalgebra/kdeedu-kalgebra.install extra/kdeedu-kalzium/PKGBUILD extra/kdeedu-kalzium/kdeedu-kalzium.install extra/kdeedu-kanagram/PKGBUILD extra/kdeedu-kanagram/kdeedu-kanagram.install extra/kdeedu-kbruch/PKGBUILD extra/kdeedu-kbruch/kdeedu-kbruch.install extra/kdeedu-kgeography/PKGBUILD extra/kdeedu-kgeography/kdeedu-kgeography.install extra/kdeedu-khangman/PKGBUILD extra/kdeedu-khangman/kdeedu-khangman.install extra/kdeedu-kig/PKGBUILD extra/kdeedu-kig/kdeedu-kig.install extra/kdeedu-kiten/PKGBUILD extra/kdeedu-kiten/kdeedu-kiten.install extra/kdeedu-klettres/PKGBUILD extra/kdeedu-klettres/kdeedu-klettres.install extra/kdeedu-kmplot/PKGBUILD extra/kdeedu-kmplot/kdeedu-kmplot.install extra/kdeedu-kstars/PKGBUILD extra/kdeedu-kstars/kdeedu-kstars.install extra/kdeedu-ktouch/PKGBUILD extra/kdeedu-ktouch/kdeedu-ktouch.install extra/kdeedu-kturtle/PKGBUILD extra/kdeedu-kturtle/kdeedu-kturtle.install extra/kdeedu-kwordquiz/PKGBUILD extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install extra/kdeedu-marble/PKGBUILD extra/kdeedu-marble/gpsd-2.96.patch extra/kdeedu-marble/kdeedu-marble.install extra/kdeedu-parley/PKGBUILD extra/kdeedu-parley/kdeedu-parley.install extra/kdeedu-rocs/PKGBUILD extra/kdeedu-step/PKGBUILD extra/kdeedu-step/kdeedu-step.install extra/kdegraphics-gwenview/PKGBUILD extra/kdegraphics-gwenview/kdegraphics-gwenview.install extra/kdegraphics-kamera/PKGBUILD extra/kdegraphics-kcolorchooser/PKGBUILD extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install extra/kdegraphics-kgamma/PKGBUILD extra/kdegraphics-kolourpaint/PKGBUILD extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install extra/kdegraphics-kruler/PKGBUILD extra/kdegraphics-kruler/kdegraphics-kruler.install extra/kdegraphics-ksaneplugin/PKGBUILD extra/kdegraphics-ksnapshot/PKGBUILD extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install extra/kdegraphics-okular/PKGBUILD extra/kdegraphics-okular/kdegraphics-okular.install extra/kdegraphics-strigi-analyzer/PKGBUILD extra/kdegraphics-svgpart/PKGBUILD extra/kdegraphics-thumbnailers/PKGBUILD extra/kdegraphics/PKGBUILD extra/kdelibs/PKGBUILD extra/kdemultimedia/PKGBUILD extra/kdepim-runtime/PKGBUILD extra/kdeplasma-addons/PKGBUILD extra/kdesdk-kate/PKGBUILD extra/kdesdk-kate/kdebase-kwrite.install extra/kdesdk-kate/kdesdk-kate.install extra/kdesdk-kate/pkgbuild-syntax-highlight.patch extra/kdeutils/PKGBUILD extra/kipi-plugins/PKGBUILD extra/koffice/PKGBUILD extra/konq-plugins/PKGBUILD extra/libkdcraw/PKGBUILD extra/libkdcraw/libkdcraw.install extra/libkdeedu/PKGBUILD extra/libkdeedu/libkdeedu.install extra/libkexiv2/PKGBUILD extra/libkipi/PKGBUILD extra/libkipi/libkipi.install extra/libksane/PKGBUILD extra/libksane/libksane.install extra/liblrdf/PKGBUILD extra/maxima/PKGBUILD extra/mysql/PKGBUILD extra/partitionmanager/PKGBUILD extra/pygobject/PKGBUILD extra/samba/PKGBUILD extra/sbcl/PKGBUILD extra/texlive-bin/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib-testing/lib32-mesa/PKGBUILD multilib/lib32-freetype2/PKGBUILD multilib/lib32-jack/PKGBUILD multilib/lib32-libsndfile/PKGBUILD testing/mesa/PKGBUILD ~fauno/notmuch/PKGBUILD
-rw-r--r--community-testing/cdfs/PKGBUILD28
-rw-r--r--community-testing/cdfs/cdfs-3.0.0.patch274
-rw-r--r--community-testing/cdfs/cdfs.install11
-rw-r--r--community-testing/lightspark/PKGBUILD45
-rw-r--r--community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff1180
-rw-r--r--community-testing/lightspark/lightspark.install13
-rw-r--r--community-testing/lxtask/PKGBUILD26
-rw-r--r--community-testing/qtractor/PKGBUILD34
-rw-r--r--community-testing/qtractor/qtractor.changelog14
-rw-r--r--community-testing/systemd/PKGBUILD32
-rw-r--r--community-testing/systemd/systemd.install23
-rw-r--r--community-testing/vhba-module/PKGBUILD28
-rw-r--r--community-testing/vhba-module/vhba-kernel2.6.37.patch56
-rw-r--r--community-testing/vhba-module/vhba-module.install16
-rw-r--r--community-testing/virtualbox/PKGBUILD15
-rw-r--r--community-testing/virtualbox/fix-kernel-panic.patch22
-rwxr-xr-xcommunity-testing/virtualbox/vboxdrv.sh2
-rw-r--r--community-testing/virtualbox/virtualbox-archlinux-modules.install2
-rw-r--r--community/alure/PKGBUILD11
-rw-r--r--community/apvlv/PKGBUILD23
-rw-r--r--community/apvlv/apvlv-poppler015.patch24
-rw-r--r--community/calibre/PKGBUILD8
-rw-r--r--community/cclive/PKGBUILD4
-rw-r--r--community/cgit/PKGBUILD6
-rw-r--r--community/clanlib/PKGBUILD6
-rw-r--r--community/darktable/PKGBUILD11
-rw-r--r--community/dillo/PKGBUILD13
-rw-r--r--community/dvtm/PKGBUILD34
-rw-r--r--community/dvtm/config.h148
-rwxr-xr-xcommunity/e-modules-extra-svn/PKGBUILD2
-rwxr-xr-xcommunity/e-svn/PKGBUILD4
-rwxr-xr-xcommunity/e_dbus-svn/PKGBUILD4
-rwxr-xr-xcommunity/ecore-svn/PKGBUILD6
-rwxr-xr-xcommunity/edje-svn/PKGBUILD4
-rwxr-xr-xcommunity/eet-svn/PKGBUILD4
-rw-r--r--community/eeze-svn/PKGBUILD2
-rwxr-xr-xcommunity/efreet-svn/PKGBUILD4
-rwxr-xr-xcommunity/eina-svn/PKGBUILD4
-rw-r--r--community/elementary-svn/PKGBUILD2
-rw-r--r--community/elinks/PKGBUILD12
-rwxr-xr-xcommunity/emesene/PKGBUILD13
-rw-r--r--community/emesene/emesene.run2
-rwxr-xr-xcommunity/emprint-svn/PKGBUILD4
-rw-r--r--community/encfs/PKGBUILD4
-rwxr-xr-xcommunity/evas-svn/PKGBUILD4
-rw-r--r--community/fatrat/PKGBUILD4
-rw-r--r--community/flashrom/PKGBUILD14
-rw-r--r--community/fotoxx/PKGBUILD5
-rw-r--r--community/freecol/PKGBUILD6
-rw-r--r--community/gitg/PKGBUILD6
-rw-r--r--community/glob2/PKGBUILD4
-rw-r--r--community/glom/PKGBUILD4
-rw-r--r--community/gnash/PKGBUILD2
-rw-r--r--community/gnote/PKGBUILD10
-rw-r--r--community/gpicview/PKGBUILD20
-rw-r--r--community/gpsdrive/PKGBUILD4
-rw-r--r--community/grsync/PKGBUILD8
-rw-r--r--community/hubbub/PKGBUILD25
-rw-r--r--community/i3-wm/PKGBUILD39
-rw-r--r--community/jack2/PKGBUILD77
-rw-r--r--community/java-oracle/PKGBUILD146
-rw-r--r--community/java-oracle/derby-network-server64
-rw-r--r--community/java-oracle/derby-network-server.conf2
-rw-r--r--community/java-oracle/java-control-panel.desktop12
-rw-r--r--community/java-oracle/java-monitoring-and-management-console.desktop9
-rw-r--r--community/java-oracle/java-policy-settings.desktop10
-rw-r--r--community/java-oracle/java-visualvm.desktop11
-rw-r--r--community/java-oracle/java-web-start.desktop13
-rw-r--r--community/java-oracle/javaws-launcher7
-rw-r--r--community/java-oracle/jdk.install7
-rw-r--r--community/java-oracle/jdk.profile4
-rw-r--r--community/java-oracle/jdk.profile.csh4
-rw-r--r--community/java-oracle/jre.install20
-rw-r--r--community/java-oracle/jre.profile2
-rw-r--r--community/java-oracle/jre.profile.csh4
-rw-r--r--community/klavaro/PKGBUILD6
-rw-r--r--community/kphotoalbum/PKGBUILD6
-rw-r--r--community/libcss/PKGBUILD11
-rw-r--r--community/libparserutils/PKGBUILD17
-rw-r--r--community/libvirt/PKGBUILD4
-rw-r--r--community/libwapcaplet/PKGBUILD12
-rw-r--r--community/lightspark/PKGBUILD8
-rw-r--r--community/lilypond/PKGBUILD8
-rw-r--r--community/luakit/PKGBUILD6
-rw-r--r--community/luxrender/PKGBUILD4
-rw-r--r--community/lxappearance/PKGBUILD16
-rw-r--r--community/lxdm/PKGBUILD9
-rw-r--r--community/lxlauncher/PKGBUILD36
-rw-r--r--community/lxmenu-data/PKGBUILD7
-rw-r--r--community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch43
-rw-r--r--community/lxpanel/PKGBUILD11
-rw-r--r--community/lxrandr/PKGBUILD15
-rw-r--r--community/lxtask/PKGBUILD7
-rw-r--r--community/lxterminal/PKGBUILD18
-rw-r--r--community/mapnik/PKGBUILD4
-rw-r--r--community/mc/PKGBUILD26
-rw-r--r--community/mongodb/PKGBUILD2
-rwxr-xr-xcommunity/mongodb/mongodb.install15
-rw-r--r--community/mpdscribble/PKGBUILD16
-rw-r--r--community/mpdscribble/mpdscribble.install9
-rw-r--r--community/musescore/PKGBUILD25
-rw-r--r--community/musescore/musescore.install11
-rw-r--r--community/nestopia/PKGBUILD9
-rw-r--r--community/netsurf/PKGBUILD22
-rw-r--r--community/ogre/PKGBUILD4
-rw-r--r--community/performous/PKGBUILD8
-rw-r--r--community/perl-list-moreutils/PKGBUILD25
-rw-r--r--community/picard/PKGBUILD7
-rw-r--r--community/pingus/PKGBUILD4
-rw-r--r--community/pokerth/PKGBUILD4
-rw-r--r--community/qbittorrent/PKGBUILD2
-rw-r--r--community/qc-usb-messenger/PKGBUILD35
-rw-r--r--community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch251
-rw-r--r--community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch12
-rw-r--r--community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch21
-rw-r--r--community/qc-usb-messenger/qc-usb-messenger.install35
-rw-r--r--community/qtractor/PKGBUILD9
-rw-r--r--community/rawtherapee/PKGBUILD24
-rw-r--r--community/rawtherapee/rawtherapee.desktop11
-rw-r--r--community/rawtherapee/rawtherapee.install1
-rw-r--r--community/rawtherapee/rawtherapee.pngbin3639 -> 0 bytes
-rw-r--r--community/rsyslog/PKGBUILD6
-rw-r--r--community/sakura/PKGBUILD6
-rw-r--r--community/schroot/PKGBUILD12
-rw-r--r--community/sfml/PKGBUILD4
-rw-r--r--community/smc/PKGBUILD4
-rw-r--r--community/spring/PKGBUILD15
-rw-r--r--community/spring/awk-java.patch48
-rw-r--r--community/springlobby/PKGBUILD8
-rw-r--r--community/sword/PKGBUILD19
-rw-r--r--community/sword/curl.patch22
-rw-r--r--community/tagpy/PKGBUILD4
-rw-r--r--community/teeworlds/PKGBUILD12
-rw-r--r--community/tellico/PKGBUILD23
-rw-r--r--community/tracker/PKGBUILD8
-rw-r--r--community/twinkle/PKGBUILD4
-rw-r--r--community/vhba-module/PKGBUILD25
-rw-r--r--community/vhba-module/vhba-module.install4
-rw-r--r--community/virtualbox/LocalConfig.kmk2
-rw-r--r--community/virtualbox/PKGBUILD17
-rw-r--r--community/virtualbox/fix-kernel-panic.patch22
-rwxr-xr-xcommunity/virtualbox/vboxdrv.sh2
-rw-r--r--community/virtviewer/PKGBUILD7
-rw-r--r--community/vuze/PKGBUILD29
-rw-r--r--community/vuze/vuze.desktop12
-rw-r--r--community/wt/PKGBUILD14
-rw-r--r--community/wt/wt-boost-1.47.patch11
-rw-r--r--community/xwax/PKGBUILD6
-rw-r--r--core/dash/PKGBUILD8
-rw-r--r--core/heirloom-mailx/PKGBUILD10
-rw-r--r--core/iptables/PKGBUILD56
-rw-r--r--core/iptables/empty-filter.rules (renamed from testing/iptables/empty-filter.rules)0
-rw-r--r--core/iptables/empty-mangle.rules (renamed from testing/iptables/empty-mangle.rules)0
-rw-r--r--core/iptables/empty-nat.rules (renamed from testing/iptables/empty-nat.rules)0
-rw-r--r--core/iptables/empty-raw.rules (renamed from testing/iptables/empty-raw.rules)0
-rw-r--r--core/iptables/empty-security.rules (renamed from testing/iptables/empty.rules)4
-rwxr-xr-xcore/iptables/ip6tables38
-rwxr-xr-xcore/iptables/iptables31
-rw-r--r--core/iptables/iptables.conf.d14
-rw-r--r--core/krb5/PKGBUILD20
-rw-r--r--core/krb5/krb5-1.9.1-config-script.patch25
-rw-r--r--core/libedit/PKGBUILD19
-rw-r--r--core/openldap/PKGBUILD18
-rwxr-xr-xcore/openldap/slapd1
-rw-r--r--core/procps/PKGBUILD80
-rw-r--r--core/procps/procps-3.2.8-gmake-3.82.patch (renamed from core/procps/procps-3.2.8+gmake-3.82.patch)0
-rw-r--r--core/procps/procps-3.2.8-kernel3-uts.patch20
-rw-r--r--extra/akonadi/PKGBUILD8
-rw-r--r--extra/amarok/PKGBUILD14
-rw-r--r--extra/amarok/amarok.install1
-rw-r--r--extra/archboot/PKGBUILD30
-rw-r--r--extra/ardour/PKGBUILD30
-rw-r--r--extra/ardour/ardour.changelog11
-rw-r--r--extra/ardour/raptor2.patch (renamed from testing/ardour/raptor2.patch)0
-rw-r--r--extra/avogadro/PKGBUILD4
-rw-r--r--extra/bluedevil/PKGBUILD12
-rw-r--r--extra/bluez/PKGBUILD6
-rw-r--r--extra/boost/4994-compile-fix-for-Python32-v2.patch16
-rw-r--r--extra/boost/PKGBUILD25
-rw-r--r--extra/boost/boost-1.46.0-spirit.patch59
-rw-r--r--extra/clamav/PKGBUILD26
-rw-r--r--extra/cmus/PKGBUILD13
-rw-r--r--extra/cups/PKGBUILD9
-rw-r--r--extra/cups/cups-no-export-ssllibs.patch12
-rw-r--r--extra/cups/cups.install2
-rw-r--r--extra/dconf/PKGBUILD8
-rw-r--r--extra/digikam/PKGBUILD103
-rw-r--r--extra/digikam/digikam.install1
-rw-r--r--extra/digikam/kipi-plugins.install (renamed from extra/kdepim/kdepim-kleopatra.install)0
-rw-r--r--extra/ekiga/PKGBUILD12
-rw-r--r--extra/freetype2/PKGBUILD20
-rw-r--r--extra/freetype2/allow-hlineto-vlineto-without-arguments.patch57
-rw-r--r--extra/gdb/PKGBUILD12
-rw-r--r--extra/gdb/gdb.install2
-rw-r--r--extra/gnome-vfs/PKGBUILD14
-rw-r--r--extra/gnome-vfs/gcrypt-config.patch31
-rw-r--r--extra/gparted/PKGBUILD4
-rw-r--r--extra/gpgme/PKGBUILD8
-rw-r--r--extra/hplip/PKGBUILD8
-rw-r--r--extra/hugin/PKGBUILD6
-rw-r--r--extra/jack/PKGBUILD13
-rw-r--r--extra/jack/jack.changelog6
-rw-r--r--extra/kdeaccessibility/PKGBUILD33
-rw-r--r--extra/kdeadmin/PKGBUILD11
-rw-r--r--extra/kdeartwork/PKGBUILD12
-rw-r--r--extra/kdebase-konsole/PKGBUILD30
-rw-r--r--extra/kdebase-runtime/PKGBUILD13
-rw-r--r--extra/kdebase-workspace/PKGBUILD39
-rw-r--r--extra/kdebase/PKGBUILD48
-rw-r--r--extra/kdebindings-kimono/PKGBUILD32
-rw-r--r--extra/kdebindings-korundum/PKGBUILD32
-rw-r--r--extra/kdebindings-kross/PKGBUILD51
-rw-r--r--extra/kdebindings-perlkde/PKGBUILD31
-rw-r--r--extra/kdebindings-perlqt/PKGBUILD30
-rw-r--r--extra/kdebindings-python/PKGBUILD34
-rw-r--r--extra/kdebindings-qtruby/PKGBUILD31
-rw-r--r--extra/kdebindings-qyoto/PKGBUILD31
-rw-r--r--extra/kdebindings-smokegen/PKGBUILD30
-rw-r--r--extra/kdebindings-smokekde/PKGBUILD32
-rw-r--r--extra/kdebindings-smokeqt/PKGBUILD31
-rw-r--r--extra/kdebindings/PKGBUILD72
-rw-r--r--extra/kdeedu-blinken/PKGBUILD31
-rw-r--r--extra/kdeedu-blinken/kdeedu-blinken.install (renamed from extra/kdeedu/kdeedu.install)0
-rw-r--r--extra/kdeedu-cantor/PKGBUILD34
-rw-r--r--extra/kdeedu-cantor/kdeedu-cantor.install (renamed from extra/kdepim/kdepim-kmail.install)0
-rw-r--r--extra/kdeedu-kalgebra/PKGBUILD31
-rw-r--r--extra/kdeedu-kalgebra/kdeedu-kalgebra.install (renamed from extra/kdepim/kdepim-korganizer.install)0
-rw-r--r--extra/kdeedu-kalzium/PKGBUILD31
-rw-r--r--extra/kdeedu-kalzium/kdeedu-kalzium.install (renamed from extra/kdegraphics/kdegraphics.install)0
-rw-r--r--extra/kdeedu-kanagram/PKGBUILD31
-rw-r--r--extra/kdeedu-kanagram/kdeedu-kanagram.install (renamed from extra/kipi-plugins/kipi-plugins.install)0
-rw-r--r--extra/kdeedu-kbruch/PKGBUILD31
-rw-r--r--extra/kdeedu-kbruch/kdeedu-kbruch.install (renamed from extra/konq-plugins/konq-plugins.install)0
-rw-r--r--extra/kdeedu-kgeography/PKGBUILD31
-rw-r--r--extra/kdeedu-kgeography/kdeedu-kgeography.install (renamed from extra/partitionmanager/partitionmanager.install)0
-rw-r--r--extra/kdeedu-khangman/PKGBUILD31
-rw-r--r--extra/kdeedu-khangman/kdeedu-khangman.install11
-rw-r--r--extra/kdeedu-kig/PKGBUILD34
-rw-r--r--extra/kdeedu-kig/kdeedu-kig.install12
-rw-r--r--extra/kdeedu-kiten/PKGBUILD31
-rw-r--r--extra/kdeedu-kiten/kdeedu-kiten.install11
-rw-r--r--extra/kdeedu-klettres/PKGBUILD31
-rw-r--r--extra/kdeedu-klettres/kdeedu-klettres.install11
-rw-r--r--extra/kdeedu-kmplot/PKGBUILD31
-rw-r--r--extra/kdeedu-kmplot/kdeedu-kmplot.install12
-rw-r--r--extra/kdeedu-kstars/PKGBUILD32
-rw-r--r--extra/kdeedu-kstars/kdeedu-kstars.install11
-rw-r--r--extra/kdeedu-ktouch/PKGBUILD31
-rw-r--r--extra/kdeedu-ktouch/kdeedu-ktouch.install11
-rw-r--r--extra/kdeedu-kturtle/PKGBUILD31
-rw-r--r--extra/kdeedu-kturtle/kdeedu-kturtle.install11
-rw-r--r--extra/kdeedu-kwordquiz/PKGBUILD31
-rw-r--r--extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install12
-rw-r--r--extra/kdeedu-marble/PKGBUILD36
-rw-r--r--extra/kdeedu-marble/gpsd-2.96.patch (renamed from extra/kdeedu/gpsd-2.96.patch)6
-rw-r--r--extra/kdeedu-marble/kdeedu-marble.install12
-rw-r--r--extra/kdeedu-parley/PKGBUILD31
-rw-r--r--extra/kdeedu-parley/kdeedu-parley.install12
-rw-r--r--extra/kdeedu-rocs/PKGBUILD30
-rw-r--r--extra/kdeedu-step/PKGBUILD31
-rw-r--r--extra/kdeedu-step/kdeedu-step.install11
-rw-r--r--extra/kdeedu/PKGBUILD273
-rw-r--r--extra/kdeedu/remove-libkdeedu-libscience.patch10
-rw-r--r--extra/kdegames/PKGBUILD6
-rw-r--r--extra/kdegraphics-gwenview/PKGBUILD32
-rw-r--r--extra/kdegraphics-gwenview/kdegraphics-gwenview.install12
-rw-r--r--extra/kdegraphics-kamera/PKGBUILD30
-rw-r--r--extra/kdegraphics-kcolorchooser/PKGBUILD31
-rw-r--r--extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install11
-rw-r--r--extra/kdegraphics-kgamma/PKGBUILD33
-rw-r--r--extra/kdegraphics-kolourpaint/PKGBUILD31
-rw-r--r--extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install12
-rw-r--r--extra/kdegraphics-kruler/PKGBUILD31
-rw-r--r--extra/kdegraphics-kruler/kdegraphics-kruler.install12
-rw-r--r--extra/kdegraphics-ksaneplugin/PKGBUILD31
-rw-r--r--extra/kdegraphics-ksnapshot/PKGBUILD32
-rw-r--r--extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install12
-rw-r--r--extra/kdegraphics-mobipocket/PKGBUILD31
-rw-r--r--extra/kdegraphics-okular/PKGBUILD34
-rw-r--r--extra/kdegraphics-okular/kdegraphics-okular.install12
-rw-r--r--extra/kdegraphics-strigi-analyzer/PKGBUILD31
-rw-r--r--extra/kdegraphics-svgpart/PKGBUILD31
-rw-r--r--extra/kdegraphics-thumbnailers/PKGBUILD31
-rw-r--r--extra/kdegraphics/PKGBUILD151
-rw-r--r--extra/kdelibs/PKGBUILD31
-rw-r--r--extra/kdelibs/fix-lineedit-clear-button.patch30
-rw-r--r--extra/kdelibs/fix-lineedit-completion-tab.patch56
-rw-r--r--extra/kdelibs/kdelibs.install3
-rw-r--r--extra/kdemultimedia/PKGBUILD21
-rw-r--r--extra/kdemultimedia/fix-memleak-in-kmix.patch55
-rw-r--r--extra/kdenetwork/PKGBUILD17
-rw-r--r--extra/kdepim-runtime/PKGBUILD15
-rw-r--r--extra/kdepim-runtime/disable-l10n.patch10
-rw-r--r--extra/kdepim-runtime/kdepim-runtime.install3
-rw-r--r--extra/kdepim/PKGBUILD36
-rw-r--r--extra/kdepim/disable-l10n.patch10
-rw-r--r--extra/kdepimlibs/PKGBUILD10
-rw-r--r--extra/kdeplasma-addons/PKGBUILD25
-rw-r--r--extra/kdeplasma-applets-networkmanagement/PKGBUILD6
-rw-r--r--extra/kdesdk-kate/PKGBUILD58
-rw-r--r--extra/kdesdk-kate/kdebase-kwrite.install12
-rw-r--r--extra/kdesdk-kate/kdesdk-kate.install (renamed from extra/kdesdk/kdesdk-kate.install)2
-rw-r--r--extra/kdesdk-kate/pkgbuild-syntax-highlight.patch (renamed from extra/kdelibs/abs-syntax-highlight.patch)7
-rw-r--r--extra/kdesdk/PKGBUILD46
-rw-r--r--extra/kdetoys/PKGBUILD6
-rw-r--r--extra/kdeutils/PKGBUILD17
-rw-r--r--extra/kdeutils/fix-kcalc-keys.patch92
-rw-r--r--extra/kdewebdev/PKGBUILD6
-rw-r--r--extra/kipi-plugins/PKGBUILD37
-rw-r--r--extra/koffice/PKGBUILD16
-rw-r--r--extra/konq-plugins/PKGBUILD31
-rw-r--r--extra/libass/PKGBUILD9
-rw-r--r--extra/libcl/PKGBUILD37
-rw-r--r--extra/libkdcraw/PKGBUILD32
-rw-r--r--extra/libkdcraw/libkdcraw.install11
-rw-r--r--extra/libkdeedu/PKGBUILD31
-rw-r--r--extra/libkdeedu/libkdeedu.install11
-rw-r--r--extra/libkexiv2/PKGBUILD31
-rw-r--r--extra/libkipi/PKGBUILD32
-rw-r--r--extra/libkipi/libkipi.install11
-rw-r--r--extra/libksane/PKGBUILD32
-rw-r--r--extra/libksane/libksane.install11
-rw-r--r--extra/liblrdf/PKGBUILD18
-rw-r--r--extra/liblrdf/raptor2.diff (renamed from testing/liblrdf/raptor2.diff)0
-rw-r--r--extra/liborigin2/PKGBUILD4
-rw-r--r--extra/libpst/PKGBUILD9
-rw-r--r--extra/libsigc++/PKGBUILD6
-rw-r--r--extra/libsndfile/PKGBUILD8
-rw-r--r--extra/libsoup/PKGBUILD8
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD4
-rw-r--r--extra/libva/PKGBUILD11
-rw-r--r--extra/libva/libva-dont-install-tests.patch48
-rw-r--r--extra/lyx/PKGBUILD4
-rw-r--r--extra/maxima/PKGBUILD6
-rw-r--r--extra/memcached/PKGBUILD28
-rw-r--r--extra/memcached/fix-type-punning-issues.patch73
-rw-r--r--extra/mkvtoolnix/PKGBUILD4
-rw-r--r--extra/mod_fcgid/PKGBUILD6
-rw-r--r--extra/mysql/PKGBUILD8
-rw-r--r--extra/opal/PKGBUILD11
-rw-r--r--extra/oxygen-gtk/PKGBUILD12
-rw-r--r--extra/parted/PKGBUILD13
-rw-r--r--extra/parted/linux.c.patch25
-rw-r--r--extra/partitionmanager/PKGBUILD31
-rw-r--r--extra/phonon-vlc/PKGBUILD14
-rw-r--r--extra/phonon/PKGBUILD22
-rw-r--r--extra/polkit-gnome/PKGBUILD6
-rw-r--r--extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop2
-rw-r--r--extra/prison/PKGBUILD29
-rw-r--r--extra/ptlib/PKGBUILD8
-rw-r--r--extra/pycups/PKGBUILD6
-rw-r--r--extra/pygobject/PKGBUILD19
-rw-r--r--extra/pygobject/python3-fix-build.patch34
-rw-r--r--extra/pygobject/python3-fix-maketrans.patch36
-rw-r--r--extra/qrencode/PKGBUILD (renamed from community/qrencode/PKGBUILD)2
-rw-r--r--extra/qrencode/libpng14.diff (renamed from community/qrencode/libpng14.diff)0
-rw-r--r--extra/rtmpdump/PKGBUILD23
-rw-r--r--extra/samba/PKGBUILD10
-rw-r--r--extra/sbcl/PKGBUILD14
-rw-r--r--extra/skanlite/PKGBUILD14
-rw-r--r--extra/slv2/PKGBUILD6
-rw-r--r--extra/sonata/ChangeLog4
-rw-r--r--extra/sonata/PKGBUILD19
-rw-r--r--extra/sonata/info.py.patch15
-rw-r--r--extra/soprano/PKGBUILD8
-rw-r--r--extra/source-highlight/PKGBUILD5
-rw-r--r--extra/source-highlight/source-highlight.install2
-rw-r--r--extra/system-config-printer/PKGBUILD6
-rw-r--r--extra/telepathy-gabble/PKGBUILD12
-rw-r--r--extra/telepathy-glib/PKGBUILD7
-rw-r--r--extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD34
-rw-r--r--extra/telepathy-kde-accounts-kcm/PKGBUILD31
-rw-r--r--extra/telepathy-kde-approver/PKGBUILD31
-rw-r--r--extra/telepathy-kde-contact-list/PKGBUILD32
-rw-r--r--extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install11
-rw-r--r--extra/telepathy-kde-filetransfer-handler/PKGBUILD30
-rw-r--r--extra/telepathy-kde-presence-dataengine/PKGBUILD31
-rw-r--r--extra/telepathy-kde-send-file/PKGBUILD31
-rw-r--r--extra/telepathy-kde-send-file/telepathy-kde-send-file.install11
-rw-r--r--extra/telepathy-kde-text-ui/PKGBUILD31
-rw-r--r--extra/telepathy-qt4/PKGBUILD8
-rw-r--r--extra/texlive-bin/09-texlive-fonts.conf9
-rw-r--r--extra/texlive-bin/PKGBUILD348
-rw-r--r--extra/texlive-bin/dvipng-fix-options.patch10
-rw-r--r--extra/texlive-bin/fix-fontforge-encoding.patch12
-rw-r--r--extra/texlive-bin/texmf.cnf663
-rw-r--r--extra/udisks/PKGBUILD4
-rw-r--r--extra/uim/PKGBUILD20
-rw-r--r--extra/uim/install5
-rw-r--r--extra/vim/PKGBUILD8
-rw-r--r--extra/vim/gvim.desktop102
-rw-r--r--extra/vlc/PKGBUILD8
-rw-r--r--extra/wesnoth/PKGBUILD13
-rw-r--r--extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch70
-rw-r--r--extra/xmlto/PKGBUILD21
-rw-r--r--kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch133
-rw-r--r--kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch55
-rw-r--r--libre/aif-libre/PKGBUILD3
-rw-r--r--libre/linux-libre/PKGBUILD267
-rw-r--r--libre/linux-libre/change-default-console-loglevel.patch13
-rw-r--r--libre/linux-libre/config.i6861
-rw-r--r--libre/linux-libre/config.x86_641
-rw-r--r--libre/linux-libre/fix-i915.patch1
-rw-r--r--libre/linux-libre/linux-libre.install11
-rw-r--r--libre/linux-libre/linux-libre.preset5
-rw-r--r--multilib-testing/lib32-freetype2/PKGBUILD42
-rw-r--r--multilib-testing/lib32-freetype2/freetype-2.2.1-enable-valid.patch20
-rw-r--r--multilib-testing/lib32-freetype2/freetype-2.3.0-enable-spr.patch11
-rw-r--r--multilib-testing/lib32-mesa/git_fixes.patch36
-rw-r--r--multilib-testing/lib32-mesa/linking_fix.patch22
-rw-r--r--testing/archboot/PKGBUILD48
-rw-r--r--testing/archboot/archboot.install20
-rw-r--r--testing/archboot/vmware-detect.c13
-rw-r--r--testing/ardour/PKGBUILD73
-rw-r--r--testing/ardour/ardour.changelog49
-rw-r--r--testing/ardour/ardour.desktop9
-rw-r--r--testing/ardour/gcc46.patch42
-rw-r--r--testing/dash/PKGBUILD28
-rw-r--r--testing/dialog/PKGBUILD27
-rw-r--r--testing/freetype2/PKGBUILD28
-rw-r--r--testing/freetype2/freetype-2.2.1-enable-valid.patch20
-rw-r--r--testing/freetype2/freetype-2.3.0-enable-spr.patch11
-rw-r--r--testing/gpgme/PKGBUILD30
-rw-r--r--testing/gpgme/gpgme.install18
-rw-r--r--testing/iptables/PKGBUILD65
-rwxr-xr-xtesting/iptables/ip6tables69
-rwxr-xr-xtesting/iptables/iptables68
-rw-r--r--testing/iptables/iptables.conf.d12
-rw-r--r--testing/iptables/simple_firewall.rules11
-rw-r--r--testing/keyutils/PKGBUILD6
-rw-r--r--testing/libcap/PKGBUILD26
-rw-r--r--testing/libedit/PKGBUILD30
-rw-r--r--testing/libgssglue/PKGBUILD34
-rw-r--r--testing/libgssglue/gssapi_mech.conf22
-rw-r--r--testing/liblrdf/PKGBUILD34
-rw-r--r--testing/liblrdf/md5.patch18
-rw-r--r--testing/libreoffice/PKGBUILD139
-rw-r--r--testing/libtirpc/PKGBUILD19
-rw-r--r--testing/libtirpc/libtirpc-0.2.3rc1.patch637
-rw-r--r--testing/libtirpc/libtirpc-fix-segfault-0.2.2.patch28
-rw-r--r--testing/linux/PKGBUILD240
-rw-r--r--testing/linux/config5772
-rw-r--r--testing/linux/config.x86_645513
-rw-r--r--testing/linux/fix-i915.patch26
-rw-r--r--testing/linux/linux.install58
-rw-r--r--testing/linux/linux.preset14
-rw-r--r--testing/lirc/PKGBUILD103
-rw-r--r--testing/lirc/irexec.conf5
-rwxr-xr-xtesting/lirc/irexecd38
-rw-r--r--testing/lirc/kernel-2.6.39.patch54
-rw-r--r--testing/lirc/lirc.install16
-rw-r--r--testing/lirc/lirc.logrotate5
-rw-r--r--testing/lirc/lirc_atiusb-kfifo.patch31
-rw-r--r--testing/lirc/lirc_wpc8769l.patch88
-rwxr-xr-xtesting/lirc/lircd52
-rw-r--r--testing/lirc/lircd-handle-large-config.patch39
-rw-r--r--testing/lirc/lircd.conf8
-rwxr-xr-xtesting/lirc/lircmd36
-rw-r--r--testing/mesa/git_fixes.patch36
-rw-r--r--testing/mesa/linking_fix.patch22
-rw-r--r--testing/nfs-utils/PKGBUILD75
-rw-r--r--testing/nfs-utils/exports15
-rw-r--r--testing/nfs-utils/idmapd.conf14
-rw-r--r--testing/nfs-utils/kernel-3.0-segfault.patch53
-rw-r--r--testing/nfs-utils/nfs-common319
-rw-r--r--testing/nfs-utils/nfs-common.conf40
-rw-r--r--testing/nfs-utils/nfs-server303
-rw-r--r--testing/nfs-utils/nfs-server.conf29
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch138
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch39
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch15
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch69
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch57
-rw-r--r--testing/nfs-utils/nfs-utils.install32
-rw-r--r--testing/nfs-utils/start-statd.patch22
-rw-r--r--testing/openldap/PKGBUILD96
-rw-r--r--testing/openldap/ntlm.patch230
-rw-r--r--testing/openldap/openldap.install20
-rwxr-xr-xtesting/openldap/slapd49
-rw-r--r--testing/openldap/slapd.default6
-rw-r--r--testing/pywebkitgtk/PKGBUILD27
-rw-r--r--testing/slv2/PKGBUILD32
-rw-r--r--testing/slv2/slv2.changelog23
-rw-r--r--testing/slv2/slv2.install14
-rw-r--r--testing/texlive-bin/09-texlive-fonts.conf9
-rw-r--r--testing/texlive-bin/PKGBUILD335
-rw-r--r--testing/texlive-bin/archlinux-build.patch40
-rw-r--r--testing/texlive-bin/fix-fontforge-encoding.patch12
-rw-r--r--testing/texlive-bin/texlive.install18
-rw-r--r--testing/texlive-bin/texmf.cnf676
-rw-r--r--testing/udev/PKGBUILD20
-rw-r--r--testing/udev/static-node-permission.patch26
-rw-r--r--testing/udev/udev.install10
-rw-r--r--testing/xf86-video-nouveau/PKGBUILD6
-rw-r--r--~fauno/notmuch/PKGBUILD4
495 files changed, 7744 insertions, 19833 deletions
diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD
new file mode 100644
index 000000000..891e3d14f
--- /dev/null
+++ b/community-testing/cdfs/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
+
+pkgname=cdfs
+pkgver=2.6.27
+pkgrel=15
+pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
+arch=(i686 x86_64)
+url="http://www.elis.UGent.be/~ronsse/cdfs/"
+license=('GPL')
+makedepends=('linux-headers')
+install=cdfs.install
+source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
+ "cdfs-3.0.0.patch")
+md5sums=('ac64c014a90e3c488394832ea29605b3'
+ 'aba7da94a9dcbb8a93ea423cb6958fef')
+
+build() {
+ _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+ depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
+
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/cdfs-3.0.0.patch
+ make
+ mkdir -p $pkgdir/lib/modules/`uname -r`/extra
+ cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra
+}
diff --git a/community-testing/cdfs/cdfs-3.0.0.patch b/community-testing/cdfs/cdfs-3.0.0.patch
new file mode 100644
index 000000000..20194b848
--- /dev/null
+++ b/community-testing/cdfs/cdfs-3.0.0.patch
@@ -0,0 +1,274 @@
+diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
+--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300
++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400
+@@ -83,7 +83,7 @@
+ #else
+ .mmap = generic_file_readonly_mmap,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+- .sendfile = generic_file_sendfile
++// .sendfile = generic_file_sendfile
+ #else
+ .splice_read = generic_file_splice_read
+ #endif
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400
+@@ -32,19 +30,14 @@
+ * Added code to transform /proc/cdfs into a sequential synthetic file. *
+ *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+-
+ #include <linux/seq_file.h>
+-
+-#ifndef OLD_KERNEL
+ #include <linux/statfs.h>
+-#endif
++#include <linux/sched.h>
+
+ extern struct seq_operations cdfs_operations;
+ extern struct _track_info *dummy_track_p;
+
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ struct inode *cdfs_iget(struct super_block *sp, unsigned long ino);
+-#endif
+ /*============================================================================*
+ * cdfs_open() *
+ * Description: *
+@@ -115,15 +108,8 @@
+
+ /********************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
+- kdev_t dev = sb->s_dev;
+- int i, j, t;
+- struct cdrom_tochdr hdr;
+-#else
+ static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
+ int i, t;
+-#endif
+ struct cdrom_tocentry entry;
+ int no_audio=0, no_data=0;
+ cd * this_cd;
+@@ -131,24 +117,13 @@
+
+ PRINT("cdfs_mount\n");
+
+-#ifdef OLD_KERNEL
+- MOD_INC_USE_COUNT;
+-
+- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd
+-#else
+ sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd
+-#endif
+
+ sb->s_blocksize = CD_FRAMESIZE;
+ sb->s_blocksize_bits = 11;
+
+ if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ return -ENOMEM;
+-#endif
+ }
+
+ this_cd->mode = MODE;
+@@ -160,13 +135,8 @@
+
+ // Initialize cache for maximum sector size
+ if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ kfree(cdfs_info(sb));
+ return -ENOMEM;
+-#endif
+ }
+
+ // Cache is still invalid
+@@ -183,23 +153,13 @@
+ if (this_cd->toc_scsi){
+ if (cdfs_toc_read_full(sb)){
+ printk("TOC read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ } else {
+ //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
+ if (cdfs_toc_read(sb)){
+ printk("cdfs_toc_read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ }
+
+@@ -365,11 +325,7 @@
+ sb->s_flags |= MS_RDONLY;
+ sb->s_op = &cdfs_ops;
+ /* always get inode status */
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ retinode=cdfs_iget(sb, 0);
+-#else
+- retinode=iget(sb, 0);
+-#endif
+ if ( IS_ERR(retinode) )
+ return PTR_ERR(retinode);
+
+@@ -379,16 +335,12 @@
+
+ cdfs_proc_cd = this_cd;
+
+-#ifdef OLD_KERNEL
+- return sb;
+-#else
+ return 0;
+
+ invalid:
+ kfree(this_cd->cache);
+ kfree(cdfs_info(sb));
+ return -EINVAL;
+-#endif
+ }
+
+ /************************************************************************/
+@@ -410,27 +362,12 @@
+ // Remove /proc entry
+ cdfs_proc_cd = NULL;
+ kfree(cdfs_info(sb));
+-
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+-#endif
+-
+ }
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
+ cd * this_cd = cdfs_info(d->d_sb);
+-#else
+-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#endif
+-#endif
+ PRINT("rmfs_statfs\n");
+
+ buf->f_type = CDFS_MAGIC;
+@@ -460,11 +397,7 @@
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
+-#else
+ static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
+-#endif
+ struct inode * inode;
+ int i;
+ cd * this_cd = cdfs_info(dir->i_sb);
+@@ -480,15 +413,9 @@
+ /* Use goto and read inode with iget()/cdfs_iget() */
+ /* Thanks to David Howells for patch and Master class in his mail */
+ found:
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ inode = cdfs_iget(dir->i_sb, i);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
+-#else
+- inode = iget(dir->i_sb, i);
+- if (!inode)
+- return ERR_PTR(-ENOMEM);
+-#endif
+ d_add(dentry, inode);
+ return NULL;
+ }
+@@ -529,12 +456,8 @@
+ i->i_fop = &cdfs_dir_operations;
+ } else { /* file */
+ i->i_size = this_cd->track[i->i_ino].size;
+-#ifdef OLD_KERNEL
+- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
+-#else
+ i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
+ i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
+-#endif
+ i->i_mode = this_cd->mode;
+ if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
+ i->i_fop = &cdfs_cddata_file_operations;
+@@ -587,33 +510,21 @@
+ /******************************************************************/
+
+ static struct super_operations cdfs_ops = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+- .read_inode = cdfs_read_inode,
+-#endif
+ .put_super = cdfs_umount,
+ .statfs = cdfs_statfs
+ };
+
+-#ifdef OLD_KERNEL
+-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+-#else
+-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
+-#endif
+-}
++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
++//}
+
+ static struct file_system_type cdfs_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "cdfs",
+- .get_sb = cdfs_get_sb,
++// .get_sb = cdfs_get_sb,
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV
+ };
+-#endif
+
+ /******************************************************/
+
+@@ -621,10 +532,6 @@
+ MODULE_DESCRIPTION("CDfs: a CD filesystem");
+ MODULE_LICENSE("GPL");
+
+-#ifdef OLD_KERNEL
+-EXPORT_NO_SYMBOLS;
+-#endif
+-
+ /******************************************************************/
+
+ static int __init cdfs_init(void) {
+@@ -676,11 +583,7 @@
+
+ if (!options) return;
+
+-#ifdef OLD_KERNEL
+- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
+-#else
+ while ((this_char = strsep(&options,",")) != NULL) {
+-#endif
+
+ if (!strcmp(this_char,"single"))
+ this_cd->single=TRUE;
diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install
new file mode 100644
index 000000000..3693d60ed
--- /dev/null
+++ b/community-testing/cdfs/cdfs.install
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/depmod -a
+}
+
+post_upgrade() {
+ /sbin/depmod -a
+}
+
+post_remove() {
+ /sbin/depmod -a
+}
diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD
deleted file mode 100644
index 90e48d272..000000000
--- a/community-testing/lightspark/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.5.0rc1
-pkgrel=2
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('mesa' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost')
-optdepends=('gnash-gtk: fallback support')
-install='lightspark.install'
-source=("http://launchpad.net/lightspark/trunk/lightspark-0.5.0/+download/lightspark-0.5.0~rc1.tar.gz"
- 'git-fixes-set-sys-in-destroystream-class.diff')
-md5sums=('bf668cf6178fbbb75a7898bd6c6dd1e5'
- '57b1b5a975f5e2518c2a96d61b925f41')
-_pkgver='0.5.0~rc1'
-
-build() {
- cd lightspark-${_pkgver}
- patch -Np1 -i ${srcdir}/git-fixes-set-sys-in-destroystream-class.diff
- cd ${srcdir}
-
- rm -rf build
- mkdir build
- cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCOMPILE_PLUGIN=1 \
- -DCMAKE_BUILD_TYPE=Release \
- -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
- ../lightspark-${_pkgver}
-
- make
-}
-
-package() {
- cd build
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff b/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff
deleted file mode 100644
index d20239d29..000000000
--- a/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff
+++ /dev/null
@@ -1,1180 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8eea6b..aae2d71 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -167,7 +167,7 @@ if(Boost_FOUND)
- ENDIF(Boost_FOUND)
- IF(UNIX)
- INCLUDE(FindPkgConfig REQUIRED)
-- pkg_check_modules(EXTRA_LIBS REQUIRED x11 fontconfig cairo pangocairo)
-+ pkg_check_modules(EXTRA_LIBS REQUIRED x11 cairo pangocairo)
- ENDIF(UNIX)
-
- IF(WIN32)
-diff --git a/conf/FindFTGL.cmake b/conf/FindFTGL.cmake
-deleted file mode 100644
-index d63178f..0000000
---- a/conf/FindFTGL.cmake
-+++ /dev/null
-@@ -1,27 +0,0 @@
--# - Find FTGL
--# Find the native FTGL headers and libraries.
--#
--# FTGL_INCLUDE_DIRS - where to find pcre.h, etc.
--# FTGL_LIBRARIES - List of libraries when using ftgl
--# FTGL_FOUND - True if ftgl found.
--
--# Look for the header file.
--FIND_PATH(FTGL_INCLUDE_DIR NAMES FTGL/ftgl.h)
--MARK_AS_ADVANCED(FTGL_INCLUDE_DIR)
--
--# Look for the library.
--FIND_LIBRARY(FTGL_LIBRARY NAMES
-- ftgl
-- ftgl_d
--)
--MARK_AS_ADVANCED(FTGL_LIBRARY)
--
--# handle the QUIETLY and REQUIRED arguments and set FTGL_FOUND to TRUE if
--# all listed variables are TRUE
--INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(FTGL DEFAULT_MSG FTGL_LIBRARY FTGL_INCLUDE_DIR)
--
--IF(FTGL_FOUND)
-- SET(FTGL_LIBRARIES ${FTGL_LIBRARY})
-- SET(FTGL_INCLUDE_DIRS ${FTGL_INCLUDE_DIR})
--ENDIF(FTGL_FOUND)
-diff --git a/src/asobject.cpp b/src/asobject.cpp
-index f2f9620..6808c14 100644
---- a/src/asobject.cpp
-+++ b/src/asobject.cpp
-@@ -556,6 +556,7 @@ ASFUNCTIONBODY(ASObject,hasOwnProperty)
- name.name_type=multiname::NAME_STRING;
- name.name_s=args[0]->toString();
- name.ns.push_back(nsNameAndKind("",NAMESPACE));
-+ name.isAttribute=false;
- bool ret=obj->hasPropertyByMultiname(name, true);
- return abstract_b(ret);
- }
-diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp
-index 46c25bc..279d1f7 100644
---- a/src/backends/decoder.cpp
-+++ b/src/backends/decoder.cpp
-@@ -26,7 +26,7 @@
- #include "graphics.h"
- #include "backends/rendering.h"
-
--#if LIBAVUTIL_VERSION_MAJOR < 52
-+#if LIBAVUTIL_VERSION_MAJOR < 51
- #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
- #define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
- #endif
-diff --git a/src/backends/netutils.cpp b/src/backends/netutils.cpp
-index ce08dbc..8e4ff6a 100644
---- a/src/backends/netutils.cpp
-+++ b/src/backends/netutils.cpp
-@@ -681,7 +681,6 @@ void Downloader::allocateBuffer(size_t size)
- //Create buffer
- if(buffer == NULL)
- {
--
- buffer = (uint8_t*) calloc(size, sizeof(uint8_t));
- stableBuffer = buffer;
- setg((char*)buffer,(char*)buffer,(char*)buffer);
-@@ -690,7 +689,7 @@ void Downloader::allocateBuffer(size_t size)
- else
- {
- assert(!cached);
-- intptr_t curLen = (intptr_t) (egptr()-eback());
-+ intptr_t curLen = receivedLength;
- //We have to extend the buffer, so create a new one
- if(stableBuffer!=buffer)
- {
-diff --git a/src/backends/rendering.cpp b/src/backends/rendering.cpp
-index ea7f5ec..b52b8f2 100644
---- a/src/backends/rendering.cpp
-+++ b/src/backends/rendering.cpp
-@@ -223,13 +223,13 @@ void* RenderThread::worker(RenderThread* th)
- LOG(LOG_ERROR,_("glX not present"));
- return NULL;
- }
-- int attrib[10]={GLX_BUFFER_SIZE,24,GLX_DOUBLEBUFFER,True,None};
-+ int attrib[10]={GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, GLX_DOUBLEBUFFER, True, None};
- GLXFBConfig* fb=glXChooseFBConfig(d, 0, attrib, &a);
- if(!fb)
- {
-- attrib[2]=None;
-- fb=glXChooseFBConfig(d, 0, attrib, &a);
-+ attrib[6]=None;
- LOG(LOG_ERROR,_("Falling back to no double buffering"));
-+ fb=glXChooseFBConfig(d, 0, attrib, &a);
- }
- if(!fb)
- {
-diff --git a/src/backends/urlutils.cpp b/src/backends/urlutils.cpp
-index 7575e49..176b7db 100644
---- a/src/backends/urlutils.cpp
-+++ b/src/backends/urlutils.cpp
-@@ -332,14 +332,14 @@ std::string URLInfo::encode(const std::string& u, ENCODING type)
- str += '+';
- //Additionally ENCODE_URICOMPONENT and ENCODE_URI don't encode:
- //- _ . ! ~ * ' ( )
-- else if((type == ENCODE_URI || ENCODE_URICOMPONENT) &&
-+ else if((type == ENCODE_URI || type == ENCODE_URICOMPONENT || type == ENCODE_ESCAPE) &&
- (u[i] == '-' || u[i] == '_' || u[i] == '.' || u[i] == '!' ||
- u[i] == '~' || u[i] == '*' || u[i] == '\'' || u[i] == '(' ||
- u[i] == ')'))
- str += u[i];
- //Additionally ENCODE_URI doesn't encode:
- //; / ? : @ & = + $ , #
-- else if(type == ENCODE_URI &&
-+ else if((type == ENCODE_URI || type == ENCODE_ESCAPE) &&
- (u[i] == ';' || u[i] == '/' || u[i] == '?' || u[i] == ':' ||
- u[i] == '@' || u[i] == '&' || u[i] == '=' || u[i] == '+' ||
- u[i] == '$' || u[i] == ',' || u[i] == '#'))
-diff --git a/src/parsing/streams.cpp b/src/parsing/streams.cpp
-index 8a5d7b0..b7894b0 100644
---- a/src/parsing/streams.cpp
-+++ b/src/parsing/streams.cpp
-@@ -27,167 +27,6 @@
-
- using namespace std;
-
--sync_stream::sync_stream():head(0),tail(0),wait_notfull(false),wait_notempty(false),buf_size(1024*1024),failed(false),ended(false),consumed(0)
--{
-- buffer=new char[buf_size];
-- sem_init(&mutex,0,1);
-- sem_init(&notfull,0,0);
-- sem_init(&notempty,0,0);
-- setg(buffer,buffer,buffer);
--}
--
--sync_stream::~sync_stream()
--{
-- delete[] buffer;
-- sem_destroy(&mutex);
-- sem_destroy(&notfull);
-- sem_destroy(&notempty);
--}
--
--void sync_stream::stop()
--{
-- sem_wait(&mutex);
-- failed=true;
-- if(wait_notfull)
-- {
-- wait_notfull=false;
-- sem_post(&notfull);
-- sem_wait(&mutex);
-- }
-- if(wait_notempty)
-- {
-- wait_notempty=false;
-- sem_post(&notempty);
-- sem_wait(&mutex);
-- }
-- sem_post(&mutex);
--}
--
--void sync_stream::eof()
--{
-- sem_wait(&mutex);
-- ended=true;
-- if(wait_notempty)
-- {
-- wait_notempty=false;
-- sem_post(&notempty);
-- }
-- else
-- sem_post(&mutex);
--}
--
--sync_stream::pos_type sync_stream::seekoff(off_type off, ios_base::seekdir dir,ios_base::openmode mode)
--{
-- assert(off==0);
-- //The current offset is the amount of byte completely consumed plus the amount used in the buffer
-- int ret=consumed+(gptr()-eback());
-- return ret;
--}
--
--sync_stream::int_type sync_stream::underflow()
--{
-- assert(gptr()==egptr());
--
-- sem_wait(&mutex);
-- //First of all we add the length of the buffer to the consumed variable
-- int consumedNow=(gptr()-eback());
-- consumed+=consumedNow;
-- head+=consumedNow;
-- head%=buf_size;
-- if(failed)
-- {
-- sem_post(&mutex);
-- //Return EOF
-- return -1;
-- }
-- if(tail==head)
-- {
-- if(ended) //There is no way more data will arrive
-- {
-- sem_post(&mutex);
-- //Return EOF
-- return -1;
-- }
-- wait_notempty=true;
-- sem_post(&mutex);
-- sem_wait(&notempty);
-- if(failed || ended)
-- {
-- sem_post(&mutex);
-- //Return EOF
-- return -1;
-- }
-- }
--
-- if(head<tail)
-- setg(buffer+head,buffer+head,buffer+tail);
-- else
-- setg(buffer+head,buffer+head,buffer+buf_size);
--
-- //Verify that there is room
-- if(wait_notfull && ((tail-head+buf_size)%buf_size)<buf_size-1)
-- {
-- wait_notfull=true;
-- sem_post(&notfull);
-- }
-- else
-- sem_post(&mutex);
--
-- //Cast to unsigned, otherwise 0xff would become eof
-- return (unsigned char)buffer[head];
--}
--
--uint32_t sync_stream::write(char* buf, int len)
--{
-- sem_wait(&mutex);
-- if(failed)
-- {
-- sem_post(&mutex);
-- return 0;
-- }
-- if(((tail-head+buf_size)%buf_size)==buf_size-1)
-- {
-- wait_notfull=true;
-- sem_post(&mutex);
-- sem_wait(&notfull);
-- if(failed)
-- {
-- sem_post(&mutex);
-- return 0;
-- }
-- }
--
-- if((head-tail+buf_size-1)%buf_size<len)
-- len=(head-tail+buf_size-1)%buf_size;
--
-- if(tail+len>buf_size)
-- {
-- int i=buf_size-tail;
-- memcpy(buffer+tail,buf,i);
-- memcpy(buffer,buf+i,len-i);
-- }
-- else
-- memcpy(buffer+tail,buf,len);
-- tail+=len;
-- tail%=buf_size;
-- assert(head!=tail);
-- if(wait_notempty)
-- {
-- wait_notempty=false;
-- sem_post(&notempty);
-- }
-- else
-- sem_post(&mutex);
-- return len;
--}
--
--uint32_t sync_stream::getFree()
--{
-- sem_wait(&mutex);
-- uint32_t freeBytes=(head-tail+buf_size-1)%buf_size;
-- sem_post(&mutex);
-- return freeBytes;
--}
-
- zlib_filter::zlib_filter(streambuf* b):backend(b),consumed(0)
- {
-diff --git a/src/parsing/streams.h b/src/parsing/streams.h
-index c631e45..988dcf2 100644
---- a/src/parsing/streams.h
-+++ b/src/parsing/streams.h
-@@ -43,31 +43,6 @@ public:
- ~zlib_filter();
- };
-
--class DLL_PUBLIC sync_stream: public std::streambuf
--{
--public:
-- sync_stream();
-- void stop();
-- void eof();
-- ~sync_stream();
-- uint32_t write(char* buf, int len);
-- uint32_t getFree();
-- virtual int_type underflow();
-- virtual pos_type seekoff(off_type, std::ios_base::seekdir, std::ios_base::openmode);
--private:
-- char* buffer;
-- int head;
-- int tail;
-- sem_t mutex;
-- sem_t notfull;
-- sem_t notempty;
-- bool wait_notfull;
-- bool wait_notempty;
-- const int buf_size;
-- bool failed;
-- bool ended;
-- int consumed;
--};
-
- class bytes_buf:public std::streambuf
- {
-diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
-index ffb578d..fd60233 100644
---- a/src/plugin/plugin.cpp
-+++ b/src/plugin/plugin.cpp
-@@ -569,6 +569,7 @@ int32_t nsPluginInstance::Write(NPStream *stream, int32_t offset, int32_t len, v
-
- NPError nsPluginInstance::DestroyStream(NPStream *stream, NPError reason)
- {
-+ sys=m_sys;
- NPDownloader* dl=static_cast<NPDownloader*>(stream->pdata);
- assert(dl);
- //Check if async destructin of this downloader has been requested
-@@ -586,6 +587,7 @@ NPError nsPluginInstance::DestroyStream(NPStream *stream, NPError reason)
- }
- //Notify our downloader of what happened
- URLNotify(stream->url, reason, stream->pdata);
-+ sys=NULL;
- return NPERR_NO_ERROR;
- }
-
-diff --git a/src/scripting/flashdisplay.cpp b/src/scripting/flashdisplay.cpp
-index bfdf846..5df6f98 100644
---- a/src/scripting/flashdisplay.cpp
-+++ b/src/scripting/flashdisplay.cpp
-@@ -323,6 +323,7 @@ void Loader::execute()
- contentLoaderInfo->incRef();
- //Use a local variable to store the new root, as the localRoot member may change
- _R<RootMovieClip> newRoot=_MR(RootMovieClip::getInstance(contentLoaderInfo.getPtr()));
-+ newRoot->setOrigin(url.getParsedURL(), "");
-
- _addChildAt(newRoot,0);
-
-@@ -2972,7 +2973,10 @@ ASFUNCTIONBODY(Graphics,beginGradientFill)
- assert_and_throw(args[2]->getObjectType()==T_ARRAY);
- Array* alphas=Class<Array>::cast(args[2]);
-
-- assert_and_throw(args[3]->getObjectType()==T_ARRAY);
-+ //assert_and_throw(args[3]->getObjectType()==T_ARRAY);
-+ //Work around for bug in YouTube player of July 13 2011
-+ if(args[3]->getObjectType()==T_UNDEFINED)
-+ return NULL;
- Array* ratios=Class<Array>::cast(args[3]);
-
- int NumGradient = colors->size();
-diff --git a/src/scripting/flashgeom.cpp b/src/scripting/flashgeom.cpp
-index db5236e..660bb85 100644
---- a/src/scripting/flashgeom.cpp
-+++ b/src/scripting/flashgeom.cpp
-@@ -1127,12 +1127,12 @@ ASFUNCTIONBODY(Matrix,concat)
-
- number_t ta, tb, tc, td, tx, ty;
-
-- ta = th->a * m->a + th->c * m->b;
-- tb = th->b * m->a + th->d * m->b;
-- tc = th->a * m->c + th->c * m->d;
-- td = th->b * m->c + th->d * m->d;
-- tx = th->a * m->tx + th->c * m->ty + th->tx;
-- ty = th->b * m->tx + th->d * m->ty + th->ty;
-+ ta = m->a * th->a + m->c * th->b;
-+ tb = m->b * th->a + m->d * th->b;
-+ tc = m->a * th->c + m->c * th->d;
-+ td = m->b * th->c + m->d * th->d;
-+ tx = m->a * th->tx + m->c * th->ty + m->tx;
-+ ty = m->b * th->tx + m->d * th->ty + m->ty;
-
- th->a = ta;
- th->b = tb;
-diff --git a/src/scripting/flashutils.cpp b/src/scripting/flashutils.cpp
-index f44b61e..04cce66 100644
---- a/src/scripting/flashutils.cpp
-+++ b/src/scripting/flashutils.cpp
-@@ -784,36 +784,52 @@ ASFUNCTIONBODY(lightspark,describeType)
- ret+=(isStatic)?"\"true\"":"\"false\"";
- ret+=">";
- //TODO: add support for extendsClass and implementsInterface and factory
-- auto it=args[0]->Variables.Variables.begin();
-- for(;it!=args[0]->Variables.Variables.end();it++)
-+ type=static_cast<Class_base*>(args[0]);
-+ do
- {
-- if(isStatic && it->second.kind==BORROWED_TRAIT)
-- continue;
--
-- //TODO: add support for constant, method, parameter
-- if(it->second.var.getter)
-- {
-- //Output an accessor
-- //TODO: add support in accessor for access,type,declaredBy
-- ret+="<accessor name=\"";
-- ret+=it->first.raw_buf();
-- ret+="\"/>";
-- }
-- else if(it->second.var.var)
-+ auto it=type->Variables.Variables.begin();
-+ for(;it!=type->Variables.Variables.end();it++)
- {
-- //Output a variable
-- ret+="<variable name=\"";
-- ret+=it->first.raw_buf();
-- ret+="\"";
-- if(it->second.var.type)
-+ if(isStatic && it->second.kind==BORROWED_TRAIT)
-+ continue;
-+
-+ //TODO: add support for constant, method, parameter
-+ if(it->second.var.getter)
-+ {
-+ //Output an accessor
-+ //TODO: add support in accessor for access,type,declaredBy
-+ ret+="<accessor name=\"";
-+ ret+=it->first.raw_buf();
-+ ret+="\"/>";
-+ }
-+ else if(it->second.var.var)
- {
-- ret+=" type=\"";
-- ret+=it->second.var.type->class_name.getQualifiedName().raw_buf();
-- ret+="\"";
-+ if(it->second.var.var->getObjectType()==T_FUNCTION)
-+ {
-+ //Output a method
-+ //TODO: add support in method for declaredBy,returnType
-+ ret+="<method name=\"";
-+ ret+=it->first.raw_buf();
-+ ret+="\"/>";
-+ }
-+ else
-+ {
-+ //Output a variable
-+ ret+="<variable name=\"";
-+ ret+=it->first.raw_buf();
-+ ret+="\"";
-+ if(it->second.var.type)
-+ {
-+ ret+=" type=\"";
-+ ret+=it->second.var.type->class_name.getQualifiedName().raw_buf();
-+ ret+="\"";
-+ }
-+ ret+="/>";
-+ }
- }
-- ret+="/>";
- }
- }
-+ while((type=type->getPrototype())!=NULL);
- ret+="</type>";
-
- return Class<XML>::getInstanceS(ret);;
-diff --git a/src/scripting/toplevel.cpp b/src/scripting/toplevel.cpp
-index c64403c..69709f5 100644
---- a/src/scripting/toplevel.cpp
-+++ b/src/scripting/toplevel.cpp
-@@ -271,6 +271,10 @@ ASFUNCTIONBODY(Array,lastIndexOf)
-
- int unsigned i = th->data.size()-1;
- int j;
-+
-+ if(argslen == 2 && std::isnan(args[1]->toNumber()))
-+ return abstract_i(0);
-+
- if(argslen == 2 && args[1]->getObjectType() != T_UNDEFINED && !std::isnan(args[1]->toNumber()))
- {
- j = args[1]->toInt(); //Preserve sign
-@@ -314,24 +318,30 @@ ASFUNCTIONBODY(Array,shift)
- ASFUNCTIONBODY(Array,splice)
- {
- Array* th=static_cast<Array*>(obj);
--
-+
- int startIndex=args[0]->toInt();
- int deleteCount=args[1]->toUInt();
- int totalSize=th->data.size();
--
-- //A negative startIndex is relative to the end
-- assert_and_throw(abs(startIndex)<totalSize);
-- startIndex=(startIndex+totalSize)%totalSize;
-+ Array* ret=Class<Array>::getInstanceS();
-+
-+ if(totalSize)
-+ {
-+ //A negative startIndex is relative to the end
-+ assert_and_throw(abs(startIndex)<totalSize);
-+ startIndex=(startIndex+totalSize)%totalSize;
-+ }
- if((startIndex+deleteCount)>totalSize)
- deleteCount=totalSize-startIndex;
--
-- Array* ret=Class<Array>::getInstanceS();
-- ret->data.reserve(deleteCount);
-
-- for(int i=0;i<deleteCount;i++)
-- ret->data.push_back(th->data[startIndex+i]);
--
-- th->data.erase(th->data.begin()+startIndex,th->data.begin()+startIndex+deleteCount);
-+ if(deleteCount)
-+ {
-+ ret->data.reserve(deleteCount);
-+
-+ for(int i=0;i<deleteCount;i++)
-+ ret->data.push_back(th->data[startIndex+i]);
-+
-+ th->data.erase(th->data.begin()+startIndex,th->data.begin()+startIndex+deleteCount);
-+ }
-
- //Insert requested values starting at startIndex
- for(unsigned int i=2,n=0;i<argslen;i++,n++)
-@@ -982,8 +992,15 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl)
- return NULL;
- }
-
-+ bool isAttr=name.isAttribute;
- const tiny_string& normalizedName=name.normalizedName();
-- if(name.isAttribute)
-+ const char *buf=normalizedName.raw_buf();
-+ if(normalizedName[0]=='@')
-+ {
-+ isAttr=true;
-+ buf+=1;
-+ }
-+ if(isAttr)
- {
- //Lookup attribute
- //TODO: support namespaces
-@@ -994,7 +1011,7 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl)
- xmlpp::Element* element=dynamic_cast<xmlpp::Element*>(node);
- if(element==NULL)
- return NULL;
-- xmlpp::Attribute* attr=element->get_attribute(normalizedName.raw_buf());
-+ xmlpp::Attribute* attr=element->get_attribute(buf);
- if(attr==NULL)
- return NULL;
-
-@@ -1021,7 +1038,7 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl)
- assert_and_throw(name.ns.size()>0 && name.ns[0].name=="");
- //Normalize the name to the string form
- assert(node);
-- const xmlpp::Node::NodeList& children=node->get_children(normalizedName.raw_buf());
-+ const xmlpp::Node::NodeList& children=node->get_children(buf);
- xmlpp::Node::NodeList::const_iterator it=children.begin();
-
- std::vector<_R<XML>> ret;
-@@ -1055,8 +1072,15 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic)
- if(considerDynamic==false)
- return ASObject::hasPropertyByMultiname(name, considerDynamic);
-
-+ bool isAttr=name.isAttribute;
- const tiny_string& normalizedName=name.normalizedName();
-- if(name.isAttribute)
-+ const char *buf=normalizedName.raw_buf();
-+ if(normalizedName[0]=='@')
-+ {
-+ isAttr=true;
-+ buf+=1;
-+ }
-+ if(isAttr)
- {
- //Lookup attribute
- //TODO: support namespaces
-@@ -1067,7 +1091,7 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic)
- xmlpp::Element* element=dynamic_cast<xmlpp::Element*>(node);
- if(element==NULL)
- return NULL;
-- xmlpp::Attribute* attr=element->get_attribute(normalizedName.raw_buf());
-+ xmlpp::Attribute* attr=element->get_attribute(buf);
- if(attr!=NULL)
- return true;
- }
-@@ -1078,7 +1102,7 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic)
- assert_and_throw(name.ns.size()>0 && name.ns[0].name=="");
- //Normalize the name to the string form
- assert(node);
-- const xmlpp::Node::NodeList& children=node->get_children(normalizedName.raw_buf());
-+ const xmlpp::Node::NodeList& children=node->get_children(buf);
- if(!children.empty())
- return true;
- }
-diff --git a/src/swf.cpp b/src/swf.cpp
-index 6378dd6..b50907e 100644
---- a/src/swf.cpp
-+++ b/src/swf.cpp
-@@ -468,6 +468,8 @@ void SystemState::setShutdownFlag()
- shutdown=true;
-
- sem_post(&terminated);
-+ if(standalone)
-+ gtk_main_quit();
- }
-
- void SystemState::wait()
-@@ -1132,7 +1134,7 @@ void ParseThread::execute()
- }
- catch(std::exception& e)
- {
-- LOG(LOG_ERROR,_("Stream exception in ParseThread"));
-+ LOG(LOG_ERROR,_("Stream exception in ParseThread ") << e.what());
- root->parsingFailed();
- }
- pt=NULL;
-diff --git a/tests/Dictionary_test.mxml b/tests/Dictionary_test.mxml
-index d0d6897..226eb94 100644
---- a/tests/Dictionary_test.mxml
-+++ b/tests/Dictionary_test.mxml
-@@ -1,57 +1,57 @@
--<?xml version="1.0"?>
--<mx:Application name="lightspark_Dictionary_test"
-- xmlns:mx="http://www.adobe.com/2006/mxml"
-- layout="absolute"
-- applicationComplete="appComplete();"
-- backgroundColor="white">
--
--<mx:Script>
--<![CDATA[
-- import Tests;
-- private function appComplete():void
-- {
-- var dict:Dictionary = new Dictionary();
-- var o:Object = new Object();
--
-- dict["foo"] = 5;
-- dict[o] = "muffins";
--
-- Tests.assertTrue(dict.hasOwnProperty("foo"),"hasOwnProperty with string");
--
-- Tests.assertEquals(dict["foo"], 5, "dict[\"foo\"] = 5", true);
-- Tests.assertEquals(dict[o], "muffins", "dict[Object]", true);
--
-- var count:int = 0;
-- for each (var tmp:* in dict)
-- count++;
--
-- Tests.assertEquals(2, count, "iterator: primitive and object keys");
--
-- delete dict["foo"];
--
-- dict[2] = "number two";
-- Tests.assertTrue(dict.hasOwnProperty(2), "hasOwnProperty with number");
-- Tests.assertEquals(dict["2"], "number two", "primitive keys behaviour", true);
-- Tests.assertFalse(dict["foo"] == 5, "delete dict[\"key\"]");
--
-- var dict2:Dictionary = new Dictionary();
-- dict2.weakKeys = true;
-- {
-- var a:Object = new Object();
-- dict[a] = "test";
-- }
--
-- var n:int = 0;
-- for (var key:* in dict2)
-- n++;
--
-- Tests.assertEquals(n, 1, "Dictionary.weakKeys");
--
-- Tests.report(visual, name);
-- }
--]]>
--</mx:Script>
--
--<mx:UIComponent id="visual" />
--
--</mx:Application>
-+<?xml version="1.0"?>
-+<mx:Application name="lightspark_Dictionary_test"
-+ xmlns:mx="http://www.adobe.com/2006/mxml"
-+ layout="absolute"
-+ applicationComplete="appComplete();"
-+ backgroundColor="white">
-+
-+<mx:Script>
-+<![CDATA[
-+ import Tests;
-+ private function appComplete():void
-+ {
-+ var dict:Dictionary = new Dictionary();
-+ var o:Object = new Object();
-+
-+ dict["foo"] = 5;
-+ dict[o] = "muffins";
-+
-+ Tests.assertTrue(dict.hasOwnProperty("foo"),"hasOwnProperty with string");
-+
-+ Tests.assertEquals(dict["foo"], 5, "dict[\"foo\"] = 5", true);
-+ Tests.assertEquals(dict[o], "muffins", "dict[Object]", true);
-+
-+ var count:int = 0;
-+ for each (var tmp:* in dict)
-+ count++;
-+
-+ Tests.assertEquals(2, count, "iterator: primitive and object keys");
-+
-+ delete dict["foo"];
-+
-+ dict[2] = "number two";
-+ Tests.assertTrue(dict.hasOwnProperty(2), "hasOwnProperty with number");
-+ Tests.assertEquals(dict["2"], "number two", "primitive keys behaviour", true);
-+ Tests.assertFalse(dict["foo"] == 5, "delete dict[\"key\"]");
-+
-+ var dict2:Dictionary = new Dictionary();
-+ dict2.weakKeys = true;
-+ {
-+ var a:Object = new Object();
-+ dict[a] = "test";
-+ }
-+
-+ var n:int = 0;
-+ for (var key:* in dict2)
-+ n++;
-+
-+ Tests.assertEquals(n, 1, "Dictionary.weakKeys");
-+
-+ Tests.report(visual, name);
-+ }
-+]]>
-+</mx:Script>
-+
-+<mx:UIComponent id="visual" />
-+
-+</mx:Application>
-diff --git a/tests/Object_test.mxml b/tests/Object_test.mxml
-index d78adab..d057823 100644
---- a/tests/Object_test.mxml
-+++ b/tests/Object_test.mxml
-@@ -13,6 +13,11 @@
- var o:Object = {foo: "bar", foo2: "bar2", foo: "bar3"};
- Tests.assertEquals(o.foo2,"bar2","Simple assignment in object literal");
- Tests.assertEquals(o.foo,"bar","Duplicated assignment in object literal");
-+
-+ var s:String = "Lightspark";
-+ var c:Class = s.constructor;
-+ Tests.assertTrue(c == String, "Constructor property");
-+
- Tests.report(visual, this.name);
- }
- ]]>
-diff --git a/tests/XML_test.mxml b/tests/XML_test.mxml
-index cb18282..54587d7 100644
---- a/tests/XML_test.mxml
-+++ b/tests/XML_test.mxml
-@@ -44,6 +44,9 @@
- Tests.assertTrue(Object("123")==simplexml, "equality: string and simple XML");
- Tests.assertTrue(Object(123)==simplexml, "equality: integer and simple XML");
-
-+ var cdata:XML = new XML("<![CDATA[Lightspark]"+"]>");
-+ Tests.assertEquals(cdata, "Lightspark", "Only CDATA node in file");
-+
- Tests.report(visual, this.name);
- }
- ]]>
-diff --git a/tests/geom_Matrix_test.mxml b/tests/geom_Matrix_test.mxml
-index 667904a..89d2a5d 100644
---- a/tests/geom_Matrix_test.mxml
-+++ b/tests/geom_Matrix_test.mxml
-@@ -1,64 +1,64 @@
--<?xml version="1.0"?>
--<mx:Application name="lightspark_geom_Matrix_test"
-- xmlns:mx="http://www.adobe.com/2006/mxml"
-- layout="absolute"
-- applicationComplete="appComplete();"
-- backgroundColor="white">
--
--<mx:Script>
--<![CDATA[
-- import flash.display.DisplayObject;
-- import flash.display.Sprite;
-- import Tests;
--
-- private function matrixEqual(m1:Matrix, m2:Matrix):Boolean {
-- return m1.a == m2.a && m1.b == m2.b && m1.c == m2.c && m1.d == m2.d && m1.tx == m2.tx && m1.ty == m2.ty;
-- }
--
-- private function appComplete():void
-- {
-- var mat:Matrix = new Matrix();
-- Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "new Matrix()");
--
-- var matc:Matrix = mat.clone();
-- Tests.assertTrue(matrixEqual(mat, matc), "matrix.clone");
--
-- var matm1:Matrix = new Matrix(1, 4, 2, 5, 3, 5);
-- var matm2:Matrix = new Matrix(2, 4, 5, 7, 9, 11);
-- var matm3:Matrix = new Matrix(10, 28, 19, 55, 34, 96);
-- matm1.concat(matm2);
-- Tests.assertTrue(matrixEqual(matm1, matm3), "matrix.concat");
--
-- mat.a = 50; mat.b = 60; mat.c = 5; mat.d = 100;
-- mat.identity();
-- Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "Matrix.identity");
--
-- var mat2:Matrix = new Matrix();
-- mat2.rotate(Math.PI / 2);
-- Tests.assertTrue(mat2.a == 0 && mat2.b == 1 && mat2.c == -1 && mat2.d == 0, "Matrix.rotate");
--
-- var mat3:Matrix = new Matrix();
-- mat3.scale(4, 2);
-- Tests.assertTrue(mat3.a == 4 && mat3.b == 0 && mat3.c == 0 && mat3.d == 2, "Matrix.scale");
--
-- var mat4:Matrix = new Matrix();
-- mat4.translate(4, 2);
-- Tests.assertTrue(mat4.tx == 4 && mat4.ty == 2, "Matrix.translate");
--
-- var mati1:Matrix = new Matrix(1, 4, 2, 5, 0, 0);
-- var mati2:Matrix = mati1.clone();
-- mati2.invert();
-- mati1.concat(mati2);
-- Tests.assertTrue(matrixEqual(mati1, new Matrix(1, 0, 0, 1, 0, 0)), "matrix.invert");
--
-- Tests.report(visual, this.name);
-- }
--]]>
--</mx:Script>
--
--<mx:UIComponent id="visual" />
--
--</mx:Application>
--
--
--
-+<?xml version="1.0"?>
-+<mx:Application name="lightspark_geom_Matrix_test"
-+ xmlns:mx="http://www.adobe.com/2006/mxml"
-+ layout="absolute"
-+ applicationComplete="appComplete();"
-+ backgroundColor="white">
-+
-+<mx:Script>
-+<![CDATA[
-+ import flash.display.DisplayObject;
-+ import flash.display.Sprite;
-+ import Tests;
-+
-+ private function matrixEqual(m1:Matrix, m2:Matrix):Boolean {
-+ return m1.a == m2.a && m1.b == m2.b && m1.c == m2.c && m1.d == m2.d && m1.tx == m2.tx && m1.ty == m2.ty;
-+ }
-+
-+ private function appComplete():void
-+ {
-+ var mat:Matrix = new Matrix();
-+ Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "new Matrix()");
-+
-+ var matc:Matrix = mat.clone();
-+ Tests.assertTrue(matrixEqual(mat, matc), "matrix.clone");
-+
-+ var matm1:Matrix = new Matrix(1, 4, 2, 5, 3, 5);
-+ var matm2:Matrix = new Matrix(2, 4, 5, 7, 9, 11);
-+ var matm3:Matrix = new Matrix(22, 32, 29, 43, 40, 58);
-+ matm1.concat(matm2);
-+ Tests.assertTrue(matrixEqual(matm1, matm3), "matrix.concat");
-+
-+ mat.a = 50; mat.b = 60; mat.c = 5; mat.d = 100;
-+ mat.identity();
-+ Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "Matrix.identity");
-+
-+ var mat2:Matrix = new Matrix();
-+ mat2.rotate(Math.PI / 2);
-+ Tests.assertTrue(mat2.a == 0 && mat2.b == 1 && mat2.c == -1 && mat2.d == 0, "Matrix.rotate");
-+
-+ var mat3:Matrix = new Matrix();
-+ mat3.scale(4, 2);
-+ Tests.assertTrue(mat3.a == 4 && mat3.b == 0 && mat3.c == 0 && mat3.d == 2, "Matrix.scale");
-+
-+ var mat4:Matrix = new Matrix();
-+ mat4.translate(4, 2);
-+ Tests.assertTrue(mat4.tx == 4 && mat4.ty == 2, "Matrix.translate");
-+
-+ var mati1:Matrix = new Matrix(1, 4, 2, 5, 0, 0);
-+ var mati2:Matrix = mati1.clone();
-+ mati2.invert();
-+ mati1.concat(mati2);
-+ Tests.assertTrue(matrixEqual(mati1, new Matrix(1, 0, 0, 1, 0, 0)), "matrix.invert");
-+
-+ Tests.report(visual, this.name);
-+ }
-+]]>
-+</mx:Script>
-+
-+<mx:UIComponent id="visual" />
-+
-+</mx:Application>
-+
-+
-+
-diff --git a/tests/geom_Point_test.mxml b/tests/geom_Point_test.mxml
-index f8d926c..25bbaa3 100644
---- a/tests/geom_Point_test.mxml
-+++ b/tests/geom_Point_test.mxml
-@@ -1,52 +1,52 @@
--<?xml version="1.0"?>
--<mx:Application name="lightspark_geom_Point_test"
-- xmlns:mx="http://www.adobe.com/2006/mxml"
-- layout="absolute"
-- applicationComplete="appComplete();"
-- backgroundColor="white">
--
--<mx:Script>
--<![CDATA[
-- import flash.geom.Point;
-- private function appComplete():void
-- {
--
-- var point:Point = new Point();
-- Tests.assertEquals(0, point.x, "new Point().x == 0", false);
-- Tests.assertEquals(0, point.y, "new Point().y == 0", false);
--
-- var point2:Point = new Point(6, 8);
-- Tests.assertEquals(6, point2.x, "new Point(6,8).x == 6", false);
-- Tests.assertEquals(8, point2.y, "new Point(6,8).y == 8", false);
--
-- var point3:Point = Point.interpolate(point, point2, 0.5);
-- Tests.assertEquals(3, point3.x,"Point.interpolate (x)", false);
-- Tests.assertEquals(4, point3.y, "Point.interpolate (y)", false);
--
-- Tests.assertEquals(10, Point.distance(point, point2), "Point.distance", false);
--
-- var point4:Point = new Point(3, 2).add(point2);
-- Tests.assertEquals(9, point4.x, "Point.add (x)", false);
-- Tests.assertEquals(10, point4.y, "Point.add (y)", false);
--
-- var point5:Point = point4.clone();
-- Tests.assertTrue(point4.equals(point5), "Point.equals");
--
-- var point6:Point = new Point(0, 5);
-- point6.normalize(1);
-- Tests.assertEquals(1, point6.y, "Point.normalize", false);
--
-- var point7:Point = new Point(0, 0);
-- point7.offset(2, 3);
-- Tests.assertEquals(2, point7.x, "Point.offset (x)", false);
-- Tests.assertEquals(3, point7.y, "Point.offset (y)", false);
--
-- Tests.report(visual, name);
-- }
--]]>
--</mx:Script>
--
--<mx:UIComponent id="visual" />
--
--</mx:Application>
--
-+<?xml version="1.0"?>
-+<mx:Application name="lightspark_geom_Point_test"
-+ xmlns:mx="http://www.adobe.com/2006/mxml"
-+ layout="absolute"
-+ applicationComplete="appComplete();"
-+ backgroundColor="white">
-+
-+<mx:Script>
-+<![CDATA[
-+ import flash.geom.Point;
-+ private function appComplete():void
-+ {
-+
-+ var point:Point = new Point();
-+ Tests.assertEquals(0, point.x, "new Point().x == 0", false);
-+ Tests.assertEquals(0, point.y, "new Point().y == 0", false);
-+
-+ var point2:Point = new Point(6, 8);
-+ Tests.assertEquals(6, point2.x, "new Point(6,8).x == 6", false);
-+ Tests.assertEquals(8, point2.y, "new Point(6,8).y == 8", false);
-+
-+ var point3:Point = Point.interpolate(point, point2, 0.5);
-+ Tests.assertEquals(3, point3.x,"Point.interpolate (x)", false);
-+ Tests.assertEquals(4, point3.y, "Point.interpolate (y)", false);
-+
-+ Tests.assertEquals(10, Point.distance(point, point2), "Point.distance", false);
-+
-+ var point4:Point = new Point(3, 2).add(point2);
-+ Tests.assertEquals(9, point4.x, "Point.add (x)", false);
-+ Tests.assertEquals(10, point4.y, "Point.add (y)", false);
-+
-+ var point5:Point = point4.clone();
-+ Tests.assertTrue(point4.equals(point5), "Point.equals");
-+
-+ var point6:Point = new Point(0, 5);
-+ point6.normalize(1);
-+ Tests.assertEquals(1, point6.y, "Point.normalize", false);
-+
-+ var point7:Point = new Point(0, 0);
-+ point7.offset(2, 3);
-+ Tests.assertEquals(2, point7.x, "Point.offset (x)", false);
-+ Tests.assertEquals(3, point7.y, "Point.offset (y)", false);
-+
-+ Tests.report(visual, name);
-+ }
-+]]>
-+</mx:Script>
-+
-+<mx:UIComponent id="visual" />
-+
-+</mx:Application>
-+
-diff --git a/tests/geom_Rectangle_test.mxml b/tests/geom_Rectangle_test.mxml
-index b8450c4..43734db 100644
---- a/tests/geom_Rectangle_test.mxml
-+++ b/tests/geom_Rectangle_test.mxml
-@@ -1,72 +1,72 @@
--<?xml version="1.0"?>
--<mx:Application name="lightspark_geom_Rectangle_test"
-- xmlns:mx="http://www.adobe.com/2006/mxml"
-- layout="absolute"
-- applicationComplete="appComplete();"
-- backgroundColor="white">
--
--<mx:Script>
--<![CDATA[
-- import flash.geom.Rectangle;
-- import flash.geom.Point;
--
-- private function appComplete():void
-- {
--
-- var rect:Rectangle = new Rectangle(0, 0, 10, 10);
--
-- Tests.assertEquals(rect.clone(), rect, "rectangle.clone");
--
-- Tests.assertTrue(rect.contains(1, 1), "rectangle.contains")
--
-- var point:Point = new Point(1, 1);
-- Tests.assertTrue(rect.containsPoint(point), "rectangle.containsPoint")
--
-- var rect2:Rectangle = new Rectangle(1, 1, 9, 9);
-- Tests.assertTrue(rect.containsRect(rect2), "rectangle.containsRect")
--
-- Tests.assertTrue(rect.equals(new Rectangle(0, 0, 10, 10)), "rectangle.equals")
--
-- var rectinflated:Rectangle = new Rectangle(0, 0, 11, 11);
-- rect2.inflate(1, 1);
-- Tests.assertEquals(rect2, rectinflated, "rectangle.inflate");
--
-- var rect3:Rectangle = new Rectangle(1, 1, 9, 9);
-- rect3.inflatePoint(new Point(1, 1));
-- Tests.assertEquals(rect3, rectinflated, "rectangle.inflatePoint");
--
-- var rect4:Rectangle = new Rectangle(5, 5, 10, 10);
-- Tests.assertEquals(rect.intersection(rect4), new Rectangle(5, 5, 5, 5), "rectangle.intersection");
--
-- Tests.assertTrue(rect.intersects(rect4), "rectangle.intersects")
--
-- Tests.assertFalse(rect.isEmpty(), "rectangle.isEmpty")
--
-- var rect5:Rectangle = new Rectangle(-1, -1, 10, 10);
-- rect5.offset(1, 1);
-- Tests.assertEquals(rect5, rect, "rectangle.offset");
--
-- var rect6:Rectangle = new Rectangle(-1, -1, 10, 10);
-- var point2:Point = new Point(1, 1);
-- rect6.offsetPoint(point2);
-- Tests.assertEquals(rect6, rect, "rectangle.offsetPoint");
--
-- rect6.setEmpty();
-- Tests.assertTrue(rect6.isEmpty(), "rectangle.setEmpty")
--
-- var rect9:Rectangle = new Rectangle(0, 0, 10, 10);
-- Tests.assertEquals(rect9.toString(), "(x=0.00, y=0.00, w=10.00, h=10.00)", "rectangle.toString");
--
-- var rect7:Rectangle = new Rectangle(0, 0, 10, 10);
-- var rect8:Rectangle = new Rectangle(10, 10, 10, 10);
-- Tests.assertEquals(rect7.union(rect8), new Rectangle(0, 0, 20, 20), "rectangle.union");
--
-- Tests.report(visual, name);
-- }
--]]>
--</mx:Script>
--
--<mx:UIComponent id="visual" />
--
--</mx:Application>
--
-+<?xml version="1.0"?>
-+<mx:Application name="lightspark_geom_Rectangle_test"
-+ xmlns:mx="http://www.adobe.com/2006/mxml"
-+ layout="absolute"
-+ applicationComplete="appComplete();"
-+ backgroundColor="white">
-+
-+<mx:Script>
-+<![CDATA[
-+ import flash.geom.Rectangle;
-+ import flash.geom.Point;
-+
-+ private function appComplete():void
-+ {
-+
-+ var rect:Rectangle = new Rectangle(0, 0, 10, 10);
-+
-+ Tests.assertEquals(rect.clone(), rect, "rectangle.clone");
-+
-+ Tests.assertTrue(rect.contains(1, 1), "rectangle.contains")
-+
-+ var point:Point = new Point(1, 1);
-+ Tests.assertTrue(rect.containsPoint(point), "rectangle.containsPoint")
-+
-+ var rect2:Rectangle = new Rectangle(1, 1, 9, 9);
-+ Tests.assertTrue(rect.containsRect(rect2), "rectangle.containsRect")
-+
-+ Tests.assertTrue(rect.equals(new Rectangle(0, 0, 10, 10)), "rectangle.equals")
-+
-+ var rectinflated:Rectangle = new Rectangle(0, 0, 11, 11);
-+ rect2.inflate(1, 1);
-+ Tests.assertEquals(rect2, rectinflated, "rectangle.inflate");
-+
-+ var rect3:Rectangle = new Rectangle(1, 1, 9, 9);
-+ rect3.inflatePoint(new Point(1, 1));
-+ Tests.assertEquals(rect3, rectinflated, "rectangle.inflatePoint");
-+
-+ var rect4:Rectangle = new Rectangle(5, 5, 10, 10);
-+ Tests.assertEquals(rect.intersection(rect4), new Rectangle(5, 5, 5, 5), "rectangle.intersection");
-+
-+ Tests.assertTrue(rect.intersects(rect4), "rectangle.intersects")
-+
-+ Tests.assertFalse(rect.isEmpty(), "rectangle.isEmpty")
-+
-+ var rect5:Rectangle = new Rectangle(-1, -1, 10, 10);
-+ rect5.offset(1, 1);
-+ Tests.assertEquals(rect5, rect, "rectangle.offset");
-+
-+ var rect6:Rectangle = new Rectangle(-1, -1, 10, 10);
-+ var point2:Point = new Point(1, 1);
-+ rect6.offsetPoint(point2);
-+ Tests.assertEquals(rect6, rect, "rectangle.offsetPoint");
-+
-+ rect6.setEmpty();
-+ Tests.assertTrue(rect6.isEmpty(), "rectangle.setEmpty")
-+
-+ var rect9:Rectangle = new Rectangle(0, 0, 10, 10);
-+ Tests.assertEquals(rect9.toString(), "(x=0.00, y=0.00, w=10.00, h=10.00)", "rectangle.toString");
-+
-+ var rect7:Rectangle = new Rectangle(0, 0, 10, 10);
-+ var rect8:Rectangle = new Rectangle(10, 10, 10, 10);
-+ Tests.assertEquals(rect7.union(rect8), new Rectangle(0, 0, 20, 20), "rectangle.union");
-+
-+ Tests.report(visual, name);
-+ }
-+]]>
-+</mx:Script>
-+
-+<mx:UIComponent id="visual" />
-+
-+</mx:Application>
-+
diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/community-testing/lightspark/lightspark.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/lxtask/PKGBUILD b/community-testing/lxtask/PKGBUILD
deleted file mode 100644
index 38c46743e..000000000
--- a/community-testing/lxtask/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-pkgname=lxtask
-pkgver=0.1.4
-pkgrel=2
-pkgdesc="Task manager of the LXDE Desktop"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://lxde.org/"
-groups=('lxde')
-depends=('gtk3')
-makedepends=('pkgconfig' 'intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- autoreconf
- ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
- make
-}
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/qtractor/PKGBUILD b/community-testing/qtractor/PKGBUILD
deleted file mode 100644
index 0f47776b6..000000000
--- a/community-testing/qtractor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 52272 2011-07-22 23:53:54Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Philipp Überbacher <hollunder at gmx dot at>
-
-pkgname=qtractor
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="Audio/MIDI multitrack sequencer"
-arch=('i686' 'x86_64')
-url="http://qtractor.sourceforge.net/"
-license=('GPL')
-depends=('qt' 'jack' 'slv2>=0.6.6-6' 'libmad' 'liblo'
- 'libsamplerate' 'rubberband')
- # slv2 versioned for https://bugs.archlinux.org/task/25060
-makedepends=('ladspa' 'dssi')
-[ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('6dcc05532f71eaaa1aa0f336bcd265b0')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package () {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/qtractor/qtractor.changelog b/community-testing/qtractor/qtractor.changelog
deleted file mode 100644
index c0c8a8e0c..000000000
--- a/community-testing/qtractor/qtractor.changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-17 Jan 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.4.4-1
- upstream update
- new deps:
- For LV2 support
- --| slv2
- ----| lv2core
-
-26 Dec 2009 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.4.3-1
- initial commit
- only important changes will be logged
diff --git a/community-testing/systemd/PKGBUILD b/community-testing/systemd/PKGBUILD
index f344d4d74..0edb31bc1 100644
--- a/community-testing/systemd/PKGBUILD
+++ b/community-testing/systemd/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 51746 2011-07-13 22:59:52Z dreisner $
+# $Id: PKGBUILD 52842 2011-07-29 03:30:38Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=systemd
-pkgver=30
+pkgver=32
pkgrel=1
pkgdesc="Session and Startup manager"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2')
-depends=('dbus-core' 'sysvinit' 'util-linux>=2.19' 'udev>=172')
+depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify')
optdepends=('cryptsetup: required for encrypted block devices'
'dbus-python: systemd-analyze'
@@ -20,25 +20,35 @@ optdepends=('cryptsetup: required for encrypted block devices'
'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
groups=('systemd')
options=('!libtool')
-backup=(etc/systemd/system.conf
- etc/tmpfiles.d/console.conf
- usr/lib/tmpfiles.d/legacy.conf
- usr/lib/tmpfiles.d/systemd.conf
- usr/lib/tmpfiles.d/x11.conf)
+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/systemd-logind.conf)
install=systemd.install
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
"os-release")
-md5sums=('dafd6d2471e2bf80d35525df9801a40f'
+md5sums=('d8d4b42034be8ef403e72d7d2d1d1150'
'752636def0db3c03f121f8b4f44a63cd')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
./configure --prefix=/usr \
- --with-rootdir= \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
+ --libdir=/usr/lib \
--localstatedir=/var \
+ --with-rootdir= \
+ --with-rootlibdir=/lib \
--disable-audit \
--disable-tcpwrap
@@ -54,7 +64,7 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
# fix systemd-analyze for python2
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
diff --git a/community-testing/systemd/systemd.install b/community-testing/systemd/systemd.install
index b4228255d..a6c4dde12 100644
--- a/community-testing/systemd/systemd.install
+++ b/community-testing/systemd/systemd.install
@@ -1,13 +1,13 @@
#!/bin/sh
checkgroups() {
- getent group lock >/dev/null || groupadd -g 54 lock
+ usr/bin/getent group lock >/dev/null || usr/sbin/groupadd -g 54 lock
}
post_install() {
checkgroups
- [ -f etc/machine-id ] || systemd-machine-id-setup
+ [ -f etc/machine-id ] || bin/systemd-machine-id-setup
echo "systemd has been installed to /bin/systemd. Please ensure you append"
echo "init=/bin/systemd to your kernel command line in your bootloader."
@@ -16,16 +16,27 @@ post_install() {
post_upgrade() {
checkgroups
- [ -f etc/machine-id ] || systemd-machine-id-setup
- systemctl daemon-reexec >/dev/null || :
+ [ -f etc/machine-id ] || bin/systemd-machine-id-setup
+ bin/systemctl daemon-reexec >/dev/null || :
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if [ -d sys/fs/cgroup/systemd ]; then
+ bin/systemctl try-restart systemd-logind.service
+ fi
+ fi
}
pre_remove() {
- rm -f /etc/systemd/system/default.target
+ bin/rm -f etc/systemd/system/default.target
}
post_remove() {
- getent group lock >/dev/null && groupdel lock
+ usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
}
# vim:set ts=2 sw=2 et:
diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD
deleted file mode 100644
index 137897a28..000000000
--- a/community-testing/vhba-module/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-
-pkgname=vhba-module
-pkgver=20110416
-_kernver='2.6.39-ARCH'
-pkgrel=1
-pkgdesc="Kernel module that emulates SCSI devices"
-arch=('i686' 'x86_64')
-url="http://cdemu.sourceforge.net/"
-license=('GPL2')
-depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
-makedepends=('kernel26-headers>=2.6.39')
-install=vhba-module.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
-md5sums=('2f91dd4ee8648da92d625221d4275b60')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- make -j1 KDIR=/usr/src/linux-${_kernver}
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko"
- sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install"
-}
diff --git a/community-testing/vhba-module/vhba-kernel2.6.37.patch b/community-testing/vhba-module/vhba-kernel2.6.37.patch
deleted file mode 100644
index e2b619c74..000000000
--- a/community-testing/vhba-module/vhba-kernel2.6.37.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 6 Jan 2011 03:39:26 -0500
-Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API
-
-Due to the SCSI host lock push-down changes introduced in 2.6.37 (see
-http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a
-for more details), trying to use current vhba on 2.6.37 leads to oopses
-and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753
-
-Add some #ifdefs to enable compatibility both with 2.6.37 and older API.
-Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this
-issue will need to be revisited.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- vhba-module/vhba.c | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index 059f6ce..9d13016 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -27,6 +27,7 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif
-@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd)
- spin_unlock_irqrestore(&vhost->cmd_lock, flags);
- }
-
--static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
-+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
- {
- struct vhba_device *vdev;
- int retval;
-@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
- return retval;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+DEF_SCSI_QCMD(vhba_queuecommand)
-+#else
-+#define vhba_queuecommand vhba_queuecommand_lck
-+#endif
-+
- static int vhba_abort(struct scsi_cmnd *cmd)
- {
- struct vhba_device *vdev;
---
-1.7.3.4
-
diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install
deleted file mode 100644
index edb9e8d2b..000000000
--- a/community-testing/vhba-module/vhba-module.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot."
- echo ">> This module needs to be recompiled for every kernel version upgrade."
- KERNEL_VERSION='2.6.39-ARCH'
- depmod $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- KERNEL_VERSION='2.6.39-ARCH'
- depmod $KERNEL_VERSION > /dev/null 2>&1
-}
-
diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD
index 98b245770..9df5a53bf 100644
--- a/community-testing/virtualbox/PKGBUILD
+++ b/community-testing/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52407 2011-07-24 17:47:57Z ibiru $
+# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox
pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
pkgver=4.1.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -15,8 +15,9 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
- change_default_driver_dir.patch)
-_kernver=3.0.0-ARCH
+ change_default_driver_dir.patch
+ fix-kernel-panic.patch)
+_kernver=3.0-ARCH
build() {
cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -25,6 +26,7 @@ build() {
patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+ patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
cp "$srcdir/LocalConfig.kmk" .
@@ -201,5 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
'ed1341881437455d9735875ddf455fbe'
'4cf75d9c091199a47a7a1bc2f4e347d9'
'78ffa67ff131680f1d2b6f06d4325c5b'
- '838c4c4ebe11b34ae2168df5cd06f694'
- '97e193f050574dd272a38e5ee5ebe62b')
+ 'b3de603560b2fb2c33e704e4e8ab3de8'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '19b05b85a8a46af5a429b2ab618638cd')
diff --git a/community-testing/virtualbox/fix-kernel-panic.patch b/community-testing/virtualbox/fix-kernel-panic.patch
new file mode 100644
index 000000000..237715db2
--- /dev/null
+++ b/community-testing/virtualbox/fix-kernel-panic.patch
@@ -0,0 +1,22 @@
+Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+===================================================================
+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
+@@ -32,6 +32,7 @@
+ #include "internal/iprt.h"
+
+ #include <iprt/mp.h>
++#include <iprt/asm-amd64-x86.h>
+ #include <iprt/err.h>
+ #include <iprt/cpuset.h>
+ #include <iprt/thread.h>
+@@ -82,7 +83,8 @@
+ NOREF(pvUser1);
+
+ AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
++ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
++ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
+
+ switch (ulNativeEvent)
+ { \ No newline at end of file
diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh
index 5eb7ecb89..845f6c769 100755
--- a/community-testing/virtualbox/vboxdrv.sh
+++ b/community-testing/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
case "$1" in
setup)
stat_busy "Unloading VirtualBox kernel modules"
- for module in vbox{netflt,netadp,drv}; do
+ for module in vbox{netflt,netadp,drv,pci}; do
if grep -q "^${module}" /proc/modules; then
MODLIST+=($module)
modprobe -r $module
diff --git a/community-testing/virtualbox/virtualbox-archlinux-modules.install b/community-testing/virtualbox/virtualbox-archlinux-modules.install
index d3e425584..40e979b05 100644
--- a/community-testing/virtualbox/virtualbox-archlinux-modules.install
+++ b/community-testing/virtualbox/virtualbox-archlinux-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='3.0.0-ARCH'
+KERNEL_VERSION='3.0-ARCH'
post_install() {
cat << EOM
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD
index 12bc6606a..a7aac2f8b 100644
--- a/community/alure/PKGBUILD
+++ b/community/alure/PKGBUILD
@@ -2,12 +2,12 @@
# Contributor: Markus Martin <markus@archwyrm.net>
pkgname=alure
-pkgver=1.1
-pkgrel=3
+pkgver=1.2
+pkgrel=1
pkgdesc='Utility library to help manage common tasks with OpenAL applications.'
arch=('i686' 'x86_64' 'mips64el')
url='http://kcat.strangesoft.net/alure.html'
-license=('LGPL')
+license=('MIT')
depends=('openal')
makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth')
optdepends=('libsndfile: for uncompressed audio support'
@@ -17,7 +17,7 @@ optdepends=('libsndfile: for uncompressed audio support'
'dumb: for IT, XM, S3M and MOD support'
'fluidsynth: for SoundFont 2 support')
source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a2f6934d3783c8478c460965a13e4e12')
+md5sums=('3088aba074ad02d95ea51e705053b9f5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,5 +28,8 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
make DESTDIR="${pkgdir}" install
+
+ install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index 1cdc7680c..3e6844dd2 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 41378 2011-03-05 14:39:13Z lcarlier $
+# $Id: PKGBUILD 52879 2011-07-29 15:22:56Z shusmann $
# Maintainer: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: tocer.deng <tocer.deng@gmail.com>
pkgname=apvlv
-pkgver=0.1.1
+pkgver=0.1.2
pkgrel=1
pkgdesc="A PDF Viewer which behaves like Vim"
arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/apvlv/"
+url="http://naihe2010.github.com/apvlv/"
license=('GPL')
-depends=('poppler-glib' 'libdjvu')
-makedepends=('cmake')
-source=(http://apvlv.googlecode.com/files/$pkgname-${pkgver}-Source.tar.gz
- apvlv-poppler015.patch)
-md5sums=('221b25fd34ebf398047424459d8e5131'
- '809aea91e13032663d6533892757891a')
+depends=('poppler-glib' 'djvulibre')
+source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch)
+md5sums=('381d83aa9c253fac5e0be165fca39222'
+ '308b17a563ed470ea47d408f324ab745')
+
+makedepends=('cmake')
build() {
cd $srcdir/$pkgname-$pkgver-Source
-
- patch -Np0 -i $srcdir/apvlv-poppler015.patch
-
+ patch -Np1 -i $srcdir/apvlv-poppler015.patch
mkdir -p build
cd build
@@ -30,7 +28,6 @@ build() {
-DAPVLV_WITH_UMD=no ..
make
}
-
package() {
cd $srcdir/$pkgname-$pkgver-Source/build
diff --git a/community/apvlv/apvlv-poppler015.patch b/community/apvlv/apvlv-poppler015.patch
index 96cb099a6..0a261b1db 100644
--- a/community/apvlv/apvlv-poppler015.patch
+++ b/community/apvlv/apvlv-poppler015.patch
@@ -1,12 +1,12 @@
-diff -aur src/ApvlvFile.cpp.orig src/ApvlvFile.cpp
---- src/ApvlvFile.cpp.orig 2010-09-14 07:28:44.000000000 +0100
-+++ src/ApvlvFile.cpp 2010-10-29 22:29:21.128949529 +0100
-@@ -275,7 +275,7 @@
- {
- PopplerRectangle rect = { x1, y1, x2, y2 };
- PopplerPage *page = poppler_document_get_page (mDoc, pn);
-- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
- if (*out != NULL)
- {
- return true;
+diff -Naur apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp apvlv-0.1.2-Source.new//src/ApvlvFile.cpp
+--- apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp 2011-07-29 17:19:13.000000000 +0200
++++ apvlv-0.1.2-Source.new//src/ApvlvFile.cpp 2011-07-29 17:22:22.000000000 +0200
+@@ -304,7 +304,7 @@
+ {
+ PopplerRectangle rect = { x1, y1, x2, y2 };
+ PopplerPage *page = poppler_document_get_page (mDoc, pn);
+- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
+ if (*out != NULL)
+ {
+ return true;
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index a6a9e26e7..5b904acd8 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 52347 2011-07-23 19:30:29Z giovanni $
+# $Id: PKGBUILD 52910 2011-07-29 19:53:49Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Petrov Roman <nwhisper@gmail.com>
# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
pkgname=calibre
-pkgver=0.8.11
+pkgver=0.8.12
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
url="http://calibre-ebook.com/"
license=('GPL3')
-depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy'
+depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup'
'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb'
'python-imaging' 'desktop-file-utils' 'shared-mime-info'
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
install=calibre.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
desktop_integration.patch)
-md5sums=('984e29b0b1e7d3f6efe587b902a70a32'
+md5sums=('03060d381cc3090fc42d5a646f926afe'
'253ce4fe5d01f8ff76b63cd3825755ea')
build() {
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index a27958fb2..9e0b345b7 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52380 2011-07-24 03:47:58Z dreisner $
+# $Id: PKGBUILD 52534 2011-07-26 04:19:55Z svenstaro $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
# Contributor: nathan owe ndowens04 at gmail dot com
pkgname=cclive
pkgver=0.7.4.1
-pkgrel=1
+pkgrel=2
pkgdesc='Commandline downloader for popular video websites.'
arch=('i686' 'x86_64' 'mips64el')
url='http://cclive.sourceforge.net/'
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index e69522fbe..6d0e9535f 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50113 2011-06-24 20:01:46Z spupykin $
+# $Id: PKGBUILD 52856 2011-07-29 11:59:24Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Current Maintainer: Patrick Palka <patrick@parcs.ath.cx>
# Previous Maintainer: Loui Chang <louipc.ist at gmail com>
@@ -6,7 +6,7 @@
# Development: http://closure.ath.cx/aur-dev
pkgname=cgit
-pkgver=0.9.0.1
+pkgver=0.9.0.2
pkgrel=1
pkgdesc="A web interface for git written in plain C"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('openssl')
makedepends=('git' 'zlib' 'curl' 'asciidoc')
install=cgit.install
source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2")
-md5sums=('dddae5bcfc1eeb469fc2b95531a75c1c')
+md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2')
build() {
cd "$pkgname-$pkgver"
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index 090fdea53..ecf47ffe7 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 49101 2011-06-11 03:15:22Z svenstaro $
+# $Id: PKGBUILD 52518 2011-07-26 00:31:17Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=clanlib
-pkgver=2.2.9
+pkgver=2.2.10
pkgrel=1
pkgdesc="A multi-platform game development library."
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu'
makedepends=('doxygen' 'graphviz')
options=('!libtool')
source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('321886420efa0263e6f6273057b5d6df')
+md5sums=('61b7200ba8b895fc480850f4721dbc14')
build() {
cd ${srcdir}/ClanLib-${pkgver}
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 6b587a5ae..2bbbb43d2 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 50957 2011-07-03 16:56:44Z spupykin $
+# $Id: PKGBUILD 52709 2011-07-27 22:06:23Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christian Himpel <chressie at gmail dot com>
# Contributor: Johannes Hanika <hanatos at gmail dot com>
pkgname=darktable
-pkgver=0.9
+pkgver=0.9.1
+_pkgver=0.9
pkgrel=1
pkgdesc="Utility to organize and develop raw images"
arch=('i686' 'x86_64' 'mips64el')
url=http://darktable.sf.net/
license=('GPL3')
depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade'
- 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr')
+ 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
makedepends=('intltool>=0.40' 'cmake' 'sqlite3')
optdepends=( 'librsvg')
install=darktable.install
options=(!libtool)
-source=(http://downloads.sourceforge.net/project/darktable/darktable/$pkgver/darktable-$pkgver.tar.gz)
-md5sums=('02397e09464a9084403270607133b5b5')
+source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
+md5sums=('7f2167ad002386b377eae8b347c26ed7')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD
index 5fc8f6609..1421c25ee 100644
--- a/community/dillo/PKGBUILD
+++ b/community/dillo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 34653 2010-12-11 03:21:47Z tdziedzic $
+# $Id: PKGBUILD 52646 2011-07-26 17:04:09Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: dorphell <dorphell@archlinux.org>
pkgname=dillo
-pkgver=2.2
-pkgrel=3
+pkgver=2.2.1
+pkgrel=1
pkgdesc="A small, fast graphical web browser built on FLTK"
arch=(i686 x86_64 'mips64el')
url="http://www.dillo.org"
@@ -14,14 +14,12 @@ depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
backup=(etc/dillo/{dillorc,dpidrc})
source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2
libpng14.patch)
-md5sums=('f8bcd62093f178bed81e46cc54e73f42'
+md5sums=('8875d0188b9281fa2dd683220dcf58a8'
'5336bd3a3b4698c5250ce59e4f2ff91a')
build() {
cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -i "$srcdir/libpng14.patch"
-
+# patch -Np1 -i "$srcdir/libpng14.patch"
./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \
--enable-ssl
make
@@ -29,6 +27,5 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
}
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
new file mode 100644
index 000000000..b5444c7f4
--- /dev/null
+++ b/community/dvtm/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 52669 2011-07-27 12:48:55Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Giorgio Lando <patroclo7@gmail.com>
+# Contributor: bender02 at gmx dot com
+
+pkgname=dvtm
+pkgver=0.6
+pkgrel=1
+pkgdesc='Dynamic virtual terminal manager.'
+arch=('i686' 'x86_64')
+url='http://www.brain-dump.org/projects/dvtm/'
+license=('MIT')
+depends=('ncurses')
+source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'config.h')
+md5sums=('db77a3744868dd91a5ae5ad98b7df709'
+ '5759191a39281e62a64941d3f28cf010')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ cp "${srcdir}/config.h" .
+ sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
+
+ make clean
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make PREFIX=/usr DESTDIR="${pkgdir}" install
+ install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community/dvtm/config.h b/community/dvtm/config.h
new file mode 100644
index 000000000..39e121ee9
--- /dev/null
+++ b/community/dvtm/config.h
@@ -0,0 +1,148 @@
+/* curses attributes for the currently focused window */
+/* valid curses attributes are listed below they can be ORed
+ *
+ * A_NORMAL Normal display (no highlight)
+ * A_STANDOUT Best highlighting mode of the terminal.
+ * A_UNDERLINE Underlining
+ * A_REVERSE Reverse video
+ * A_BLINK Blinking
+ * A_DIM Half bright
+ * A_BOLD Extra bright or bold
+ * A_PROTECT Protected mode
+ * A_INVIS Invisible or blank mode
+ *
+ */
+#define BLUE (COLORS==256 ? 68 : COLOR_BLUE)
+
+#define SELECTED_ATTR A_NORMAL
+#define SELECTED_FG BLUE
+#define SELECTED_BG -1
+/* curses attributes for normal (not selected) windows */
+#define NORMAL_ATTR A_NORMAL
+#define NORMAL_FG -1
+#define NORMAL_BG -1
+/* status bar (command line option -s) position */
+#define BARPOS BarTop /* BarBot, BarOff */
+/* curses attributes for the status bar */
+#define BAR_ATTR A_NORMAL
+#define BAR_FG BLUE
+#define BAR_BG -1
+/* determines whether the statusbar text should be right or left aligned */
+#define BAR_ALIGN ALIGN_RIGHT
+/* separator between window title and window number */
+#define SEPARATOR " | "
+/* printf format string for the window title, first %s
+ * is replaced by the title, second %s is replaced by
+ * the SEPARATOR, %d stands for the window number */
+#define TITLE "[%s%s#%d]"
+/* master width factor [0.1 .. 0.9] */
+#define MWFACT 0.5
+/* scroll back buffer size in lines */
+#define SCROLL_BUF_SIZE 500
+
+#include "tile.c"
+#include "grid.c"
+#include "bstack.c"
+#include "fullscreen.c"
+
+/* by default the first layout entry is used */
+Layout layouts[] = {
+ { "[]=", tile },
+ { "+++", grid },
+ { "TTT", bstack },
+ { "[ ]", fullscreen },
+};
+
+#define MOD CTRL('g')
+
+/* you can at most specifiy MAX_ARGS (2) number of arguments */
+Key keys[] = {
+ { MOD, 'c', { create, { NULL } } },
+ { MOD, 'x', { killclient, { NULL } } },
+ { MOD, 'j', { focusnext, { NULL } } },
+ { MOD, 'u', { focusnextnm, { NULL } } },
+ { MOD, 'i', { focusprevnm, { NULL } } },
+ { MOD, 'k', { focusprev, { NULL } } },
+ { MOD, 't', { setlayout, { "[]=" } } },
+ { MOD, 'g', { setlayout, { "+++" } } },
+ { MOD, 'b', { setlayout, { "TTT" } } },
+ { MOD, 'm', { setlayout, { "[ ]" } } },
+ { MOD, ' ', { setlayout, { NULL } } },
+ { MOD, 'h', { setmwfact, { "-0.05" } } },
+ { MOD, 'l', { setmwfact, { "+0.05" } } },
+ { MOD, '.', { toggleminimize, { NULL } } },
+#ifdef CONFIG_STATUSBAR
+ { MOD, 's', { togglebar, { NULL } } },
+#endif
+#ifdef CONFIG_MOUSE
+ { MOD, 'M', { mouse_toggle, { NULL } } },
+#endif
+ { MOD, '\n', { zoom , { NULL } } },
+ { MOD, '1', { focusn, { "1" } } },
+ { MOD, '2', { focusn, { "2" } } },
+ { MOD, '3', { focusn, { "3" } } },
+ { MOD, '4', { focusn, { "4" } } },
+ { MOD, '5', { focusn, { "5" } } },
+ { MOD, '6', { focusn, { "6" } } },
+ { MOD, '7', { focusn, { "7" } } },
+ { MOD, '8', { focusn, { "8" } } },
+ { MOD, '9', { focusn, { "9" } } },
+ { MOD, 'q', { quit, { NULL } } },
+ { MOD, 'G', { escapekey, { NULL } } },
+ { MOD, 'a', { togglerunall, { NULL } } },
+ { MOD, 'r', { redraw, { NULL } } },
+ { MOD, 'X', { lock, { NULL } } },
+ { MOD, 'B', { togglebell, { NULL } } },
+ { MOD, KEY_PPAGE, { scrollback, { "-1" } } },
+ { MOD, KEY_NPAGE, { scrollback, { "1" } } },
+ { MOD, '?', { create, { "man dvtm", "dvtm help" } } },
+};
+
+/* possible values for the mouse buttons are listed below:
+ *
+ * BUTTON1_PRESSED mouse button 1 down
+ * BUTTON1_RELEASED mouse button 1 up
+ * BUTTON1_CLICKED mouse button 1 clicked
+ * BUTTON1_DOUBLE_CLICKED mouse button 1 double clicked
+ * BUTTON1_TRIPLE_CLICKED mouse button 1 triple clicked
+ * BUTTON2_PRESSED mouse button 2 down
+ * BUTTON2_RELEASED mouse button 2 up
+ * BUTTON2_CLICKED mouse button 2 clicked
+ * BUTTON2_DOUBLE_CLICKED mouse button 2 double clicked
+ * BUTTON2_TRIPLE_CLICKED mouse button 2 triple clicked
+ * BUTTON3_PRESSED mouse button 3 down
+ * BUTTON3_RELEASED mouse button 3 up
+ * BUTTON3_CLICKED mouse button 3 clicked
+ * BUTTON3_DOUBLE_CLICKED mouse button 3 double clicked
+ * BUTTON3_TRIPLE_CLICKED mouse button 3 triple clicked
+ * BUTTON4_PRESSED mouse button 4 down
+ * BUTTON4_RELEASED mouse button 4 up
+ * BUTTON4_CLICKED mouse button 4 clicked
+ * BUTTON4_DOUBLE_CLICKED mouse button 4 double clicked
+ * BUTTON4_TRIPLE_CLICKED mouse button 4 triple clicked
+ * BUTTON_SHIFT shift was down during button state change
+ * BUTTON_CTRL control was down during button state change
+ * BUTTON_ALT alt was down during button state change
+ * ALL_MOUSE_EVENTS report all button state changes
+ * REPORT_MOUSE_POSITION report mouse movement
+ */
+
+#ifdef CONFIG_MOUSE
+Button buttons[] = {
+ { BUTTON1_CLICKED, { mouse_focus, { NULL } } },
+ { BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
+ { BUTTON2_CLICKED, { mouse_zoom, { NULL } } },
+ { BUTTON3_CLICKED, { mouse_minimize, { NULL } } },
+};
+#endif /* CONFIG_MOUSE */
+
+#ifdef CONFIG_CMDFIFO
+Cmd commands[] = {
+ { "create", { create, { NULL } } },
+};
+#endif /* CONFIG_CMDFIFO */
+
+/* gets executed when dvtm is started */
+Action actions[] = {
+ { create, { NULL } },
+};
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index ba17822e7..053e05f83 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-modules-extra-svn
-pkgver=60246
+pkgver=61885
pkgrel=1
pkgdesc="Extra gadgets for e17"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 297bba5c7..40717fef5 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49239 2011-06-13 09:40:13Z rvanharen $
+# $Id: PKGBUILD 53113 2011-07-30 17:03:37Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-svn
-pkgver=60263
+pkgver=61875
pkgrel=1
pkgdesc="Enlightenment window manager DR17 (aka e17)"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 0d65b1d55..e64c6c73e 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49234 2011-06-13 09:39:28Z rvanharen $
+# $Id: PKGBUILD 53108 2011-07-30 17:02:51Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e_dbus-svn
-pkgver=60246
+pkgver=61732
pkgrel=1
pkgdesc="dbus abstraction layer for e17"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index 593bfb480..2bfaee762 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49213 2011-06-13 09:36:25Z rvanharen $
+# $Id: PKGBUILD 53062 2011-07-30 16:00:01Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=ecore-svn
-pkgver=60253
+pkgver=61897
pkgrel=1
pkgdesc="Ecore is an abstraction layer for e17"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ groups=('e17-libs-svn' 'e17-svn')
url="http://www.enlightenment.org"
license=('BSD')
depends=('libxp' 'curl' 'libxss' 'evas-svn' 'libxtst' 'libxcomposite'
- 'libxrandr' 'libxinerama' 'libxcursor')
+ 'libxrandr' 'libxinerama' 'libxcursor' 'eina-svn')
makedepends=('subversion')
conflicts=('ecore')
provides=('ecore')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 426c76b4d..b71c6c3c5 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49224 2011-06-13 09:37:58Z rvanharen $
+# $Id: PKGBUILD 53098 2011-07-30 17:01:13Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=edje-svn
-pkgver=60246
+pkgver=61905
pkgrel=1
pkgdesc="A graphical design and layout library based on Evas"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index efbb767e3..bb5d0ee8a 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49203 2011-06-13 09:34:45Z rvanharen $
+# $Id: PKGBUILD 53078 2011-07-30 16:57:26Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eet-svn
-pkgver=60246
+pkgver=61920
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index 7774956f6..bb0c423e5 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: bluebugs
pkgname=eeze-svn
-pkgver=60034
+pkgver=61778
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index 67394cb62..ad58a3814 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49229 2011-06-13 09:38:46Z rvanharen $
+# $Id: PKGBUILD 53103 2011-07-30 17:02:04Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=efreet-svn
-pkgver=60246
+pkgver=60978
pkgrel=1
pkgdesc="freedesktop.org specifications for e17"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index bf7847b0e..9e2536da5 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49198 2011-06-13 09:33:59Z rvanharen $
+# $Id: PKGBUILD 53073 2011-07-30 16:56:37Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eina-svn
-pkgver=60246
+pkgver=61900
pkgrel=1
pkgdesc="E17 file chunk reading/writing library"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 8d3956fc0..c4a15fb26 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=elementary-svn
-pkgver=60261
+pkgver=61919
pkgrel=1
pkgdesc="Enlightenment's basic widget set"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 864053c5d..a5c1b667c 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51048 2011-07-04 15:29:28Z spupykin $
+# $Id: PKGBUILD 52641 2011-07-26 16:47:26Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: damir <damir@archlinux.org>
@@ -6,23 +6,23 @@
pkgname=elinks
pkgver=0.13
-_commit="03c698e926d4421ba43d905b6d9fd7388b97352f"
-pkgrel=6
+_commit="eb4e5d7e0ddae63f28ec90d155846a2456e4a413"
+pkgrel=7
pkgdesc="An advanced and well-established feature-rich text mode web browser."
arch=("i686" "x86_64" 'mips64el')
url="http://elinks.or.cz"
license=('GPL')
depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js'
- 'gc' 'tre' 'smbclient')
+ 'gc' 'tre')
source=("http://arch.p5n.pp.ru/~sergej/dl/elinks-$pkgver-${_commit}.tar.gz")
-md5sums=('85916038633d0eb4ed98c3f82ac0b405')
+md5sums=('71227b25ad05b719e4a549a26d958379')
build() {
cd "$srcdir/elinks"
[ -x configure ] || sh autogen.sh
./configure --prefix=/usr --mandir=/usr/share/man \
--sysconfdir=/etc \
- --enable-smb --without-x --enable-cgi \
+ --disable-smb --without-x --enable-cgi \
--enable-leds --enable-256-colors --enable-html-highlight \
--with-zlib
make
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index a3250ded2..f6a188c92 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49565 2011-06-18 07:30:46Z andrea $
+# $Id: PKGBUILD 53195 2011-07-31 21:48:19Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Claudio Riva <firetux83@gmail.com>
pkgname=emesene
-pkgver=2.11.5
-pkgrel=2
+pkgver=2.11.7
+pkgrel=1
pkgdesc="A pygtk MSN Messenger client"
url="http://www.emesene.org/"
license=('custom:PSF' 'GPL' 'LGPL2.1')
@@ -21,13 +21,12 @@ optdepends=('gnome-python-extras: spell-check plugin'
'pywebkitgtk: for alternative conversation window'
'xmpppy: for gtalk and facebook chat support'
'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'emesene.run')
install=emesene.install
options=('!libtool')
-sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691'
- 'fee7a7731b32f6fe0b5ade1abc06115bcef92c41')
-
+sha1sums=('ba18b6a40003c1e0407dc1395a237db84ce4efa1'
+ '2bd13ada86aa0af6307a41047f0d7caf2995660d')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run
index eca282589..8fb6efc62 100644
--- a/community/emesene/emesene.run
+++ b/community/emesene/emesene.run
@@ -1,2 +1,2 @@
#!/bin/bash
-python2 /usr/share/emesene/emesene.py "$@"
+python2 /usr/share/emesene/emesene "$@"
diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD
index b5c0aaee9..f2023c285 100755
--- a/community/emprint-svn/PKGBUILD
+++ b/community/emprint-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49244 2011-06-13 09:42:08Z rvanharen $
+# $Id: PKGBUILD 53118 2011-07-30 17:05:35Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=emprint-svn
-pkgver=60246
+pkgver=61738
pkgrel=1
pkgdesc="screenshot module for e17"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index b996779ba..ca88d1188 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $
+# $Id: PKGBUILD 52537 2011-07-26 04:21:21Z svenstaro $
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
pkgname=encfs
pkgver=1.7.4
-pkgrel=4
+pkgrel=5
pkgdesc='Encrypted filesystem in user-space'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.arg0.net/encfs'
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index ef60417cc..35eaa4092 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49208 2011-06-13 09:35:30Z rvanharen $
+# $Id: PKGBUILD 53083 2011-07-30 16:58:13Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=evas-svn
-pkgver=60260
+pkgver=61914
pkgrel=1
pkgdesc="A hardware-accelerated canvas API for X-Windows"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index e3d246e34..5eeeb3155 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $
+# $Id: PKGBUILD 52540 2011-07-26 04:27:53Z svenstaro $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=fatrat
pkgver=1.1.3
-pkgrel=4
+pkgrel=5
pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
arch=('i686' 'x86_64' 'mips64el')
url="http://fatrat.dolezel.info/"
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index c6f62062c..10eb5391f 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 38872 2011-02-02 16:42:39Z giovanni $
+# $Id: PKGBUILD 52890 2011-07-29 17:53:33Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Cilyan Olowen <gaknar@gmail.com>
# Contributor: fill <mailbox@fillo.ru>
# Contributor: Anton Shestakov <engored*ya.ru>
pkgname=flashrom
-pkgver=0.9.3
+pkgver=0.9.4
pkgrel=1
pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
url="http://www.coreboot.org/Flashrom"
@@ -13,15 +13,17 @@ arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libftdi')
makedepends=('zlib' 'pciutils')
-source=("http://qa.coreboot.org/releases/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('eccdec2764223f5d2839bf577380eaa9')
+source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('d739a91aece12cc1e622038bb199541c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make || return 1
+
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX="${pkgdir}/usr" install || return 1
+
+ make PREFIX="${pkgdir}/usr" install
}
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index e0737fc43..aa6f6b634 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=fotoxx
-pkgver=11.07
+pkgver=11.08
pkgrel=1
pkgdesc="A program for improving image files made with a digital camera"
url="http://kornelix.squarespace.com/fotoxx"
@@ -9,7 +9,7 @@ license=('GPL3')
depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('cf7ce6011108da211b0169df6686ae95')
+md5sums=('928368cfa250f6aab60c9a92aa27fefa')
install=fotoxx.install
build() {
@@ -18,6 +18,7 @@ build() {
CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \
LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`"
sed -i 's+^# ++' data/desktop
+ sed -i 's+@PREFIX@+/usr+' data/desktop
}
package() {
diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD
index 764de7893..551d82524 100644
--- a/community/freecol/PKGBUILD
+++ b/community/freecol/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49898 2011-06-22 11:19:02Z svenstaro $
+# $Id: PKGBUILD 52513 2011-07-25 23:52:16Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: TDY <tdy@gmx.com>
# Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com>
pkgname=freecol
-pkgver=0.10.0
+pkgver=0.10.1
pkgrel=1
pkgdesc="A turn-based strategy game based on Colonization"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
depends=('java-runtime')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip
fc.desktop fc.sh)
-md5sums=('281c27b6222fa586823db7cad4a8ea3a'
+md5sums=('1511c1fbd71e36c0f998e32a1279718a'
'55594d770904af3e3e3852d375085357'
'ae473cd1d86f8f764250ee00b6fda90b')
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index 85e407649..19c3e0fcd 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -6,8 +6,8 @@
# Contributor: DonVla <donvla@users.sourceforge.net>
pkgname=gitg
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.2.4
+pkgrel=1
pkgdesc='A GIT repository viewer based on GTK+'
arch=('i686' 'x86_64' 'mips64el')
url='http://trac.novowork.com/gitg/'
@@ -16,7 +16,7 @@ depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-
makedepends=('intltool')
install="${pkgname}.install"
source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a')
+sha256sums=('96705b0edf6525a131a34d015544da67add9ed992babbd45fc768cdd032b65d0')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 053da0ecd..b6b9aba01 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $
+# $Id: PKGBUILD 52543 2011-07-26 04:33:02Z svenstaro $
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
pkgname=glob2
pkgver=0.9.4.4
-pkgrel=8
+pkgrel=9
pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.globulation2.org/"
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 4dbef2056..8bd58d4a5 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $
+# $Id: PKGBUILD 52545 2011-07-26 04:39:23Z svenstaro $
# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=glom
pkgver=1.16.1
-pkgrel=6
+pkgrel=7
pkgdesc="An easy-to-use database designer and user interface"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.glom.org/"
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index f962211b1..dbb756e2c 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=gnash
pkgname=(gnash-common gnash-gtk)
pkgver=0.8.9
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
url="http://www.gnu.org/software/gnash/"
license=(GPL3)
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index d89fd19b6..6bf0b4acf 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 45878 2011-04-30 20:15:23Z ibiru $
+# $Id: PKGBUILD 53049 2011-07-30 13:32:24Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: uastasi <uastasi@archlinux.us>
pkgname=gnote
-pkgver=0.7.4
+pkgver=0.7.5
pkgrel=1
pkgdesc="Experimental port of Tomboy to C++ "
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ depends=('gtkmm' 'gconf' 'gtkspell' 'libxslt')
makedepends=('intltool' 'gnome-doc-utils' 'boost')
options=('!libtool')
install=gnote.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('19bf64397278b85703979fd4943692f6c44579e597bad27acf04a64d6813e6f2')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('ccb8a4922f167d9727fbc69f559b722004fb6bad3af329dad1fe5e2a3d3d18b8')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,5 +32,5 @@ package() {
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnote ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -rf ${pkgdir}/etc/gconf/
+ rm -rf ${pkgdir}/etc/
}
diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD
index 9688ffac5..080e5ba07 100644
--- a/community/gpicview/PKGBUILD
+++ b/community/gpicview/PKGBUILD
@@ -1,7 +1,9 @@
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=gpicview
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
pkgdesc="Picture viewer of the LXDE Desktop"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
@@ -11,11 +13,15 @@ depends=('gtk2')
makedepends=('pkgconfig' 'intltool')
optdepends=('librsvg: For SVG support')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a2de255bf9bdc40746c0dc89b3454a10')
+md5sums=('943da9f4a23541accd5acdd4fb69966f')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --sysconfdir=/etc --prefix=/usr || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index b8b6efcc2..23ec7eec9 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $
+# $Id: PKGBUILD 52604 2011-07-26 10:16:12Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Maintainer: damir <damir@archlinux.org>
pkgname=gpsdrive
pkgver=2.11
-pkgrel=8
+pkgrel=9
pkgdesc="A car (bike, ship, plane) navigation system"
arch=("i686" "x86_64" 'mips64el')
url="http://www.gpsdrive.de/"
diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD
index c5fb86f3f..b57328678 100644
--- a/community/grsync/PKGBUILD
+++ b/community/grsync/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 16852 2010-05-11 12:30:04Z spupykin $
+# $Id: PKGBUILD 52933 2011-07-30 07:01:49Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
pkgname=grsync
-pkgver=1.1.1
+pkgver=1.2.0
pkgrel=1
pkgdesc="GTK GUI for rsync"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,11 @@ depends=('gtk2' 'rsync')
makedepends=('gettext' 'intltool')
install=grsync.install
source=(http://www.opbyte.it/release/grsync-$pkgver.tar.gz)
-md5sums=('81d3b6a1827fa1b06d87491f9bb1c8b9')
+md5sums=('6364df4a3a7c9ebc25799762e77dc351')
build() {
cd $startdir/src/grsync-$pkgver
[ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
- make || return 1
+ make
make DESTDIR=$startdir/pkg install
}
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index 221a86292..58b5947ee 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 22547 2010-07-22 13:02:46Z lcarlier $
+# $Id: PKGBUILD 52652 2011-07-26 19:12:51Z ebelanger $
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=hubbub
-pkgver=0.0.2
+pkgver=0.1.0
pkgrel=1
pkgdesc="HTML5 compliant parsing library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.netsurf-browser.org/projects/hubbub"
license=('MIT')
-depends=('libparserutils')
+depends=('glibc' 'libparserutils')
source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('dbdc6bb13a71ce72384d7ee5891a0382')
+md5sums=('9d7bb287bd5f993902c577ce3503f6d5')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
-# sed -i 's/const uint8_t \*cptr;/const uint8_t \*cptr = 0;/;
-# s/size_t len;/size_t len = 0;/' src/tokeniser/tokeniser.c
- make PREFIX=/usr
+ cd "${srcdir}/${pkgname}-${pkgver}-src"
+ sed -i 's/-Werror//' Makefile
+ make PREFIX=/usr COMPONENT_TYPE="lib-shared"
+ make PREFIX=/usr COMPONENT_TYPE="lib-static"
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make install PREFIX=/usr DESTDIR=${pkgdir}
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+ cd "${srcdir}/${pkgname}-${pkgver}-src"
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared"
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 3cbc9aa19..5782b26c5 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,48 +1,53 @@
-# $Id: PKGBUILD 46517 2011-05-08 15:05:08Z ttopper $
+# $Id: PKGBUILD 53231 2011-08-01 21:41:41Z ttopper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3-wm
_pkgsourcename=i3
-pkgver=3.e_bf3
-_pkgver=3.e-bf3
+pkgver=4.0.1
pkgrel=1
pkgdesc="An improved dynamic tiling window manager"
arch=('i686' 'x86_64' 'mips64el')
-url="http://i3.zekjur.net/"
+url="http://i3wm.org/"
license=('BSD')
-replaces=("i3")
+replaces=("i3" "i3bar")
groups=("i3")
-depends=('libx11' 'xcb-util' 'libev' 'yajl')
+depends=('libxcursor' 'xcb-util' 'libev' 'yajl')
makedepends=('bison' 'flex')
optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
- 'dmenu: As menu.')
+ 'dmenu: As menu.'
+ 'perl: To migrate your configuration to v4 format.')
options=('docs' '!strip')
-source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2)
-md5sums=('07a66e04bc754d0c16b033ed9df80c65')
+source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2)
+md5sums=('87c5961589068269da611b79064c628e')
build() {
- cd "$srcdir/$_pkgsourcename-$_pkgver"
-
+ cd "$srcdir/$_pkgsourcename-$pkgver"
+
make
}
package() {
- cd "$srcdir/$_pkgsourcename-$_pkgver"
+ cd "$srcdir/$_pkgsourcename-$pkgver"
make DESTDIR="$pkgdir/" install
install -Dm644 man/i3.1 \
${pkgdir}/usr/share/man/man1/i3.1
- install -Dm644 man/i3-msg.1 \
- ${pkgdir}/usr/share/man/man1/i3-msg.1
+ install -Dm644 i3bar/doc/i3bar.1 \
+ ${pkgdir}/usr/share/man/man1/i3bar.1
+ install -Dm644 man/i3-config-wizard.1 \
+ ${pkgdir}/usr/share/man/man1/i3-config-wizard.1
install -Dm644 man/i3-input.1 \
${pkgdir}/usr/share/man/man1/i3-input.1
+ install -Dm644 man/i3-msg.1 \
+ ${pkgdir}/usr/share/man/man1/i3-msg.1
+ install -Dm644 man/i3-migrate-config-to-v4.1 \
+ ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1
+ install -Dm644 man/i3-nagbar.1 \
+ ${pkgdir}/usr/share/man/man1/i3-nagbar.1
install -Dm644 LICENSE \
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- #i3-wsbar will be provided by another package
- rm ${pkgdir}/usr/bin/i3-wsbar
-
make clean
}
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 8addba7db..45e9753e2 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43953 2011-04-01 08:09:21Z schiv $
+# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Daniele Paolella <danielepaolella@email.it>
# Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,25 +8,28 @@ pkgbase=jack2
pkgname=('jack2' 'jack2-dbus')
_tarname=jack
pkgver=1.9.7
-pkgrel=1
-pkgdesc="The next-generation JACK with SMP support"
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://jackaudio.org/"
license=('GPL')
-depends=('libsamplerate')
-makedepends=('python2' 'doxygen' 'libffado' 'celt-0.7' 'dbus-core')
-optdepends=('libffado: FireWire support'
- 'celt-0.7: NetJACK2 driver'
- 'python2: jack_control')
-provides=('jack=0.118.0' 'jack-audio-connection-kit=0.118.0' 'jackdbus'
- 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
-conflicts=('jack')
-source=(http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2)
+makedepends=('python2' 'doxygen' 'libffado' 'celt'
+ 'libsamplerate' 'dbus-core')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('python2' 'doxygen' 'celt'
+ 'libsamplerate' 'dbus-core')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2")
md5sums=('9759670feecbd43eeccf1c0f743ec199')
_pyfix() {
- sed -i 's:bin/env python:bin/env python2:' \
- "$pkgdir/usr/bin/jack_control"
+ sed -i 's:bin/env python:bin/env python2:' "$pkgdir/usr/bin/jack_control"
+}
+
+_wafconf() {
+ if [ "$CARCH" = "mips64el" ]; then
+ python2 waf configure --prefix=/usr --alsa --doxygen $@
+ else
+ python2 waf configure --prefix=/usr --alsa --firewire --doxygen $@
+ fi
}
build() {
@@ -41,51 +44,55 @@ build() {
# mixed dbus/classic build
cd $_tarname-$pkgver
msg2 "Running Mixed D-Bus/Classic build"
-
- python2 waf configure --prefix=/usr \
- --alsa \
- --dbus \
- --classic \
- --firewire \
- --doxygen
-
+ _wafconf --classic --dbus
python2 waf build $MAKEFLAGS
# dbus-ONLY build
cd ../$_tarname-dbus-$pkgver
msg2 "Running D-Bus-only build"
-
- python2 waf configure --prefix=/usr \
- --alsa \
- --dbus \
- --firewire \
- --doxygen
-
+ _wafconf --dbus
python2 waf build $MAKEFLAGS
}
package_jack2() {
+ pkgdesc="The next-generation JACK with SMP support"
+ depends=('libsamplerate')
optdepends=('libffado: FireWire support'
- 'celt-0.7: NetJACK2 driver'
+ 'celt: NetJACK2 driver'
'dbus-core: jackdbus'
'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+ optdepends=('celt: NetJACK2 driver'
+ 'dbus-core: jackdbus'
+ 'python2: jack_control')
+ conflicts=('jack')
+ provides=('jack' 'jack-audio-connection-kit' 'jackdbus'
+ 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
cd "$srcdir/$_tarname-$pkgver"
- python2 waf install --destdir="$pkgdir/"
+ python2 waf install --destdir="$pkgdir"
# fix for major python transition
_pyfix
}
package_jack2-dbus() {
- pkgdesc+=" (for D-Bus interaction only)"
- depends+=('dbus-core')
- conflicts+=('jack2')
+ pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
+ depends=('libsamplerate' 'dbus-core')
+ optdepends=('libffado: FireWire support'
+ 'celt: NetJACK2 driver'
+ 'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+ optdepends=('celt: NetJACK2 driver'
+ 'python2: jack_control')
+ conflicts=('jack' 'jack2')
+ provides=('jack' 'jack2' 'jack-audio-connection-kit' 'jackdbus'
+ 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
cd "$srcdir/$_tarname-dbus-$pkgver"
- python2 waf install --destdir="$pkgdir/"
+ python2 waf install --destdir="$pkgdir"
_pyfix
}
diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD
new file mode 100644
index 000000000..61cce1d2a
--- /dev/null
+++ b/community/java-oracle/PKGBUILD
@@ -0,0 +1,146 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: kfgz <kfgz at interia dot pl>
+# Contributor: Army <gmail.com: uli[dot]armbruster>
+# 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>
+# Contributor: Charles Ghislain <charlyghislain at gmail dot com>
+
+pkgbase=java-oracle
+pkgname=('jre' 'jdk')
+pkgver=7
+pkgrel=2
+arch=('i686' 'x86_64')
+ [ "${CARCH}" = 'i686' ] && _arch='i586'
+ [ "${CARCH}" = 'x86_64' ] && _arch='x64'
+url='http://jdk7.java.net/'
+license=('custom')
+source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz"
+ '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'
+ 'jdk.profile.csh'
+ 'derby-network-server'
+ 'derby-network-server.conf'
+ 'javaws-launcher')
+[ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927')
+[ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64')
+md5sums+=('e4d814c0f310d77ed6990c731bccd0fb'
+ '4bc2b0be93f76ed07b471e3c89eb5a8a'
+ '8e3cec7ab641ec449cabd068be583f5c'
+ '9ba148ebabce8ed3351b813a9a66b6e5'
+ '619ec32235dcfe454234ef4316f8a7cc'
+ '7cd3dc10e7a37468cad4053a067dcd01'
+ 'cc90df2df6fe80fab885a80036d420a1'
+ 'b83ab5742651b4234b7d2e20785c6693'
+ '6f4cbf332816d2c4e9578ecd1d0dce7f'
+ 'a279e195e249000646895d93e199860d'
+ '4bdff6982c66d24a879c424aaac3d04d'
+ '45c15a6b4767288f2f745598455ea2bf')
+
+package_jre() {
+ pkgdesc="Oracle's Java Runtime Environment"
+ depends=('libxtst')
+ provides=('java-runtime=7')
+ conflicts=('java-runtime')
+ install='jre.install'
+
+ # main files
+ mkdir -p ${pkgdir}/opt/java
+ cp -r jdk1.7.0/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
+
+ # java browser plugin
+ 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
+
+ # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509
+ install ${srcdir}/javaws-launcher \
+ ${pkgdir}/opt/java/jre/bin
+}
+
+package_jdk() {
+ pkgdesc="Oracle's Java Development Kit"
+ depends=('jre')
+ provides=('java-environment=7')
+ conflicts=('java-environment')
+ install='jdk.install'
+
+ #copy icon
+ install -D -m644 ${srcdir}/jdk1.7.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
+ ${pkgdir}/usr/share/pixmaps/java.png
+
+ # main files
+ install -d ${pkgdir}/opt
+ mv jdk1.7.0 ${pkgdir}/opt/java
+
+ # cleanup jre folder
+ rm -rf ${pkgdir}/opt/java/jre
+ # can not package src.zip due to international use restrictions for certain countries
+ rm ${pkgdir}/opt/java/src.zip
+ # remove windows specific batch files
+ find ${pkgdir}/opt/java -name '*\.bat' -delete
+
+ # 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 FS#21186
+ 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
+}
+
diff --git a/community/java-oracle/derby-network-server b/community/java-oracle/derby-network-server
new file mode 100644
index 000000000..f2b36ea56
--- /dev/null
+++ b/community/java-oracle/derby-network-server
@@ -0,0 +1,64 @@
+#!/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/community/java-oracle/derby-network-server.conf b/community/java-oracle/derby-network-server.conf
new file mode 100644
index 000000000..ef7478254
--- /dev/null
+++ b/community/java-oracle/derby-network-server.conf
@@ -0,0 +1,2 @@
+DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log"
+
diff --git a/community/java-oracle/java-control-panel.desktop b/community/java-oracle/java-control-panel.desktop
new file mode 100644
index 000000000..476e04a82
--- /dev/null
+++ b/community/java-oracle/java-control-panel.desktop
@@ -0,0 +1,12 @@
+[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/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop
new file mode 100644
index 000000000..c0e1e59f6
--- /dev/null
+++ b/community/java-oracle/java-monitoring-and-management-console.desktop
@@ -0,0 +1,9 @@
+[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/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop
new file mode 100644
index 000000000..1009301b1
--- /dev/null
+++ b/community/java-oracle/java-policy-settings.desktop
@@ -0,0 +1,10 @@
+[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/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop
new file mode 100644
index 000000000..8aa9527c8
--- /dev/null
+++ b/community/java-oracle/java-visualvm.desktop
@@ -0,0 +1,11 @@
+[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/community/java-oracle/java-web-start.desktop b/community/java-oracle/java-web-start.desktop
new file mode 100644
index 000000000..a8a25f9e2
--- /dev/null
+++ b/community/java-oracle/java-web-start.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Exec=/opt/java/jre/bin/javaws-launcher %f
+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/community/java-oracle/javaws-launcher b/community/java-oracle/javaws-launcher
new file mode 100644
index 000000000..2831dfcbb
--- /dev/null
+++ b/community/java-oracle/javaws-launcher
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$@" ]; then
+ exec javaws -viewer
+else
+ exec javaws "$@"
+fi
diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install
new file mode 100644
index 000000000..abe08b6a0
--- /dev/null
+++ b/community/java-oracle/jdk.install
@@ -0,0 +1,7 @@
+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/community/java-oracle/jdk.profile b/community/java-oracle/jdk.profile
new file mode 100644
index 000000000..f9d5deb68
--- /dev/null
+++ b/community/java-oracle/jdk.profile
@@ -0,0 +1,4 @@
+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/community/java-oracle/jdk.profile.csh b/community/java-oracle/jdk.profile.csh
new file mode 100644
index 000000000..3626e7287
--- /dev/null
+++ b/community/java-oracle/jdk.profile.csh
@@ -0,0 +1,4 @@
+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/community/java-oracle/jre.install b/community/java-oracle/jre.install
new file mode 100644
index 000000000..111da3c2a
--- /dev/null
+++ b/community/java-oracle/jre.install
@@ -0,0 +1,20 @@
+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/community/java-oracle/jre.profile b/community/java-oracle/jre.profile
new file mode 100644
index 000000000..ded0efe81
--- /dev/null
+++ b/community/java-oracle/jre.profile
@@ -0,0 +1,2 @@
+export PATH=$PATH:/opt/java/jre/bin
+export JAVA_HOME=${JAVA_HOME:-/opt/java/jre}
diff --git a/community/java-oracle/jre.profile.csh b/community/java-oracle/jre.profile.csh
new file mode 100644
index 000000000..a4e72ddf4
--- /dev/null
+++ b/community/java-oracle/jre.profile.csh
@@ -0,0 +1,4 @@
+setenv PATH ${PATH}:/opt/java/jre/bin
+if (! "$?JAVA_HOME" ) then
+ setenv JAVA_HOME /opt/java/jre
+endif
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 45465d331..3996eca85 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 43686 2011-03-29 05:52:51Z stativ $
+# $Id: PKGBUILD 52812 2011-07-28 17:27:25Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=klavaro
-pkgver=1.9.0
+pkgver=1.9.3
pkgrel=1
pkgdesc="Free touch typing tutor program"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ depends=('curl' 'gtkdatabox' 'hicolor-icon-theme')
makedepends=('intltool')
install=$pkgname.install
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('e6ad9c7b3d9b3060f32441b04aa9c632')
+md5sums=('34c4609951177cf53dd9af98daeca36a')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 1be9cf94c..fedd5044f 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -7,13 +7,13 @@
pkgname=kphotoalbum
pkgver=4.1.1
-pkgrel=8
+pkgrel=9.1
pkgdesc="KDE Photo Album, picture collection manager"
url="http://www.kphotoalbum.org/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-depends=('kdebase-runtime' 'kdegraphics-libs')
-makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kipi-plugins>=1.8.0' 'kdemultimedia-mplayerthumbs' 'docbook-xsl')
+depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw')
+makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs' 'docbook-xsl')
optdepends=('kdeedu-marble: integration with Marble'
'kipi-plugins: add extra functionality'
'kdemultimedia-mplayerthumbs: video thumbnails')
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index 1eabfba4d..ba01933d5 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=libcss
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A CSS parser and selection engine."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.netsurf-browser.org/projects/libcss/"
@@ -14,12 +14,17 @@ md5sums=('47b9bba60fffe16ecebeba578c89fd40')
build() {
cd ${srcdir}/${pkgname}-${pkgver}-src
+
export CFLAGS="-Wno-error=unused-but-set-variable"
- make
+
+ make PREFIX=/usr COMPONENT_TYPE="lib-shared"
+ make PREFIX=/usr COMPONENT_TYPE="lib-static"
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}-src
- make PREFIX=/usr DESTDIR=${pkgdir} install
+
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared"
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index 980aa3626..d5afff5e9 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46354 2011-05-06 03:07:02Z bfanella $
+# $Id: PKGBUILD 52548 2011-07-26 04:43:08Z bfanella $
# Maintainer: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=libparserutils
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Library for building efficient parsers"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.netsurf-browser.org/projects/libparserutils"
@@ -14,15 +14,18 @@ source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-s
md5sums=('eb415317925a0fb12a4ff8f849d2fe92')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}-src
+ cd "${srcdir}"/${pkgname}-${pkgver}-src
sed 's/-Wall/ /' -i Makefile
- make PREFIX=/usr
+ make PREFIX=/usr COMPONENT_TYPE="lib-shared"
+ make PREFIX=/usr COMPONENT_TYPE="lib-static"
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src
+ cd "${srcdir}"/${pkgname}-${pkgver}-src
+
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared"
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
- make install PREFIX=/usr DESTDIR=${pkgdir}
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 41e3df4d8..96e5b4f2e 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52410 2011-07-24 18:09:00Z giovanni $
+# $Id: PKGBUILD 52905 2011-07-29 19:20:46Z giovanni $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
pkgver=0.9.3
-pkgrel=2
+pkgrel=3
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64' 'mips64el')
url="http://libvirt.org/"
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 6bff3fe6d..a1ce96856 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=libwapcaplet
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A string internment library with rapid string comparison."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.netsurf-browser.org/projects/libwapcaplet/"
@@ -12,14 +12,16 @@ source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-sr
md5sums=('c21975b81bcdafa60ad6b97b95925efe')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}-src
+ cd "${srcdir}"/${pkgname}-${pkgver}-src
- make
+ make PREFIX=/usr COMPONENT_TYPE="lib-shared"
+ make PREFIX=/usr COMPONENT_TYPE="lib-static"
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}-src
+ cd "${srcdir}"/${pkgname}-${pkgver}-src
- make PREFIX=/usr DESTDIR=${pkgdir} install
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-shared"
+ make install PREFIX=/usr DESTDIR="${pkgdir}" COMPONENT_TYPE="lib-static"
install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index 4e4d7cbc6..e7bd4e2ad 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -2,19 +2,19 @@
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
pkgname=lightspark
-pkgver=0.4.8.1
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
pkgdesc='An alternative Flash Player for Linux.'
arch=('i686' 'x86_64' 'mips64el')
url='http://lightspark.sourceforge.net'
license=('LGPL3')
conflicts=('lightspark-git')
depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig')
+makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
optdepends=('gnash-gtk: fallback support')
install="lightspark.install"
source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz")
-md5sums=('296b859ea2b5c126e899e609014f2786')
+md5sums=('7d42c8e92c3c3b318076393a7e9508fb')
build() {
rm -rf build
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 56849ac0b..d66a9f285 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 51540 2011-07-11 09:57:46Z spupykin $
+# $Id: PKGBUILD 53180 2011-07-31 18:44:33Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
pkgname=lilypond
-pkgver=2.14.1
-pkgrel=2
+pkgver=2.14.2
+pkgrel=1
pkgdesc="An automated music engraving system"
arch=('i686' 'x86_64' 'mips64el')
url="http://lilypond.org"
@@ -18,7 +18,7 @@ options=('emptydirs')
source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
http://arch.p5n.pp.ru/~sergej/dl/lilypond-fonts.tar.bz2
texlive-workaround.patch)
-md5sums=('262cc7f92c907a7b479b55b3b37a9302'
+md5sums=('4053a19e03181021893981280feb9aaa'
'2a0e18e5de17d740ada3861bf4d787ea'
'ff32863f3eed67ac744e50bc4fc67a87')
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 886d1c97b..c2e105479 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=luakit
pkgver=2011.07.22
-pkgrel=1
+pkgrel=2
pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release'
arch=('i686' 'x86_64')
url='http://www.luakit.org/projects/luakit'
@@ -13,8 +13,8 @@ makedepends=('git' 'help2man')
options=(!makeflags)
conflicts=('luakit-git' 'luakit-develop-git')
install='luakit.install'
-source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}")
-md5sums=('f682275aa7ebc54beed187481dc4a1bc')
+source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
+md5sums=('4937deb6bc81416e2deb037f4a5763e4')
build() {
cd mason-larobina-luakit-*
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index 736b9a80c..078026fd5 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50748 2011-06-30 10:59:10Z icelaya $
+# $Id: PKGBUILD 52563 2011-07-26 05:00:59Z svenstaro $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Initial contributor: flixie <69one@gmx.net>
# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -7,7 +7,7 @@ pkgver=0.8
_pkgver=45d3e13eb94c
_luxblend=9cb3fcee0be8
_blender=2.58
-pkgrel=6
+pkgrel=7
pkgdesc="Rendering system for physically correct, unbiased image synthesis"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.luxrender.net/"
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index a423621e0..ae5234e74 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,23 +1,27 @@
-#$Id: PKGBUILD 29697 2010-10-18 15:11:39Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+#$Id: PKGBUILD 52925 2011-07-29 21:34:54Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxappearance
-pkgver=0.5.0
+pkgver=0.5.1
pkgrel=1
pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
-depends=('gtk2' 'intltool')
+depends=('gtk3' 'intltool')
makedepends=('pkgconfig')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7eabab6f4a358dbc6a84e260a0e7f6c2')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --sysconfdir=/etc --prefix=/usr
+ ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
+md5sums=('34d157a7fe97ef0b93db8fab3f251e07')
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 1663cf998..2dac261bd 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# $Id: PKGBUILD 52900 2011-07-29 19:07:23Z angvp $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: kiefer <jorgelmadrid@gmail.com>
pkgname=lxdm
-pkgver=0.3.0
+pkgver=0.4.1
pkgrel=1
pkgdesc="Lightweight Display Manager (part of LXDE)"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ install=${pkgname}.install
backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc')
source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz"
Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon)
-md5sums=('1d0688e088edab7c3c563263eb2f9654'
+md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
'9bdf95adb74d81d4b6b6176fb1142090'
'baed9055e8825a5511712bc095197519'
'b20fe3c8487a039050986d60e45233a9'
@@ -45,5 +45,6 @@ package() {
# touch ${pkgdir}/var/lib/lxdm/lxdm.conf
# fix the greeter location
- sed -i -e "s/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf
+ # on 0.4.1 this sed have to changed since they changed the default path
+ sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf
}
diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 45ff79d1f..c8bac639a 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 12709 2010-03-12 12:03:21Z angvp $
+#$Id: PKGBUILD 52832 2011-07-28 23:39:16Z angvp $
# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxlauncher
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
pkgdesc="Launcher for Asus EeePC (part of LXDE)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
@@ -11,27 +11,17 @@ url="http://lxde.org/"
groups=('lxde')
depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool')
makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
- lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
- lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
- lxlauncher-0.2.1-dsofix.patch
- intltool.patch)
-md5sums=('5dbe6076eb1a411278e1fc2bccf2d75d'
- '3a4355047d4cfb149ef6a0fa6001b990'
- 'ab568453c9bac6848ca6c8cdcf61b371'
- 'fa7fd2a1691c6bad86a5278770b38db1'
- 'bd04ebee868915da9d64ec9becc1212d')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('16df627447838b170a72cc3a9ee21497')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # Adding patches thanks to CWickert and AndyRTR
- patch -Np1 -i $srcdir/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch || return 1
- patch -Np1 -i $srcdir/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch || return 1
- patch -Np1 -i $srcdir/lxlauncher-0.2.1-dsofix.patch || return 1
- #patch -Np1 -i $srcdir/01_fix_infinite_loop.dpatch || return 1
- patch -Np1 -i $srcdir/intltool.patch || return 1
- autoreconf || return 1
- ./configure --sysconfdir=/etc --prefix=/usr || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ autoreconf
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD
index 3efe37218..6087648d9 100644
--- a/community/lxmenu-data/PKGBUILD
+++ b/community/lxmenu-data/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# $Id: PKGBUILD 52895 2011-07-29 18:44:33Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=lxmenu-data
-pkgver=0.1.1
+pkgver=0.1.2
pkgrel=1
pkgdesc="freedesktop.org desktop menus for LXDE"
arch=('i686' 'x86_64')
@@ -11,7 +11,8 @@ license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz")
-md5sums=('cee3181dd22088f3db0e99ffbedc986d')
+makedepends=('intltool')
+md5sums=('2184ab3746d572477f1bea7e98e230a8')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
deleted file mode 100644
index e3da3d897..000000000
--- a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001
-From: Marty Jack <martyj@linux.local>
-Date: Thu, 22 Jul 2010 19:46:13 -0400
-Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293)
-
----
- src/plugins/batt/batt.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c
-index 288231f..05c0deb 100644
---- a/src/plugins/batt/batt.c
-+++ b/src/plugins/batt/batt.c
-@@ -95,7 +95,7 @@ typedef struct {
- typedef struct {
- char *command;
- sem_t *lock;
--} alarm;
-+} Alarm;
-
- static void destructor(Plugin *p);
- static void update_display(lx_battery *lx_b, gboolean repaint);
-@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint);
- /* alarmProcess takes the address of a dynamically allocated alarm struct (which
- it must free). It ensures that alarm commands do not run concurrently. */
- static void * alarmProcess(void *arg) {
-- alarm *a = (alarm *) arg;
-+ Alarm *a = (Alarm *) arg;
-
- sem_wait(a->lock);
- system(a->command);
-@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
- /* Run the alarm command if it isn't already running */
- if (alarmCanRun) {
-
-- alarm *a = (alarm *) malloc(sizeof(alarm));
-+ Alarm *a = (Alarm *) malloc(sizeof(Alarm));
- a->command = lx_b->alarmCommand;
- a->lock = &(lx_b->alarmProcessLock);
-
---
-1.7.1.1
-
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index 21fbb05ab..2d4d83d47 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $
+# $Id: PKGBUILD 53158 2011-07-31 08:25:21Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=lxpanel
-pkgver=0.5.6
+pkgver=0.5.8
pkgrel=1
pkgdesc="Panel of the LXDE Desktop"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,12 @@ license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
- Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch)
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
optdepends=(pcmanfm)
-md5sums=('3c6b5498b5f4109c3913b10a66809fe6'
- 'afe03191cbeccfc702f9a04bffd62dbf')
+md5sums=('129fae75d1cd3983fd94542c573a70a1')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i $srcdir/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
./configure --sysconfdir=/etc --prefix=/usr
make
}
diff --git a/community/lxrandr/PKGBUILD b/community/lxrandr/PKGBUILD
index 22a23bbe5..c427394b5 100644
--- a/community/lxrandr/PKGBUILD
+++ b/community/lxrandr/PKGBUILD
@@ -1,6 +1,9 @@
+# $Id: PKGBUILD 52615 2011-07-26 12:18:23Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
pkgname=lxrandr
-pkgver=0.1.1
+pkgver=0.1.2
pkgrel=1
pkgdesc="Monitor configuration tool (part of LXDE)"
arch=('i686' 'x86_64' 'mips64el')
@@ -8,13 +11,13 @@ license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
depends=('gtk2' 'xorg-server-utils')
-makedepends=('pkgconfig')
+makedepends=('pkgconfig' 'intltool')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ab2c7f6be7e4fe6d1a26e324d836453e')
+md5sums=('8a7391581541bba58839ac11dbf5b575')
build() {
cd "$srcdir/$pkgname-$pkgver"
- [ $NOEXTRACT -eq 1 ] || ./configure --sysconfdir=/etc --prefix=/usr || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ [ -f Makefile ] || ./configure --sysconfdir=/etc --prefix=/usr
+ make
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index 204e2fec3..36b6bb4c4 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -1,14 +1,15 @@
+# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxtask
pkgver=0.1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Task manager of the LXDE Desktop"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
-depends=('gtk2')
+depends=('gtk3')
makedepends=('pkgconfig' 'intltool')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
@@ -16,7 +17,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
build() {
cd "$srcdir/$pkgname-$pkgver"
autoreconf
- ./configure --sysconfdir=/etc --prefix=/usr
+ ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
make
}
package() {
diff --git a/community/lxterminal/PKGBUILD b/community/lxterminal/PKGBUILD
index 09f3c3e68..8c76a79ca 100644
--- a/community/lxterminal/PKGBUILD
+++ b/community/lxterminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 25770 2010-09-11 01:42:59Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 52827 2011-07-28 23:21:06Z angvp $
+# # Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxterminal
-pkgver=0.1.9
+pkgver=0.1.11
pkgrel=1
pkgdesc="VTE-based terminal emulator (part of LXDE)"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,16 @@ groups=('lxde')
depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2')
makedepends=('pkgconfig' 'intltool')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('fd9140b45c0f28d021253c4aeb8c4aea')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --sysconfdir=/etc --prefix=/usr || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
-md5sums=('cb10cc667611dce3c141294712049c43')
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 0de6cc82b..1ac199155 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48662 2011-06-03 19:43:21Z stephane $
+# $Id: PKGBUILD 52462 2011-07-25 20:12:25Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
pkgname=mapnik
pkgver=0.7.1
-pkgrel=10
+pkgrel=11
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
arch=('i686' 'x86_64' 'mips64el')
url="http://mapnik.org/"
diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD
index 1fcb65631..e0ef8b0d8 100644
--- a/community/mc/PKGBUILD
+++ b/community/mc/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 46971 2011-05-13 20:45:35Z andrea $
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 52675 2011-07-27 13:42:43Z schuay $
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: schuay <jakob.gruber@gmail.com>
pkgname=mc
-pkgver=4.7.5.2
+pkgver=4.7.5.3
pkgrel=1
pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
arch=('i686' 'x86_64')
@@ -10,14 +11,27 @@ url="http://www.ibiblio.org/mc/"
license=('GPL')
depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
makedepends=('libxt' 'libx11')
-optdepends=('p7zip: support for 7zip archives')
+optdepends=('p7zip: support for 7zip archives'
+ 'mtools: a+ extfs'
+ 'cdparanoia: audio extfs'
+ 'gawk: hp48+ extfs'
+ 'cdrkit: iso9660 extfs'
+ 'perl: needed by several extfs scripts'
+ 'python-boto: s3+ extfs'
+ 'python2-pytz: s3+ extfs'
+ 'p7zip: u7z extfs'
+ 'unace: uace extfs'
+ 'unarj: uarj extfs'
+ 'cabextract: ucab extfs'
+ 'unrar: urar extfs'
+ 'zip: uzip extfs')
provides=('mcedit-pkgbuild-syntax')
conflicts=('mc-utf8')
replaces=('mc-utf8')
options=('!emptydirs' '!makeflags')
source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdae966244496cd4f6d282d80c9cf3c6')
-sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a')
+md5sums=('6a67e139e0032d8a871455a80d490941')
+sha1sums=('1f24ee96048e370419bf017f49b76ea3341bc545')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index c6d22e9f2..7d06ea77e 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=mongodb
pkgver=1.8.2
-pkgrel=5
+pkgrel=6
pkgdesc='A high-performance, open source, schema-free document-oriented database.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.mongodb.org'
diff --git a/community/mongodb/mongodb.install b/community/mongodb/mongodb.install
index 8808eea0d..3922c12ef 100755
--- a/community/mongodb/mongodb.install
+++ b/community/mongodb/mongodb.install
@@ -16,12 +16,15 @@ post_upgrade() {
chown -R mongodb:daemon /var/lib/mongodb
chown -R mongodb:daemon /var/log/mongodb
- # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
- # added july 5th, 2011
- usermod -s /bin/bash mongodb >& /dev/null
- echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
- echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
- echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
+ if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
+ then
+ # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
+ # added july 5th, 2011
+ usermod -s /bin/bash mongodb >& /dev/null
+ echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
+ echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
+ echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
+ fi
}
pre_remove() {
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
index 9ddf68717..182670fbd 100644
--- a/community/mpdscribble/PKGBUILD
+++ b/community/mpdscribble/PKGBUILD
@@ -3,21 +3,21 @@
# Contributor: Luiz Ribeiro <luizribeiro@gmail.com>
pkgname=mpdscribble
-pkgver=0.21
-pkgrel=4
+pkgver=0.22
+pkgrel=2
pkgdesc='An mpd client which submits track info to last.fm'
url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libsoup' 'glib2' 'libmpdclient')
-install="${pkgname}.install"
+install='mpdscribble.install'
source=("http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2"
'mpdscribble')
-md5sums=('3dc96f9179b8d7efd02cbbceb345e529'
+md5sums=('652ee927b797e9a4cef45494e77047db'
'f54c937c7b3ab8e4d39e4b903c2993fc')
build() {
- cd ${pkgname}-${pkgver}
+ cd mpdscribble-${pkgver}
./configure \
--prefix=/usr \
@@ -28,7 +28,7 @@ build() {
}
package() {
- cd ${pkgname}-${pkgver}
+ cd mpdscribble-${pkgver}
make DESTDIR=${pkgdir} install
@@ -36,8 +36,8 @@ package() {
${pkgdir}/etc/rc.d/mpdscribble
# default config is really an example
- install -m644 ${pkgdir}/etc/mpdscribble.conf \
- ${pkgdir}/etc/mpdscribble.conf.example
+ install -D -m644 ${pkgdir}/etc/mpdscribble.conf \
+ ${pkgdir}/usr/share/mpdscribble/mpdscribble.conf.example
rm -f ${pkgdir}/etc/mpdscribble.conf
install -d ${pkgdir}/var/cache/mpdscribble
diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install
index 3447b50d6..e7038d5d8 100644
--- a/community/mpdscribble/mpdscribble.install
+++ b/community/mpdscribble/mpdscribble.install
@@ -1,13 +1,18 @@
post_install() {
- echo 'An example config is provided in /etc/mpdscribble.conf.example'
+ echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example'
echo
echo 'For system-wide config copy this file to /etc/mpdscribble.conf'
echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf'
}
+## arg 1: the new package version
+## arg 2: the old package version
pre_upgrade() {
# removed /etc/mpdscribble.conf on FEB 19 2011
- if [ -f /etc/mpdscribble.conf ]; then
+ # only display warning for people with mpdscribble older then 0.21
+ if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]]
+ then
+ echo "$1 is new $2 is old"
cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup
echo 'The package does not provide /etc/mpdscribble.conf anymore.'
echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup'
diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD
index af8e3c7de..f95a54c2b 100644
--- a/community/musescore/PKGBUILD
+++ b/community/musescore/PKGBUILD
@@ -3,19 +3,19 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
pkgname=musescore
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc="A music score editor written in Qt4"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.musescore.org/en/"
license=('GPL')
-depends=('qt>=4.5.0' 'openssl' 'libsndfile' 'qtscriptgenerator')
-makedepends=('cmake' 'doxygen')
-optdepends=('portaudio' 'jack-audio-connection-kit')
-conflicts=('musescore-svn' 'mscore')
-source=(http://downloads.sourceforge.net/project/mscore/mscore/MuseScore-${pkgver}/MuseScore-${pkgver}.tar.bz2 'paths.patch')
-md5sums=('475c7c5abdaa80318b207884475de9ac'
+depends=('qt>=4.5.0' 'libsndfile')
+makedepends=('cmake' 'doxygen' 'qtscriptgenerator')
+optdepends=('portaudio' 'jack')
+source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch')
+md5sums=('68b43af92093a16f7f074c0eb560a867'
'e5011154d217f633f21b4bb70e589510')
+install=musescore.install
build() {
cd $srcdir/mscore-${pkgver}
@@ -24,14 +24,13 @@ build() {
patch -p1 < $srcdir/paths.patch
sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \
"$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt
- make PREFIX=/usr release
+ sed -i 's+BUILD_SCRIPTGEN TRUE+BUILD_SCRIPTGEN FALSE+' \
+ "$srcdir"/mscore-$pkgver/mscore/CMakeLists.txt
+ sed -i 's+static_cast<const+static_cast<+' \
+ $srcdir/mscore-$pkgver/mscore/mscore/exportxml.cpp
+ make PREFIX=/usr release
}
package() {
cd $srcdir/mscore-${pkgver}
make DESTDIR="$pkgdir" install
- # avoid file conflict with "qtscriptgenerator"
- for _i in gui network core uitools xml
- do
- rm $pkgdir/usr/lib/qt/plugins/script/libqtscript_${_i}.so
- done
}
diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install
new file mode 100644
index 000000000..6d2e3727f
--- /dev/null
+++ b/community/musescore/musescore.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
index 92635b069..743bf5a4e 100644
--- a/community/nestopia/PKGBUILD
+++ b/community/nestopia/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 35191 2010-12-17 15:10:28Z spupykin $
+# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
# Contributor: robb_force <robb_force@holybuffalo.net>
pkgname=nestopia
pkgver=1.40h
-pkgrel=3
+pkgrel=4
pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
url='http://rbelmont.mameworld.info/?page_id=200'
license=('GPL')
@@ -26,10 +26,8 @@ md5sums=('526c99a06d2b257135e7047b0ed95ae0'
build() {
cd ${srcdir}
-
# remove a bogus error message on exit
patch -p0 < nestopia_bogus_error_on_save_settings.patch
-
make -j1
# Install the nestopia script that copies required files to ~/.nestopia
@@ -39,9 +37,8 @@ build() {
cd ${pkgdir}/usr/bin
ln -s ${pkgname} ${pkgname}.sh
- cd ${srcdir}
-
# Install the required files and executable in /usr/share
+ cd ${srcdir}
install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin
install -dm775 ${pkgdir}/usr/share/${pkgname}/
install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index b40371270..b7536eb8b 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,30 +1,26 @@
+# $Id: PKGBUILD 52915 2011-07-29 20:04:25Z ebelanger $
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Georgij Kondratjev <smpuj@bk.ru>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=netsurf
-pkgver=2.6
+pkgver=2.7
pkgrel=1
pkgdesc="Lightweight, fast web browser"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.netsurf-browser.org/"
license=('GPL')
-depends=('libmng' 'librsvg' 'curl' 'libglade' 'lcms' 'libjpeg>=7'
- 'libwapcaplet' 'libcss')
-makedepends=('re2c' 'libnsbmp' 'libnsgif' 'hubbub')
+depends=('libmng' 'librsvg' 'curl' 'libglade' 'libcss' 'libnsgif' 'libnsbmp' 'hubbub')
+makedepends=('lcms')
source=("http://www.netsurf-browser.org/downloads/releases/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('8653789d2ede6dbbfe79882afc7538fc')
+md5sums=('52939f2e2319269d7d758ec665f6cb8e')
build() {
- cd ${srcdir}/${pkgname}
-
- sed -i 's#GtkNotebookPage#GtkWidget#' gtk/gtk_tabs.c
- sed -i 's#GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->layout), GTK_CAN_FOCUS);#gtk_widget_set_can_focus(GTK_WIDGET(g->layout), true);#' \
- gtk/gtk_window.c
+ cd "${srcdir}/${pkgname}"
+ make PREFIX=/usr TARGET=gtk
}
package() {
- cd ${srcdir}/${pkgname}
-
- make install DESTDIR=${pkgdir} PREFIX=/usr NETSURF_USE_HARU_PDF=NO
+ cd "${srcdir}/${pkgname}"
+ make install PREFIX=/usr DESTDIR="${pkgdir}"
}
diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD
index 39fa1917e..b4ba27669 100644
--- a/community/ogre/PKGBUILD
+++ b/community/ogre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $
+# $Id: PKGBUILD 52770 2011-07-28 04:02:26Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgbase=ogre
pkgname=('ogre' 'ogre-docs')
pkgver=1.7.3
-pkgrel=2
+pkgrel=4
pkgdesc="A scene-oriented, flexible 3D engine written in C++"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ogre3d.org'
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index 01aab85d1..7a48e767d 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $
+# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=performous
pkgver=0.6.1
-pkgrel=6
+pkgrel=7
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64')
url="http://performous.org/"
license=('GPL')
-depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \
+depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \
'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.46')
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47')
optdepends=('performous-freesongs: free songs for performous')
source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2)
md5sums=('451a759de77984b5a699e91107fe52e2')
diff --git a/community/perl-list-moreutils/PKGBUILD b/community/perl-list-moreutils/PKGBUILD
index a23aa1c88..ba06ecb98 100644
--- a/community/perl-list-moreutils/PKGBUILD
+++ b/community/perl-list-moreutils/PKGBUILD
@@ -2,26 +2,31 @@
pkgname=perl-list-moreutils
_cpanname=List-MoreUtils
-pkgver=0.22
-pkgrel=6
+pkgver=0.32
+pkgrel=1
pkgdesc="Provide the stuff missing in List::Util"
arch=('i686' 'x86_64' 'mips64el')
-url="http://search.cpan.org/dist/List-MoreUtils"
+url="http://search.cpan.org/dist/$_cpanname"
license=('GPL' 'PerlArtistic')
depends=('perl')
options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/V/VP/VPARSEVAL/${_cpanname}-$pkgver.tar.gz)
-md5sums=('3a6ec506f40662ab1296c48c5eb72016')
+source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz")
+md5sums=('5af56334f8261f4662bd5e2b3f5e4e62')
build() {
- cd $srcdir/${_cpanname}-$pkgver
+ cd "$srcdir/${_cpanname}-$pkgver"
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
}
+check() {
+ cd "$srcdir/${_cpanname}-$pkgver"
+ make test
+}
+
package() {
- cd $srcdir/${_cpanname}-$pkgver
- make install DESTDIR=$pkgdir
- find $pkgdir -name '.packlist' -delete
- find $pkgdir -name '*.pod' -delete
+ cd "$srcdir/${_cpanname}-$pkgver"
+ make install DESTDIR="$pkgdir"
+ find "$pkgdir" -name '.packlist' -o -name '*.pod' -delete
}
+
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 9f47399bd..655d032f0 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 51943 2011-07-18 12:42:54Z bisson $
+# $Id: PKGBUILD 53236 2011-08-02 00:40:12Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: sysrq
pkgname=picard
-pkgver=0.15
+pkgver=0.15.1
pkgrel=1
pkgdesc='Official MusicBrainz tagger'
url='http://musicbrainz.org/doc/MusicBrainz_Picard'
@@ -12,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg')
optdepends=('libdiscid: CD-Lookup feature')
source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0e8d8afa6f9e493d494a3e9c746834e0')
+md5sums=('21b51e229c246e2d17b746649bfa370f')
install=install
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 751711d03..36e16a77a 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $
+# $Id: PKGBUILD 52474 2011-07-25 20:35:38Z jelle $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=pingus
pkgver=0.7.3
-pkgrel=4
+pkgrel=5
pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
arch=('i686' 'x86_64' 'mips64el')
url="http://pingus.seul.org"
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index cc4df5fca..6020707ed 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $
+# $Id: PKGBUILD 52482 2011-07-25 20:51:19Z jelle $
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
pkgname=pokerth
_realname=PokerTH
pkgver=0.8.3
-pkgrel=4
+pkgrel=5
pkgdesc="Poker game written in C++/QT4"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.pokerth.net/"
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 7ecc827e8..07bc8e0ff 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=qbittorrent
pkgver=2.8.2
-pkgrel=1
+pkgrel=2
pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.qbittorrent.org/"
diff --git a/community/qc-usb-messenger/PKGBUILD b/community/qc-usb-messenger/PKGBUILD
deleted file mode 100644
index 6563e93e3..000000000
--- a/community/qc-usb-messenger/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 38937 2011-02-03 15:23:52Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Luiz Ribeiro <luizribeiro@gmail.com>
-
-pkgname=qc-usb-messenger
-pkgver=1.8
-pkgrel=14
-pkgdesc="QuickCam Messenger & Communicate driver for Linux"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://home.mag.cx/messenger/"
-license=('GPL')
-depends=("kernel26")
-conflicts=('qc-usb')
-install=$pkgname.install
-source=(http://home.mag.cx/messenger/source/$pkgname-$pkgver.tar.gz
- qc-usb-messenger-kernel-2.6.33.patch
- qc-usb-messenger-kernel-2.6.36.patch
- qc-usb-messenger-kernel-2.6.37.patch)
-md5sums=('58dc5652a0c91e6cc2adc682ca848964'
- 'aa4bb3f2262622d16c3827a4f23400d9'
- 'ac2bec633194ac3f06aa683d6ff5668e'
- '56a9f78ad1448fa870fa9ca3521fd2a7')
-
-build() {
- _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -`
- depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`")
-
- cd $srcdir/$pkgname-$pkgver
- patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.33.patch
- patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.36.patch
- patch -p1 < $srcdir/qc-usb-messenger-kernel-2.6.37.patch
- make all
- _kernelver=`uname -r`
- make install PREFIX=$pkgdir/usr MODULE_DIR=$pkgdir/lib/modules/${_kernelver} LINUX_DIR=/lib/modules/${_kernelver}/build
-}
diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch
deleted file mode 100644
index b4f6f9833..000000000
--- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.33.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-Only in qc-usb-messenger-1.8.my: input_read
-Only in qc-usb-messenger-1.8.my: modules.order
-Only in qc-usb-messenger-1.8.my: Module.symvers
-diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c
---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000
-+++ qc-usb-messenger-1.8.my/qc-driver.c 2010-04-12 15:59:23.000000000 +0000
-@@ -49,10 +49,8 @@
- #include <linux/quickcam.h>
- #endif
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) || (HAVE_UTSRELEASE_H == 1)
--#include <linux/utsrelease.h>
--#endif
--#include <linux/autoconf.h>
-+#include <generated/utsrelease.h>
-+#include <generated/autoconf.h>
- #include <linux/module.h>
-
- #include "qc-memory.h"
-@@ -1124,7 +1122,6 @@
- PRINTK(KERN_WARNING,"Could not register procfs file entry");
- return -ENXIO;
- }
-- entry->owner = THIS_MODULE;
- entry->data = qc;
- entry->read_proc = qc_proc_read;
- entry->write_proc = qc_proc_write;
-@@ -1137,7 +1134,6 @@
- PRINTK(KERN_WARNING,"Could not register procfs file entry");
- return -ENXIO;
- }
-- entry->owner = THIS_MODULE;
- entry->data = qc;
- entry->read_proc = qc_proc_button_read;
- entry->write_proc = qc_proc_write;
-@@ -1179,13 +1175,11 @@
- PRINTK(KERN_WARNING,"Could not register procfs dir entry");
- return -ENXIO;
- }
-- qc_proc_video_entry->owner = THIS_MODULE;
- qc_proc_quickcam_entry = create_proc_entry(qc_proc_quickcam_name, S_IFDIR, qc_proc_video_entry);
- if (!qc_proc_quickcam_entry) {
- PRINTK(KERN_WARNING,"Could not register procfs dir entry");
- return -ENXIO;
- }
-- qc_proc_quickcam_entry->owner = THIS_MODULE;
- return 0;
- }
- /* }}} */
-@@ -2622,7 +2616,11 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- struct qc_frame_data *fd = &qc->frame_data;
- int mask;
-
-@@ -2674,7 +2672,11 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-- struct quickcam *qc = dev->priv;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
-+ struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- int r;
-
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc);
-@@ -2739,7 +2741,11 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc);
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -2788,7 +2794,11 @@
- struct video_device *dev = video_devdata(file);
- int noblock = file->f_flags & O_NONBLOCK;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- int frame_len;
- unsigned char *frame;
- long r = 0;
-@@ -2845,7 +2855,11 @@
- const void *start = (void *)vma->vm_start;
- unsigned long size = vma->vm_end - vma->vm_start;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- unsigned char *frame;
- int ret = 0, frame_size;
- #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0)
-@@ -2877,7 +2891,11 @@
- struct video_device *dev = video_devdata(file);
- void *argp = (void *)arg;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- int i, retval = 0;
-
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc);
-@@ -2895,7 +2913,7 @@
- if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
- memset(&b, 0, sizeof(b));
- strcpy(b.name, "Logitech QuickCam USB"); /* Max 31 characters */
-- b.type = qc->vdev.type;
-+ b.type = qc->vdev.vfl_type;
- b.channels = 1;
- b.audios = 0;
- b.maxwidth = qc->sensor_data.maxwidth;
-@@ -3484,7 +3502,7 @@
-
- static struct video_device qc_v4l_template = {
- name: "QuickCam USB",
-- type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
-+ vfl_type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- hardware: VID_HARDWARE_QCAM_USB,
- #endif
-@@ -3662,7 +3680,7 @@
- #endif
- /* Register input device for button */
- qc->input_ptr->name = "Quickcam snapshot button";
-- qc->input_ptr->private = qc;
-+ input_set_drvdata(qc->input_ptr, qc);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
- qc->input_ptr->evbit[0] = BIT_MASK(EV_KEY);
- qc->input_ptr->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
-@@ -3736,7 +3754,12 @@
-
- /* Register V4L video device */
- memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ video_set_drvdata(&qc->vdev, qc);
-+#else
- qc->vdev.priv = qc;
-+#endif
-
- mb();
- r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr);
-Only in qc-usb-messenger-1.8.my: qc-driver.c.rej
-Only in qc-usb-messenger-1.8.my: qc-driver.o
-Only in qc-usb-messenger-1.8.my: .qc-driver.o.cmd
-Only in qc-usb-messenger-1.8.my: qc-formats.o
-Only in qc-usb-messenger-1.8.my: .qc-formats.o.cmd
-diff -wbBur qc-usb-messenger-1.8/qc-memory.c qc-usb-messenger-1.8.my/qc-memory.c
---- qc-usb-messenger-1.8/qc-memory.c 2006-11-05 06:36:51.000000000 +0000
-+++ qc-usb-messenger-1.8.my/qc-memory.c 2010-04-12 15:58:26.000000000 +0000
-@@ -27,7 +27,7 @@
- */
- /* }}} */
- /* {{{ [fold] Includes */
--#include <linux/autoconf.h>
-+#include <generated/autoconf.h>
- #include <linux/version.h>
-
- #ifdef CONFIG_SMP
-@@ -81,12 +81,14 @@
- #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */
- #endif /* Fix by Michele Balistreri <brain87@gmx.net> */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- #ifndef SetPageReserved
- #define SetPageReserved(p) mem_map_reserve(p)
- #endif
- #ifndef ClearPageReserved
- #define ClearPageReserved(p) mem_map_unreserve(p)
- #endif
-+#endif
- /* }}} */
-
- /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address obtained by vmalloc() */
-Only in qc-usb-messenger-1.8.my: qc-memory.c.rej
-Only in qc-usb-messenger-1.8.my: qc-memory.o
-Only in qc-usb-messenger-1.8.my: .qc-memory.o.cmd
-Only in qc-usb-messenger-1.8.my: qcmessenger.ko
-Only in qc-usb-messenger-1.8.my: .qcmessenger.ko.cmd
-Only in qc-usb-messenger-1.8.my: qcmessenger.mod.c
-Only in qc-usb-messenger-1.8.my: qcmessenger.mod.o
-Only in qc-usb-messenger-1.8.my: .qcmessenger.mod.o.cmd
-Only in qc-usb-messenger-1.8.my: qcmessenger.o
-Only in qc-usb-messenger-1.8.my: .qcmessenger.o.cmd
-Only in qc-usb-messenger-1.8.my: qcset
-Only in qc-usb-messenger-1.8.my: qc-vv6450.o
-Only in qc-usb-messenger-1.8.my: .qc-vv6450.o.cmd
-diff -wbBur qc-usb-messenger-1.8/quickcam.h qc-usb-messenger-1.8.my/quickcam.h
---- qc-usb-messenger-1.8/quickcam.h 2008-05-27 06:53:17.000000000 +0000
-+++ qc-usb-messenger-1.8.my/quickcam.h 2010-04-12 15:58:33.000000000 +0000
-@@ -92,7 +92,7 @@
-
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
--#include <linux/autoconf.h>
-+#include <generated/autoconf.h>
- #else
- #include <linux/config.h>
- #endif
-@@ -242,7 +242,7 @@
- #if LINUX_VERSION_CODE<KERNEL_VERSION(2,4,20) || LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,0)
- /* Things come and go... */
- /* Used only for debugging, so this could be actually removed if needed */
--#define sem_getcount(sem) atomic_read(&(sem)->count)
-+#define sem_getcount(sem) 0
- #endif
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-Only in qc-usb-messenger-1.8.my: quickcam.h.rej
-diff -wbBur qc-usb-messenger-1.8/quickcam.sh qc-usb-messenger-1.8.my/quickcam.sh
---- qc-usb-messenger-1.8/quickcam.sh 2008-05-27 06:53:16.000000000 +0000
-+++ qc-usb-messenger-1.8.my/quickcam.sh 2010-04-12 15:58:18.000000000 +0000
-@@ -374,7 +374,7 @@
- echo "[!] Can not find version.h in kernel source."
- KERNELOK="n"
- fi
--if [ ! -r "$KERNEL_SOURCE/include/linux/autoconf.h" ]; then
-+if [ ! -r "$KERNEL_SOURCE/include/generated/autoconf.h" ]; then
- echo "[!] Kernel source is not configured properly."
- KERNELOK="n"
- fi
-@@ -414,7 +414,7 @@
- echo "[!] Can still not find version.h in kernel source."
- KERNELOK="n"
- fi
-- if [ ! -r "$KERNEL_SOURCE/include/linux/autoconf.h" ]; then
-+ if [ ! -r "$KERNEL_SOURCE/include/generated/autoconf.h" ]; then
- echo "[!] Kernel source is still not configured properly."
- KERNELOK="n"
- fi
-Only in qc-usb-messenger-1.8.my: .tmp_versions
diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch
deleted file mode 100644
index 426bf95a7..000000000
--- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.36.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c
---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000
-+++ qc-usb-messenger-1.8.my/qc-driver.c 2010-12-16 14:08:06.000000000 +0000
-@@ -3476,7 +3494,7 @@
- release: qc_v4l_close,
- read: qc_v4l_read,
- // write: qc_v4l_write,
-- ioctl: qc_v4l_ioctl,
-+ compat_ioctl: qc_v4l_ioctl,
- mmap: qc_v4l_mmap,
- poll: qc_v4l_poll,
- };
diff --git a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch b/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch
deleted file mode 100644
index 234f21e53..000000000
--- a/community/qc-usb-messenger/qc-usb-messenger-kernel-2.6.37.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -wbBur qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8.my/qc-driver.c
---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 11:29:16.000000000 +0000
-+++ qc-usb-messenger-1.8.my/qc-driver.c 2011-02-03 15:21:38.000000000 +0000
-@@ -225,7 +223,7 @@
- };
-
- static LIST_HEAD(quickcam_list); /* Linked list containing all QuickCams */
--static DECLARE_MUTEX(quickcam_list_lock); /* Always lock first quickcam_list_lock, then qc->lock */
-+static struct semaphore quickcam_list_lock; /* Always lock first quickcam_list_lock, then qc->lock */
-
- /* Default values for user-specified lookup-table; may be overwritten by user */
- static unsigned char userlut_contents[QC_LUT_SIZE] = {
-@@ -3588,7 +3606,7 @@
- PDEBUG("poisoning qc in qc_usb_init");
- POISON(*qc);
- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("init down(%p) in qc_usb_init()", qc);
-- init_MUTEX_LOCKED(&qc->lock);
-+ sema_init(&qc->lock, 1);
- qc->users = 0;
- qc->dev = usbdev;
- qc->iface = ifacenum;
diff --git a/community/qc-usb-messenger/qc-usb-messenger.install b/community/qc-usb-messenger/qc-usb-messenger.install
deleted file mode 100644
index 3f6611aea..000000000
--- a/community/qc-usb-messenger/qc-usb-messenger.install
+++ /dev/null
@@ -1,35 +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() {
- /sbin/depmod -a
-}
-
-# 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() {
- /sbin/depmod -a
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- /sbin/depmod -a
-}
-
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 5396ea5d9..a191bf2f6 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 48203 2011-05-29 20:38:19Z schiv $
+# $Id: PKGBUILD 52272 2011-07-22 23:53:54Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Philipp Überbacher <hollunder at gmx dot at>
pkgname=qtractor
-pkgver=0.4.9
+pkgver=0.5.0
pkgrel=1
pkgdesc="Audio/MIDI multitrack sequencer"
arch=('i686' 'x86_64' 'mips64el')
url="http://qtractor.sourceforge.net/"
license=('GPL')
-depends=('qt' 'jack' 'slv2' 'libmad' 'liblo'
+depends=('qt' 'jack' 'slv2>=0.6.6-6' 'libmad' 'liblo'
'libsamplerate' 'rubberband')
+ # slv2 versioned for https://bugs.archlinux.org/task/25060
makedepends=('ladspa' 'dssi')
[ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('0d7d8c8783dd29f3cd4ceee16ff38333')
+md5sums=('6dcc05532f71eaaa1aa0f336bcd265b0')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index e89ad91c5..55dbf6837 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $
+# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
# Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
# Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
# Contributor: Archie <mymaud@gmail.com>
pkgname=rawtherapee
-pkgver=3.1m6
+pkgver=3.1.1
pkgrel=1
pkgdesc="RAW photo editor"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.rawtherapee.com/"
license=('GPL')
-depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
+depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
makedepends=('mercurial' 'cmake')
install=rawtherapee.install
-source=(rawtherapee.desktop rawtherapee.png)
-md5sums=('83f14b57b27f066705b0aec7ad56c53d'
- '4e54e74684971a2f04d9396b9051570e')
+source=()
+md5sums=()
_root="https://rawtherapee.googlecode.com/hg/"
_repo="rawtherapee"
-#_branch="branch_3.0"
-#_changeset="71045bfba97e" # changeset $pkgver
build() {
cd "$srcdir"
@@ -30,10 +27,10 @@ build() {
if [ -d $_repo ] ; then
cd $_repo
hg pull
- hg up "Dev-$pkgver"
+ hg up "$pkgver"
msg "The local files are updated."
else
- hg clone -u "Dev-$pkgver" $_root $_repo
+ hg clone -u "$pkgver" $_root $_repo
fi
msg "Mercurial checkout done or server timeout"
@@ -54,11 +51,4 @@ build() {
package() {
cd "$srcdir/$_repo-build"
make DESTDIR="$pkgdir/" install
-
- # remove unneded rtstart script
- # see http://code.google.com/p/rawtherapee/issues/detail?id=184
- rm "$pkgdir"/usr/bin/rtstart
-
- install -D -m644 "$srcdir"/rawtherapee.desktop "$pkgdir"/usr/share/applications/rawtherapee.desktop
- install -D -m644 "$srcdir"/rawtherapee.png "$pkgdir"/usr/share/pixmaps/rawtherapee.png
}
diff --git a/community/rawtherapee/rawtherapee.desktop b/community/rawtherapee/rawtherapee.desktop
deleted file mode 100644
index 3395712a8..000000000
--- a/community/rawtherapee/rawtherapee.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RawTherapee
-GenericName=RAW image editor
-Exec=rt
-Icon=rawtherapee
-Terminal=false
-Categories=Graphics;
-StartupNotify=true
-MimeType=image/jpeg;image/jpg;image/tiff;image/png;image/x-canon-cr2;image/x-canon-crw;image/x-nikon-nef;image/x-fuji-raf;image/x-pentax-pef;image/x-adobe-dng;image/x-sony-arw;image/x-sony-sr2;image/x-minolta-mrw;image/x-panasonic-raw;image/x-olympus-orf;image/x-kodak-kdc;
diff --git a/community/rawtherapee/rawtherapee.install b/community/rawtherapee/rawtherapee.install
index 6162b34dd..385eec8f4 100644
--- a/community/rawtherapee/rawtherapee.install
+++ b/community/rawtherapee/rawtherapee.install
@@ -2,6 +2,7 @@ post_install() {
echo "update desktop mime database..."
update-desktop-database -q
update-mime-database usr/share/mime 1>&2 > /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
diff --git a/community/rawtherapee/rawtherapee.png b/community/rawtherapee/rawtherapee.png
deleted file mode 100644
index 694f4e5da..000000000
--- a/community/rawtherapee/rawtherapee.png
+++ /dev/null
Binary files differ
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 1804ebda9..28b8dc0ca 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 51093 2011-07-05 08:47:52Z spupykin $
+# $Id: PKGBUILD 52620 2011-07-26 12:19:20Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=rsyslog
-pkgver=5.8.2
+pkgver=5.8.3
pkgrel=1
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
'rsyslog'
'rsyslog.logrotate'
'rsyslog.conf.d')
-md5sums=('fd7822622e974cc263bbd54768d5621c'
+md5sums=('b505c1558814335c000f15b59c4db562'
'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
'8065db4bef3061a4f000ba58779f6829'
'1a0cd4530dd5d1439456d5ae230574d9')
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index e9bb21b92..aa0f750bb 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51984 2011-07-18 20:42:27Z rvanharen $
+# $Id: PKGBUILD 53190 2011-07-31 20:35:40Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Dmitry N. Shilov <stormblast@land.ru>
pkgname=sakura
-pkgver=2.4.1
+pkgver=2.4.2
pkgrel=1
pkgdesc="A terminal emulator based on GTK and VTE"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('vte' 'libxft' 'desktop-file-utils')
makedepends=('cmake')
source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
install=sakura.install
-sha1sums=('43858ba79574b4e9413aefd19131dc21c9c1f575')
+sha1sums=('24b98c42c057da39f57c281a4726901952774641')
build() {
cd $srcdir/${pkgname}-${pkgver}
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 3601e266b..6cdf2cc9f 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $
+# $Id: PKGBUILD 52459 2011-07-25 20:06:11Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=schroot
-pkgver=1.4.22
+pkgver=1.4.23
pkgrel=1
pkgdesc="Allows users to execute shell commands under different root filesystems. \
(Successor to dchroot)."
@@ -24,7 +24,7 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.
'script-arch32'
'copyfiles-arch32'
'mount-arch32')
-md5sums=('0dde4c76b1623cc277d92f8dc06109d1'
+md5sums=('73873e0fee83a45655ed8efa246a1e26'
'8e86445e188129232e1782d978dfc967'
'd4558d5691fbdaa46ce669e8f327133b'
'f0d5d5b5e34a860f6f90b5628c680f46')
@@ -45,6 +45,12 @@ build() {
make
}
+check() {
+ cd ${pkgname}-${pkgver}
+
+ make -k check
+}
+
package() {
cd ${pkgname}-${pkgver}
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 346c4a828..c183908ef 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51998 2011-07-19 14:00:57Z svenstaro $
+# $Id: PKGBUILD 52817 2011-07-28 21:00:43Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Ondrej Martinak <omartinak@gmail.com>
@@ -7,7 +7,7 @@ pkgname=sfml
_git=true
if [[ "${_git}" = "true" ]]; then
- pkgver=1.99.git20110719
+ pkgver=1.99.git20110728
fi
pkgrel=1
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index 74b9e3bfc..a78f04172 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $
+# $Id: PKGBUILD 52531 2011-07-26 04:15:24Z svenstaro $
# Maintainer:
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Kritoke <typeolinux@yahoo.com>
pkgname=smc
pkgver=1.9
-pkgrel=11
+pkgrel=12
pkgdesc="Secret Maryo Chronicles"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.secretmaryo.org/"
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 36a14a209..f4c1b9bd5 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $
+# $Id: PKGBUILD 52636 2011-07-26 15:57:38Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=spring
pkgver=0.82.7.1
-pkgrel=4
+pkgrel=6
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64' 'mips64el')
url="http://springrts.com/"
license=('GPL')
depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment')
-optdepends=('python: python-based bots'
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
+optdepends=('python2: python-based bots'
'java-runtime: java-based bots')
source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
- gcc46.patch)
+ gcc46.patch
+ awk-java.patch)
md5sums=('378cf0b18a5dd5b840964e5945778503'
- 'e9586b611db1ed04fe4f0c5982fda7d2')
+ 'e9586b611db1ed04fe4f0c5982fda7d2'
+ 'cd94edf21e49ff6ff7d256442ed9aa3c')
build() {
bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
@@ -27,6 +29,7 @@ build() {
sed -i '1i\
#include <list>' rts/lib/lobby/Connection.h
patch -Np1 < $srcdir/gcc46.patch
+ patch -Np1 < $srcdir/awk-java.patch
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DDATADIR=share/spring
diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch
new file mode 100644
index 000000000..36c932924
--- /dev/null
+++ b/community/spring/awk-java.patch
@@ -0,0 +1,48 @@
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200
+@@ -341,7 +341,7 @@
+ }
+
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+
+ isInsideCmdStruct = 1;
+ ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200
+@@ -473,7 +473,7 @@
+ }
+
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+
+ isInsideEvtStruct = 1;
+ ind_evtMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200
+@@ -387,7 +387,7 @@
+ }
+
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+
+ isInsideCmdStruct = 1;
+ ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200
+@@ -366,7 +366,7 @@
+ }
+
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+
+ isInsideEvtStruct = 1;
+ ind_evtMember = 0;
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index 795c2ad35..c1107bc53 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52092 2011-07-20 05:49:04Z svenstaro $
+# $Id: PKGBUILD 53068 2011-07-30 16:48:24Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: DuGi <dugi@irc.pl>
pkgname=springlobby
-pkgver=0.134
+pkgver=0.135
pkgrel=1
pkgdesc="A free cross-platform lobby client for the Spring RTS project."
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake')
source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2
springlobby.desktop
springlobby.png)
-md5sums=('0ca0519bc118eb41b4a3fec83e4419ba'
+md5sums=('6d02bc0d91a112591460ac86e6a9baaa'
'45f8b59d033931d02e734fe3bd7777dd'
'1f388187539aeb0358b51995e26ed890')
@@ -27,7 +27,7 @@ build() {
sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk
sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
- sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp
+ #sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DOPTION_SOUND=false
diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD
index 151487e90..3908c9d5d 100644
--- a/community/sword/PKGBUILD
+++ b/community/sword/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 49750 2011-06-20 22:08:06Z andrea $
+# $Id: PKGBUILD 52657 2011-07-26 22:56:39Z shusmann $
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: TripleE <eric1548@yahoo.com>
pkgname=sword
pkgver=1.6.2
-pkgrel=4
-pkgdesc="SWORD libraries for Bible programs"
+pkgrel=5
+pkgdesc="Libraries for Bible programs"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.crosswire.org/sword/index.jsp"
license=('GPL')
-depends=('curl' 'icu' 'clucene' 'swig')
+depends=('curl' 'clucene' 'swig')
makedepends=('cmake')
backup=('etc/sword.conf')
-source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a7dc4456e20e915fec46d774b690e305')
+source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz" curl.patch)
+md5sums=('a7dc4456e20e915fec46d774b690e305'
+ 'e84a226ce3697af33b9fdd9a22884a2a')
build() {
- cd "${srcdir}"
- mkdir build
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -p1 < $srcdir/curl.patch
+ cd $srcdir
+ [[ -d build ]] || mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/sword/curl.patch b/community/sword/curl.patch
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/community/sword/curl.patch
@@ -0,0 +1,22 @@
+diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <swlog.h>
+diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
+--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200
++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <cctype>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <swlog.h>
diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD
index 51c11eaf4..c6871ac03 100644
--- a/community/tagpy/PKGBUILD
+++ b/community/tagpy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $
+# $Id: PKGBUILD 52446 2011-07-25 19:31:48Z jelle $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
# Contributor: Scott Horowitz <stonecrest@gmail.com>
pkgname=tagpy
pkgver=0.94.8
-pkgrel=4
+pkgrel=5
pkgdesc="Python bindings for TagLib"
arch=('i686' 'x86_64' 'mips64el')
url="http://pypi.python.org/pypi/tagpy"
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index eff0bbfca..4c9f80ea9 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -5,7 +5,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=teeworlds
-pkgver=0.6.0
+pkgver=0.6.1
_bamver=0.4.0
pkgrel=1
pkgdesc="A multiplayer 2D shooter"
@@ -15,14 +15,14 @@ license=('custom')
depends=('alsa-lib' 'mesa' 'sdl' 'freetype2')
makedepends=('python2')
replaces=('teewars')
-source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-src.tar.gz
+source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
https://github.com/downloads/matricks/bam/bam-${_bamver}.tar.bz2
teeworlds.desktop
teeworlds.png)
-md5sums=('4d6e5d0fb1b5f0bdf6c5c49714045ef1'
+md5sums=('00de7195ecd1f23596dc3237341af512'
'f8b62ad553c3615a725a034df4fb4257'
'3944aaf7a8c19a83510b2b39c4cddf5f'
- '44f39e398409232a0e0a431ed46d8cc8')
+ '44f39e398409232a0e0a431ed46d8cc8')
build() {
# Build bam (used to build teeworlds)
@@ -31,7 +31,7 @@ build() {
./make_unix.sh
# Build teeworlds
- cd ${srcdir}/${pkgname}-${pkgver}-source
+ cd ${srcdir}/${pkgname}-*-source
# Use Python 2
sed -i 's/python /python2 /' bam.lua
@@ -40,7 +40,7 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}-source
+ cd ${srcdir}/${pkgname}-*-source
# Install data files
mkdir -p ${pkgdir}/usr/share/${pkgname}/data
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 3e52ce2c1..5ceb84d20 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44985 2011-04-13 23:48:59Z schiv $
+# $Id: PKGBUILD 52662 2011-07-27 08:16:49Z andrea $
# Maintainer: Ray Rashif <schiv@archlinux.org
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
@@ -6,31 +6,32 @@
pkgname=tellico
pkgver=2.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A collection manager for KDE"
arch=('i686' 'x86_64' 'mips64el')
url="http://tellico-project.org/"
license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'kdegraphics-libs' 'taglib'
+depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib'
'kdemultimedia-kioslave' 'poppler-qt' 'qjson')
-makedepends=('automoc4' 'cmake' 'docbook-xsl')
+makedepends=('automoc4' 'cmake')
install=$pkgname.install
source=("http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2")
md5sums=('7e3da69119324995308fca7ddf8ea6a9')
build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
# fix python 2.7 path
find "$pkgdir" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index 3479de368..02b0597a1 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51608 2011-07-12 08:24:26Z spupykin $
+# $Id: PKGBUILD 52920 2011-07-29 21:10:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=tracker
-pkgver=0.10.19
-pkgrel=2
+pkgver=0.10.21
+pkgrel=1
pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnome.org/projects/tracker/"
@@ -26,7 +26,7 @@ conflicts=('libtracker')
provides=("libtracker")
install=tracker.install
source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2)
-md5sums=('59f105fbe7248749aee7ae8d9432b6a9')
+md5sums=('200e15db4e2ae9acbd439947219c0d7f')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD
index 3bbc94879..0032df664 100644
--- a/community/twinkle/PKGBUILD
+++ b/community/twinkle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $
+# $Id: PKGBUILD 52444 2011-07-25 19:31:08Z jelle $
# Maintainer:
# Contributor: Jeff Mickey <jeff@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=twinkle
pkgver=1.4.2
-pkgrel=10
+pkgrel=11
pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.twinklephone.com/"
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 509ff2db3..fc76e3b59 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $
+# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
pkgname=vhba-module
-pkgver=20100822
+pkgver=20110416
_kernver='2.6.39-ARCH'
-pkgrel=5
+pkgrel=1
pkgdesc="Kernel module that emulates SCSI devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
license=('GPL2')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
-makedepends=('kernel26-headers>=2.6.39' 'git')
+makedepends=('kernel26-headers>=2.6.39')
install=vhba-module.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz
- vhba-kernel2.6.37.patch)
-md5sums=('1d2f06ae33c5d15b7c29e467e4658aa2'
- 'f0499fc54f6ef9b8d6ca0b9e940c5906')
+source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
+md5sums=('2f91dd4ee8648da92d625221d4275b60')
build() {
cd "$srcdir/$pkgname-$pkgver"
- git apply -p2 ../vhba-kernel2.6.37.patch
- make -j1 KDIR=/usr/src/linux-${_kernver} || return 1
- install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" || return 1
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install"
+ make -j1 KDIR=/usr/src/linux-${_kernver}
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko"
+ sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install"
}
diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install
index c3bcbca3f..edb9e8d2b 100644
--- a/community/vhba-module/vhba-module.install
+++ b/community/vhba-module/vhba-module.install
@@ -1,7 +1,7 @@
post_install() {
echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot."
echo ">> This module needs to be recompiled for every kernel version upgrade."
- KERNEL_VERSION='2.6.37-ARCH'
+ KERNEL_VERSION='2.6.39-ARCH'
depmod $KERNEL_VERSION > /dev/null 2>&1
}
@@ -10,7 +10,7 @@ post_upgrade() {
}
post_remove() {
- KERNEL_VERSION='2.6.37-ARCH'
+ KERNEL_VERSION='2.6.39-ARCH'
depmod $KERNEL_VERSION > /dev/null 2>&1
}
diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk
index d0e939ad4..e5cbcebcd 100644
--- a/community/virtualbox/LocalConfig.kmk
+++ b/community/virtualbox/LocalConfig.kmk
@@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_WITH_VNC := 1
VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /opt/java
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
VBOX_GCC_WERR =
VBOX_GCC_WARN =
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index ddfe5ac4d..5091d201e 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 52263 2011-07-22 18:30:40Z ibiru $
+# $Id: PKGBUILD 53171 2011-07-31 11:38:59Z ibiru $
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox
pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
pkgver=4.1.0
-pkgrel=2
+pkgrel=2.1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
- change_default_driver_dir.patch)
+ change_default_driver_dir.patch
+ fix-kernel-panic.patch)
_kernver=2.6.39-LIBRE
build() {
@@ -25,6 +26,7 @@ build() {
patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+ patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
cp "$srcdir/LocalConfig.kmk" .
@@ -200,6 +202,7 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'4cf75d9c091199a47a7a1bc2f4e347d9'
- 'c1a07f044c476a190af8486fe78bee0f'
- '838c4c4ebe11b34ae2168df5cd06f694'
- '97e193f050574dd272a38e5ee5ebe62b')
+ '78ffa67ff131680f1d2b6f06d4325c5b'
+ 'b3de603560b2fb2c33e704e4e8ab3de8'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '19b05b85a8a46af5a429b2ab618638cd')
diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch
new file mode 100644
index 000000000..237715db2
--- /dev/null
+++ b/community/virtualbox/fix-kernel-panic.patch
@@ -0,0 +1,22 @@
+Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+===================================================================
+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
+@@ -32,6 +32,7 @@
+ #include "internal/iprt.h"
+
+ #include <iprt/mp.h>
++#include <iprt/asm-amd64-x86.h>
+ #include <iprt/err.h>
+ #include <iprt/cpuset.h>
+ #include <iprt/thread.h>
+@@ -82,7 +83,8 @@
+ NOREF(pvUser1);
+
+ AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
++ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
++ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
+
+ switch (ulNativeEvent)
+ { \ No newline at end of file
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
index 5eb7ecb89..845f6c769 100755
--- a/community/virtualbox/vboxdrv.sh
+++ b/community/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
case "$1" in
setup)
stat_busy "Unloading VirtualBox kernel modules"
- for module in vbox{netflt,netadp,drv}; do
+ for module in vbox{netflt,netadp,drv,pci}; do
if grep -q "^${module}" /proc/modules; then
MODLIST+=($module)
modprobe -r $module
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 67b2c4613..cbb8cf506 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 40291 2011-02-22 18:19:32Z spupykin $
+# $Id: PKGBUILD 52795 2011-07-28 14:05:17Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jonathan Wiersma <archaur at jonw dot org>
pkgname=virtviewer
-pkgver=0.3.1
+pkgver=0.4.0
pkgrel=1
pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
+makedepends=('intltool')
url="http://virt-manager.et.redhat.com"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('f7416e4d6b3e04e2d4bdfabe9ef442b2')
+md5sums=('392a32a650dd07bed2c858faa85208ba')
build() {
cd $srcdir/virt-viewer-$pkgver
diff --git a/community/vuze/PKGBUILD b/community/vuze/PKGBUILD
deleted file mode 100644
index 9443cd719..000000000
--- a/community/vuze/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=vuze
-pkgver=4.6.0.2
-pkgrel=2
-pkgdesc='BitTorrent client with GUI, written in Java.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.vuze.com/'
-license=('GPL')
-depends=('java-runtime')
-optdepends=('xulrunner: needed for browsing the vuze content')
-source=("http://downloads.sourceforge.net/project/azureus/vuze/Vuze_${pkgver//./}/Vuze_${pkgver//./}_linux.tar.bz2"
- 'vuze.desktop')
-md5sums=('af80c418f0bcc718941762485c916914'
- '345ad45b972009dcd672c4eaf52fb336')
-[[ $CARCH == 'x86_64' ]] && source[0]="http://downloads.sourceforge.net/project/azureus/vuze/Vuze_${pkgver//./}/Vuze_${pkgver//./}_linux-x86_64.tar.bz2" && md5sums[0]='22a9c2077cb686fbc00b09dc281fe5a1'
-
-package() {
- install -d ${pkgdir}/usr/share
- cp -r vuze ${pkgdir}/usr/share
-
- install -Dm755 vuze/vuze ${pkgdir}/usr/bin/vuze
- sed -i 's%#PROGRAM_DIR="/home/username/apps/azureus"%PROGRAM_DIR="/usr/share/vuze"%' ${pkgdir}/usr/bin/vuze
-
- install -Dm644 vuze/vuze.png ${pkgdir}/usr/share/pixmaps/vuze.png
- install -Dm644 vuze.desktop ${pkgdir}/usr/share/applications/vuze.desktop
-}
diff --git a/community/vuze/vuze.desktop b/community/vuze/vuze.desktop
deleted file mode 100644
index fd31db05f..000000000
--- a/community/vuze/vuze.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Vuze
-GenericName=BitTorrent Client
-Comment=Transfer files via Peer to Peer
-Exec=vuze %F
-Icon=vuze
-Terminal=false
-Type=Application
-MimeType=application/x-bittorrent;
-Categories=Network;FileTransfer;P2P;GTK;
-StartupNotify=true
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index a97a41844..d0024d3f5 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51980 2011-07-18 20:26:38Z spupykin $
+# $Id: PKGBUILD 52510 2011-07-25 22:14:25Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Denis Martinez <deuns.martinez@gmail.com>
pkgname=wt
pkgver=3.1.10
-pkgrel=2
+pkgrel=3
pkgdesc="a C++ library and application server for developing and deploying web applications"
arch=('i686' 'x86_64')
url="http://www.webtoolkit.eu/"
@@ -23,15 +23,19 @@ optdepends=('openssl: for SSL support in built-in webserver'
'mysql++: for the hangman example'
'qt: for the Wt/Qt interopability example (wtwithqt)')
backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
-md5sums=('535945f48f479e74b893adf5b1a857b7')
+source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz
+ wt-boost-1.47.patch)
+md5sums=('535945f48f479e74b893adf5b1a857b7'
+ '9374ca2e0af1e951d585872ffface805')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- mkdir build
+ patch -Rp1 <$srcdir/wt-boost-1.47.patch
+ mkdir -p build
cd build
cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
-DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
+ -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
make
}
diff --git a/community/wt/wt-boost-1.47.patch b/community/wt/wt-boost-1.47.patch
new file mode 100644
index 000000000..919e1371f
--- /dev/null
+++ b/community/wt/wt-boost-1.47.patch
@@ -0,0 +1,11 @@
+diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt
+--- wt-3.1.10.q/src/CMakeLists.txt 2011-07-26 00:58:19.000000000 +0400
++++ wt-3.1.10/src/CMakeLists.txt 2011-06-24 18:51:54.000000000 +0400
+@@ -236,6 +236,7 @@
+ web/TimeUtil.C
+ web/XSSFilter.C
+ web/XSSUtils.C
++web/random_device.cpp
+ web/base64.cpp
+ Plain_html.C
+ Boot_html.C
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index d3a799376..1a98e7f65 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45265 2011-04-18 22:19:06Z lfleischer $
+# $Id: PKGBUILD 53200 2011-07-31 23:46:37Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: sputnick <gilles DOT quenot AT gmail DOT com>
pkgname=xwax
-pkgver=0.9
+pkgver=1.0
pkgrel=1
pkgdesc='Open-source vinyl emulation software for Linux.'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import'
'mpg123: for MP3 import'
'ffmpeg: for video fallback import')
source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('37152a16cbeb6878818ca406959af9b2')
+md5sums=('cb07866ac8d4f9e2e12518a6ebd1d6e7')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index a0cf4bb3c..8fdef96e2 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105861 2011-01-13 15:23:08Z stephane $
+# $Id: PKGBUILD 132155 2011-07-21 15:03:34Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=dash
-pkgver=0.5.6.1
-pkgrel=2
+pkgver=0.5.7
+pkgrel=1
pkgdesc="A POSIX compliant shell that aims to be as small as possible"
arch=('i686' 'x86_64' 'mips64el')
url="http://gondor.apana.org.au/~herbert/dash/"
@@ -11,7 +11,7 @@ license=('BSD')
groups=('base')
depends=('glibc')
source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1c846f4f5a33c0050b2045a6f7037e56')
+sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
index b5f8014d8..b43230449 100644
--- a/core/heirloom-mailx/PKGBUILD
+++ b/core/heirloom-mailx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 113975 2011-03-11 00:21:09Z stephane $
+# $Id: PKGBUILD 132725 2011-07-25 13:08:32Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=heirloom-mailx
pkgver=12.5
-pkgrel=1
+pkgrel=2
pkgdesc="A commandline utility for sending and receiving email"
arch=('i686' 'x86_64' 'mips64el')
url="http://heirloom.sourceforge.net/mailx.html"
license=('custom')
groups=('base')
-depends=('openssl')
+depends=('openssl' 'krb5')
optdepends=('smtp-forwarder: for sending mail')
replaces=('mailx' 'mailx-heirloom')
provides=('mailx' 'mailx-heirloom')
@@ -29,8 +29,8 @@ mksource() {
_dirname=${pkgname}-${pkgver}
mv $D ${_dirname}
- tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${dirname}
- rm -r ${_dirname}
+ tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
+ rm -rf ${_dirname}
}
build() {
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 57f866273..de5f4cbe3 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,53 +1,67 @@
-# $Id: PKGBUILD 131995 2011-07-18 20:27:00Z ronald $
+# $Id: PKGBUILD 133073 2011-07-27 15:33:16Z dan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.11.1
-pkgrel=1
+pkgver=1.4.12
+pkgrel=2
pkgdesc="A Linux kernel packet control tool"
arch=('i686' 'x86_64' 'mips64el')
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)
+ iptables.conf.d
+ empty-filter.rules
+ empty-mangle.rules
+ empty-nat.rules
+ empty-raw.rules
+ empty-security.rules)
backup=(etc/conf.d/iptables)
-sha1sums=('2aa0d215485133f2817973b0914a132f628d9f3a'
- 'd7540316581bb66c5594885882a14ba394e95098'
- '70d70113e3a23f0fe99404c5536507a887a4ca5c'
+sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3'
+ '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
+ '2db68906b603e5268736f48c8e251f3a49da1d75'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
'9907f9e815592837abc7fa3264a401567b7606ab'
- '1c52444ffbecc09f56bb325db49e924dd32f9213')
+ 'cdb830137192bbe002c6d01058656bd053ed0ddd'
+ 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
+ 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
+ '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
+ '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
+ 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
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
- ./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
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
+ --with-xtlibdir=/usr/lib/iptables \
+ --enable-devel --enable-libipq
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
- make DESTDIR=${pkgdir} install
+ 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/
}
diff --git a/testing/iptables/empty-filter.rules b/core/iptables/empty-filter.rules
index 5a4de4876..5a4de4876 100644
--- a/testing/iptables/empty-filter.rules
+++ b/core/iptables/empty-filter.rules
diff --git a/testing/iptables/empty-mangle.rules b/core/iptables/empty-mangle.rules
index 49d493c4d..49d493c4d 100644
--- a/testing/iptables/empty-mangle.rules
+++ b/core/iptables/empty-mangle.rules
diff --git a/testing/iptables/empty-nat.rules b/core/iptables/empty-nat.rules
index 437e96411..437e96411 100644
--- a/testing/iptables/empty-nat.rules
+++ b/core/iptables/empty-nat.rules
diff --git a/testing/iptables/empty-raw.rules b/core/iptables/empty-raw.rules
index 8dc50d23e..8dc50d23e 100644
--- a/testing/iptables/empty-raw.rules
+++ b/core/iptables/empty-raw.rules
diff --git a/testing/iptables/empty.rules b/core/iptables/empty-security.rules
index e24e1aa30..4531fa13f 100644
--- a/testing/iptables/empty.rules
+++ b/core/iptables/empty-security.rules
@@ -1,5 +1,5 @@
-# Empty iptables rule file
-*filter
+# Empty iptables security table rules file
+*security
:INPUT ACCEPT [0:0]
:FORWARD ACCEPT [0:0]
:OUTPUT ACCEPT [0:0]
diff --git a/core/iptables/ip6tables b/core/iptables/ip6tables
index 1733db281..2d119e3ed 100755
--- a/core/iptables/ip6tables
+++ b/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/core/iptables/iptables b/core/iptables/iptables
index 50c13d5c1..fbb02face 100755
--- a/core/iptables/iptables
+++ b/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/core/iptables/iptables.conf.d b/core/iptables/iptables.conf.d
index 07bc11aa1..1c6cc7b5d 100644
--- a/core/iptables/iptables.conf.d
+++ b/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/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index f8300bf83..8e81b2b03 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $
+# $Id: PKGBUILD 133509 2011-07-28 19:16:56Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=krb5
pkgver=1.9.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64' 'mips64el')
url="http://web.mit.edu/kerberos/"
@@ -16,16 +16,28 @@ conflicts=('heimdal')
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
krb5-kadmind
- krb5-kdc)
+ krb5-kdc
+ krb5-1.9.1-config-script.patch)
sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
'2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
- '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+ '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
+ '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
options=('!emptydirs')
build() {
tar zxvf ${pkgname}-${pkgver}.tar.gz
cd "${srcdir}/${pkgname}-${pkgver}/src"
+ # - Make krb5-config suppress CFLAGS output when called with --libs
+ # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
+ # http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
+ #
+ # - Omit extra libraries because their interfaces are not exposed to applications
+ # by libkrb5, unless do_deps is set to 1, which indicates that the caller
+ # wants the whole list.
+ # cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+ patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
+
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
export CPPFLAGS+=" -I/usr/include/et"
./configure --prefix=/usr \
diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch
new file mode 100644
index 000000000..96ee6b001
--- /dev/null
+++ b/core/krb5/krb5-1.9.1-config-script.patch
@@ -0,0 +1,25 @@
+diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
+--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500
++++ krb5-1.9.1/src/krb5-config.in 2011-07-28 14:32:00.546990621 -0400
+@@ -186,7 +186,7 @@
+ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++ -e 's#\$(CFLAGS)##'`
+
+ if test $library = 'kdb'; then
+ lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
+@@ -214,7 +214,11 @@
+ fi
+
+ if test $library = 'krb5'; then
+- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ if test 0$do_deps -eq 1 ; then
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ else
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
++ fi
+ fi
+
+ echo $lib_flags
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index e6c2ff4f1..13c0027b4 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 112952 2011-03-07 23:45:40Z bisson $
+# $Id: PKGBUILD 132376 2011-07-23 23:23:53Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Roman Cheplyaka <roma@ro-che.info>
pkgname=libedit
-pkgver=20110227_3.0
+pkgver=20110709_3.0
pkgrel=1
pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.thrysoee.dk/editline/'
license=('BSD')
depends=('ncurses')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('afe84b9e16fc903d5a3eceda90013d7ad03db794')
options=('!libtool')
+source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
+sha1sums=('63a62e0c52a0a2b3c933f400039e24724498cfb4')
build() {
- cd "${srcdir}/$pkgname-${pkgver/_/-}"
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
./configure --prefix=/usr --enable-widec --enable-static=no
make
}
package() {
- cd "${srcdir}/$pkgname-${pkgver/_/-}"
- make prefix="$pkgdir"/usr install
+ 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 -D -m0644 COPYING "$pkgdir"/usr/share/licenses/libedit/LICENSE
+ cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
+ install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
}
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 636e9a3ac..24d8d5ffe 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132145 2011-07-21 04:31:17Z eric $
+# $Id: PKGBUILD 132558 2011-07-24 23:50:57Z eric $
# Maintainer:
pkgbase=openldap
pkgname=('libldap' 'openldap')
pkgver=2.4.26
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.openldap.org/"
license=('custom')
@@ -12,7 +12,7 @@ makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
slapd slapd.default ntlm.patch)
md5sums=('f36f3086031dd56ae94f722ffae8df5e'
- '7ea596cc1d6cbcfe1deea29ec66ab317'
+ '40fdbdd6c343019cbadf4eb26c6189f2'
'6be69f6b7e522cb64cce8703da81ed32'
'4258ddbef923d1f29f2843bc050f8c56')
@@ -78,24 +78,18 @@ package_openldap() {
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
- install -dm700 "${pkgdir}"/var/lib/openldap
- chown -R 439:439 "${pkgdir}"/var/lib/openldap
-
- install -dm755 "${pkgdir}"/run/openldap
- chown 439:439 "${pkgdir}"/run/openldap
-
chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
- install -dm700 "${pkgdir}"/etc/openldap/slapd.d
- chown 439:439 "${pkgdir}"/etc/openldap/slapd.d
-
+ 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 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/core/openldap/slapd b/core/openldap/slapd
index 5156b4d61..4f212da66 100755
--- a/core/openldap/slapd
+++ b/core/openldap/slapd
@@ -9,6 +9,7 @@ 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
diff --git a/core/procps/PKGBUILD b/core/procps/PKGBUILD
index 15758341b..99d7884a7 100644
--- a/core/procps/PKGBUILD
+++ b/core/procps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102904 2010-12-12 23:53:18Z eric $
+# $Id: PKGBUILD 132740 2011-07-25 18:18:22Z foutrelis $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=procps
pkgver=3.2.8
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for monitoring your system and processes on your system"
arch=('i686' 'x86_64' 'mips64el')
url="http://procps.sourceforge.net/"
@@ -11,36 +11,47 @@ license=('GPL' 'LGPL')
groups=('base')
depends=('ncurses')
backup=('etc/sysctl.conf')
-source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf\
- groff-top-manpage.patch procps-3.2.7-free-hlmem.patch\
- procps-3.2.7-longcmd.patch procps-3.2.7-ps-man-fmt.patch\
- procps-3.2.7-psman.patch procps-3.2.7-slabtop-once.patch\
- procps-3.2.7-top-clrscr.patch procps-3.2.7-top-cpu0.patch\
- procps-3.2.7-top-env-cpuloop.patch procps-3.2.7-top-manpage.patch\
- procps-3.2.7-top-remcpu.patch procps-3.2.7-top-sorthigh.patch\
- procps-3.2.7-watch-unicode.patch procps-3.2.7-w-best.patch\
- procps-3.2.8+gmake-3.82.patch procps-3.2.8-setlocale.patch\
- procps-3.2.8-threads.patch procps-3.2.8-linux-ver-init.patch)
-md5sums=('9532714b6846013ca9898984ba4cd7e0' '9be3a131a7068aae11418e6dd99e2221'\
- '111f33c3fd8fab2fed36c279065fefff' '81ac7fb50fcdb03e57055c7b763bb275'\
- 'cb020bfd46689908b56bf3fc5a55828a' '8d74603be1e426037a1e2c2743ef7345'\
- 'bfb7530e248b86f1abf32bca09f28b68' '9a8c81aee89531b4a72f4e4e44fb055d'\
- '511023a3f39a90aa6efcf77120d32eb6' 'f29ef0b3a74767469651c9c335f09403'\
- 'd49673c19fa1a70f8e03fc1c24233458' '669955ca7fa7688e1c3ae7e723e0a567'\
- 'f77626450619b4bebbd67b9e164f1857' 'c71b853144b4d22b861e435362845091'\
- '105fbbf179e63b7ca960a2dd2e5fab5b' '7f2540d2d4a2a1a6af70e9a980835753'\
- '8d1025ae906bf0320ad9bb5095f1b970' '2e6cce598f11d75becebbe58dbe9cbd4'\
- 'e2e5393d49034435c68469d008d56489' '6f46c8ea37c447a2d478883e89bf4d25')
-sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' '9b9a314010d042b5aa487893c06f361531525e6a'\
- 'bdd627f602ed2e38994d49309de0edbd90b41aff' 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'\
- '1a656d8094be41e019b2a9598b07c8a3d47f9de3' 'ba9ad9f0bde3e84484b5a0238e53534438e924be'\
- '9944224ed2f5bd7d7fb505127bd71d6f01d88373' '954026785a9e6c90d796e93563fcea2a693691e8'\
- '8582cd15346fa939f3fd01081620de0ffc617335' '80e31310da53baf095e905d94485324932e433df'\
- '15fe886a2b4bed5885e6d457954e1145d1dcd2a2' '16737700b22eec8f4e8d16bce099f4b1662501e2'\
- 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6' '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'\
- '52068a433535ec3d5d974141be3d6d3b6a41725a' '3a8f1ba912112d7520becb28746e97b11d9b0c86'\
- '3a4908ed8dbc936e39cb9094af8098ef9e656581' '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'\
- '926b92913201f21c45d48436c0902cffc059ce27' '171d5352940200c209e0c2d43c17f01c02173a66')
+source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf
+ groff-top-manpage.patch
+ procps-3.2.7-top-manpage.patch
+ procps-3.2.7-free-hlmem.patch
+ procps-3.2.7-ps-man-fmt.patch
+ procps-3.2.7-longcmd.patch
+ procps-3.2.7-psman.patch
+ procps-3.2.7-slabtop-once.patch
+ procps-3.2.7-top-clrscr.patch
+ procps-3.2.7-top-cpu0.patch
+ procps-3.2.7-top-env-cpuloop.patch
+ procps-3.2.7-top-remcpu.patch
+ procps-3.2.7-top-sorthigh.patch
+ procps-3.2.7-watch-unicode.patch
+ procps-3.2.7-w-best.patch
+ procps-3.2.8-gmake-3.82.patch
+ procps-3.2.8-setlocale.patch
+ procps-3.2.8-threads.patch
+ procps-3.2.8-linux-ver-init.patch
+ procps-3.2.8-kernel3-uts.patch)
+sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829'
+ '9b9a314010d042b5aa487893c06f361531525e6a'
+ 'bdd627f602ed2e38994d49309de0edbd90b41aff'
+ '16737700b22eec8f4e8d16bce099f4b1662501e2'
+ 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'
+ 'ba9ad9f0bde3e84484b5a0238e53534438e924be'
+ '1a656d8094be41e019b2a9598b07c8a3d47f9de3'
+ '9944224ed2f5bd7d7fb505127bd71d6f01d88373'
+ '954026785a9e6c90d796e93563fcea2a693691e8'
+ '8582cd15346fa939f3fd01081620de0ffc617335'
+ '80e31310da53baf095e905d94485324932e433df'
+ '15fe886a2b4bed5885e6d457954e1145d1dcd2a2'
+ 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6'
+ '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'
+ '52068a433535ec3d5d974141be3d6d3b6a41725a'
+ '3a8f1ba912112d7520becb28746e97b11d9b0c86'
+ '3a4908ed8dbc936e39cb9094af8098ef9e656581'
+ '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'
+ '926b92913201f21c45d48436c0902cffc059ce27'
+ '171d5352940200c209e0c2d43c17f01c02173a66'
+ 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,12 +69,13 @@ build() {
patch -p1 < ../procps-3.2.7-top-sorthigh.patch
patch -p1 < ../procps-3.2.7-watch-unicode.patch
patch -p1 < ../procps-3.2.7-w-best.patch
- patch -p1 < ../procps-3.2.8+gmake-3.82.patch
+ patch -p1 < ../procps-3.2.8-gmake-3.82.patch
patch -p1 < ../procps-3.2.8-setlocale.patch
patch -p1 < ../procps-3.2.8-threads.patch
patch -p0 < ../procps-3.2.8-linux-ver-init.patch
+ patch -p1 < ../procps-3.2.8-kernel3-uts.patch
sed -i "s:\$(lib64):lib:" Makefile
- make
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
}
package() {
diff --git a/core/procps/procps-3.2.8+gmake-3.82.patch b/core/procps/procps-3.2.8-gmake-3.82.patch
index 87ab13ea4..87ab13ea4 100644
--- a/core/procps/procps-3.2.8+gmake-3.82.patch
+++ b/core/procps/procps-3.2.8-gmake-3.82.patch
diff --git a/core/procps/procps-3.2.8-kernel3-uts.patch b/core/procps/procps-3.2.8-kernel3-uts.patch
new file mode 100644
index 000000000..a72ae59e3
--- /dev/null
+++ b/core/procps/procps-3.2.8-kernel3-uts.patch
@@ -0,0 +1,20 @@
+diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c
+--- procps-3.2.8-20110302git.orig/proc/version.c 2011-06-10 17:00:33.000000000 +0200
++++ procps-3.2.8-20110302git/proc/version.c 2011-06-10 17:20:17.000000000 +0200
+@@ -38,10 +38,15 @@
+ void init_Linux_version(void) {
+ static struct utsname uts;
+ int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
++ int version_string_depth;
+
+ if (uname(&uts) == -1) /* failure implies impending death */
+ exit(1);
+- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3)
++
++ version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++
++ if ((version_string_depth < 2) || /* Non-standard for all known kernels */
++ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
+ fprintf(stderr, /* *very* unlikely to happen by accident */
+ "Non-standard uts for running kernel:\n"
+ "release %s=%d.%d.%d gives version code %d\n",
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index aff2a41ba..473a7cef4 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $
+# $Id: PKGBUILD 132788 2011-07-26 07:38:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=akonadi
-pkgver=1.5.3
+pkgver=1.6.0
pkgrel=2
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL')
depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
install="${pkgname}.install"
-source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ad342acca61c2af27be4cce61b2d925a')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('16bc40e022d06f287f18c71faaeb2e42')
build() {
cd "${srcdir}"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 987b412c3..2dbf5d668 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129446 2011-06-27 20:27:37Z andrea $
+# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.1
-pkgrel=3
+pkgver=2.4.3
+pkgrel=1
pkgdesc="The powerful music player for KDE"
arch=("i686" "x86_64" 'mips64el')
url="http://amarok.kde.org"
@@ -21,10 +21,10 @@ optdepends=("libgpod: support for Apple iPod audio devices"
"libmygpo-qt: gpodder.net Internet Service")
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
+md5sums=('24e8141bcbd065448911fa872c50197d')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -34,6 +34,6 @@ build() {
}
package(){
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/amarok/amarok.install b/extra/amarok/amarok.install
index e70c054ec..81ce5c4b0 100644
--- a/extra/amarok/amarok.install
+++ b/extra/amarok/amarok.install
@@ -1,5 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
index a5a0aa15c..a5fa7b6c2 100644
--- a/extra/archboot/PKGBUILD
+++ b/extra/archboot/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $
+# $Id: PKGBUILD 133615 2011-07-30 06:14:47Z tpowa $
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
pkgname=archboot
-pkgver=2011.06
+pkgver=2011.07
pkgrel=2
-_sourcerel=1
pkgdesc="Advanced, modular arch boot/install image creation utility"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/"
license=('GPL')
-depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1')
+url="http://www.archlinux.org/"
+depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1' 'libisoburn>=1.1.2' 'squashfs-tools>=4.2')
optdepends=('grub2-bios: for grub2 support'
'grub2-efi-i386: for grub2 support'
'grub2-efi-x86_64: for grub2 support'
'efibootmgr: for grub2 support'
)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
backup=('etc/archboot/allinone.conf'
'etc/archboot/allinone-lts.conf'
'etc/archboot/default.conf'
@@ -31,22 +31,18 @@ backup=('etc/archboot/allinone.conf'
'etc/archboot/presets/pxelinux-ftp'
)
install=archboot.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c)
-md5sums=('eac77ae13bf2e6b5a92317b9885c69dd'
- '7e2b03463747cb22ab388e79a09fa0cb')
### to bump the depends list use this:
#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
-build()
+build()
{
- cd "$srcdir"
+ cd $srcdir/$pkgname-$pkgver-$pkgrel
+ mv * $pkgdir/
+ # vmware-detect
+ cd $startdir/src
gcc -o vmware-detect vmware-detect.c
+ install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
}
-
-package()
-{
- cd "$srcdir/$pkgname-$pkgver-$_sourcerel"
- mv * "$pkgdir/"
- install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect"
-}
+md5sums=('dadac046c8da0c45c7ed55e223b5a0b5'
+ '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index b5c20a5ed..f63bfdd6f 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130903 2011-07-08 19:43:04Z schiv $
+# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z schiv $
# Maintainer: tobias <tobias@archlinux.org>
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,33 +9,43 @@
pkgname=ardour
pkgver=2.8.11
-pkgrel=4
+pkgrel=5
pkgdesc="A multichannel hard disk recorder and digital audio workstation"
arch=('i686' 'x86_64' 'mips64el')
-url="http://ardour.org"
+url="http://ardour.org/"
license=('GPL')
-depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat'
- 'libgnomecanvasmm' 'soundtouch')
+depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat'
+ 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6')
# -rubberband -libgnomecanvas(+libgnomecanvasmm)
- # +soundtouch -slv2
+ # +soundtouch (these +/- changes are for SYSLIBS)
+ # liblrdf versioned for https://bugs.archlinux.org/task/25005
+ # slv2 versioned for https://bugs.archlinux.org/task/25060
makedepends=('scons' 'boost' 'pkg-config')
changelog=${pkgname}.changelog
source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
${pkgname}.desktop
- gcc46.patch)
+ gcc46.patch
+ raptor2.patch)
md5sums=('f451a8d0abc133a1700c3932e07a5612'
'8aeaf433ebf781733db48e5a16b0c4da'
- 'd709add59911d099c813162448e4db99')
+ 'd709add59911d099c813162448e4db99'
+ 'a26a9bec0968fa0630c70f70c54f67de')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# gcc 4.6 compatibility
+ # http://tracker.ardour.org/view.php?id=3771
patch -Np1 -i "$srcdir/gcc46.patch"
+ # raptor2 compatibility
+ # https://bugs.archlinux.org/task/25060
+ # http://tracker.ardour.org/view.php?id=4179
+ patch -Np0 -i "$srcdir/raptor2.patch"
+
sed -i '/-O3/d' SConstruct
- # use syslibs until internal sigc++ issue w/ latest gcc resolves
+ # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves
# TODO: report upstream
scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
PREFIX="/usr" \
@@ -43,7 +53,6 @@ build() {
FREEDESKTOP=0 \
FREESOUND=1 \
SYSLIBS=1 \
- LV2=0 \
DESTDIR="${pkgdir}"
}
@@ -54,7 +63,6 @@ package() {
FREEDESKTOP=0 \
FREESOUND=1 \
SYSLIBS=1 \
- LV2=0 \
DESTDIR="${pkgdir}" install
# install some freedesktop.org compatibility
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
index 69d289e8f..47c111f01 100644
--- a/extra/ardour/ardour.changelog
+++ b/extra/ardour/ardour.changelog
@@ -1,3 +1,14 @@
+15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+ * 2.8.11-5:
+ Resolve previous issues with slv2 & redland/rasqal/raptor
+ - just needed rebuild of slv2 against latest redland suite [1]
+ - also needed ardour buildsystem patch for raptor2 [1][2]
+ - bring back support for slv2
+
+ [1] https://bugs.archlinux.org/task/25060
+ [2] http://tracker.ardour.org/view.php?id=4179
+
9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
* 2.8.11-4:
diff --git a/testing/ardour/raptor2.patch b/extra/ardour/raptor2.patch
index fe7cacff3..fe7cacff3 100644
--- a/testing/ardour/raptor2.patch
+++ b/extra/ardour/raptor2.patch
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 93d71053f..a30a4355e 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $
+# $Id: PKGBUILD 132785 2011-07-26 07:29:20Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
pkgname=avogadro
pkgver=1.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64' 'mips64el')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index fca92ae47..c02f14561 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119938 2011-04-17 01:35:14Z andrea $
+# $Id: PKGBUILD 132780 2011-07-26 07:20:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=bluedevil
-pkgver=1.1
+pkgver=1.1.1
pkgrel=1
pkgdesc='KDE bluetooth framework'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,10 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('240151ff99b81f630de51fa9f8230198')
+md5sums=('b3764fb8ead502e2d410b0c0fc86ac6c')
build(){
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build(){
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 0df0e4187..80773fdf5 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130704 2011-07-07 21:27:00Z andrea $
+# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
-pkgver=4.95
+pkgver=4.96
pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
'bluetooth.conf.d'
'rc.bluetooth')
-md5sums=('f34338440a4b3697cb9b3a2584f3251d'
+md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
'8f60a5eb9d84b9c64c478d63e1c24b10'
'ca4c39eb4bb201bd2eacad01492cd735')
diff --git a/extra/boost/4994-compile-fix-for-Python32-v2.patch b/extra/boost/4994-compile-fix-for-Python32-v2.patch
deleted file mode 100644
index 22613b3f2..000000000
--- a/extra/boost/4994-compile-fix-for-Python32-v2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libs/python/src/converter/builtin_converters.cpp
-===================================================================
---- libs/python/src/converter/builtin_converters.cpp (revision 67279)
-+++ libs/python/src/converter/builtin_converters.cpp (working copy)
-@@ -431,7 +431,11 @@
- if (!result.empty())
- {
- int err = PyUnicode_AsWideChar(
-+#if PY_VERSION_HEX >= 0x03020000
-+ intermediate
-+#else
- (PyUnicodeObject *)intermediate
-+#endif
- , &result[0]
- , result.size());
-
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 37a46a5b5..2ff1dbce0 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126799 2011-06-07 11:40:27Z ibiru $
+# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,19 +6,15 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
-pkgver=1.46.1
+pkgver=1.47.0
_boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.boost.org/"
makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
- 4994-compile-fix-for-Python32-v2.patch
- boost-1.46.0-spirit.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
license=('custom')
-md5sums=('341e5d993b19d099bf1a548495ea91ec'
- 'cb59e8adbf2a45ef9264a2f4ab92b849'
- '9d6e2f13fef23bf27d7bdddc104e182a')
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
_stagedir="${srcdir}/stagedir"
@@ -30,7 +26,7 @@ build() {
echo "using mpi ;" >> build/v2/user-config.jam
# build bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src"
+ cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
./build.sh cc
_bindir="bin.linuxx86"
@@ -56,10 +52,6 @@ build() {
# build libs
cd "${srcdir}/${pkgbase}_${_boostver}"
- #python 3.2 support
- #https://svn.boost.org/trac/boost/ticket/4994
- patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch"
- patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
# default "minimal" install: "release link=shared,static
# runtime-link=shared threading=single,multi"
@@ -78,11 +70,6 @@ build() {
--layout=system \
${MAKEFLAGS} \
install
-
- # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html
- # build pyste
- #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
- #python2 setup.py install --root=${_stagedir} --optimize=1
}
package_boost() {
diff --git a/extra/boost/boost-1.46.0-spirit.patch b/extra/boost/boost-1.46.0-spirit.patch
deleted file mode 100644
index 6fae331ee..000000000
--- a/extra/boost/boost-1.46.0-spirit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724)
-+++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725)
-@@ -14,6 +14,7 @@
-
- #include <boost/ref.hpp>
-
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/qi/parser.hpp>
-
- namespace boost { namespace spirit { namespace qi
-@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
- };
- }}}
-
-+namespace boost { namespace spirit { namespace traits
-+{
-+ ///////////////////////////////////////////////////////////////////////////
-+ template <typename Subject, typename Params, typename Attribute
-+ , typename Context, typename Iterator>
-+ struct handles_container<qi::parameterized_nonterminal<Subject, Params>
-+ , Attribute, Context, Iterator>
-+ : handles_container<typename remove_const<Subject>::type
-+ , Attribute, Context, Iterator>
-+ {};
-+}}}
-+
- #endif
-Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724)
-+++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725)
-@@ -14,6 +14,7 @@
-
- #include <boost/ref.hpp>
-
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/karma/generator.hpp>
-
- namespace boost { namespace spirit { namespace karma
-@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
- };
- }}}
-
-+
-+namespace boost { namespace spirit { namespace traits
-+{
-+ ///////////////////////////////////////////////////////////////////////////
-+ template <typename Subject, typename Params, typename Attribute
-+ , typename Context, typename Iterator>
-+ struct handles_container<karma::parameterized_nonterminal<Subject, Params>
-+ , Attribute, Context, Iterator>
-+ : handles_container<typename remove_const<Subject>::type
-+ , Attribute, Context, Iterator>
-+ {};
-+}}}
-+
- #endif
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 8bff9c211..34851290a 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $
+# $Id: PKGBUILD 132770 2011-07-26 00:09:35Z bisson $
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=clamav
-pkgver=0.97.1
+pkgver=0.97.2
pkgrel=1
pkgdesc='Anti-virus toolkit for Unix'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,12 @@ options=('!libtool')
license=('GPL')
backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
url='http://www.clamav.net/'
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'rc.d'
'conf.d'
'logrotate'
'config.patch')
-sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
+sha1sums=('27d47c6ad22edc87c030f6d483fab1e13320cbf7'
'7f15f0b13a1c11235bc99ef0add01efd8a442f07'
'cb116cdab49a810381a515cbcfb6a6c148547f07'
'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
@@ -27,7 +27,7 @@ sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
install=install
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 < ../config.patch
./configure \
--prefix=/usr \
@@ -39,18 +39,18 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
# make sure conf files get installed, because make install
# doesn't do that if clamav is already installed upon building.
- install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf"
- install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf"
+ install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
+ install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf"
- install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav"
- install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav"
- install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav"
+ install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav"
+ install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav"
+ install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav"
# un-distribute databases to require freshclam
- rm "$pkgdir"/var/lib/clamav/*.cvd
+ rm "${pkgdir}"/var/lib/clamav/*.cvd
}
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index 9034823d7..beb0e41cc 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125618 2011-05-27 08:07:05Z eric $
+# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=cmus
-pkgver=2.4.1
+pkgver=2.4.2
pkgrel=1
pkgdesc="A very feature-rich ncurses-based music player"
arch=('i686' 'x86_64' 'mips64el')
@@ -25,15 +25,12 @@ optdepends=('alsa-lib: for ALSA output plugin support'
'flac: for flac input plugin support'
'libmp4v2: for mp4 input plugin support')
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('7932bbada04bc9a273c332a323fc5704')
-sha1sums=('918c637becdcbca3652b836b38b164eb852fa896')
+md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
+sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
build() {
cd "$srcdir/$pkgname-v$pkgver"
- sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' configure ffmpeg.c
- sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c
- sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c
- ./configure prefix=/usr CONFIG_ARTS=n
+ ./configure prefix=/usr
make
}
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 55f39eaa8..4966c18bd 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131768 2011-07-14 19:06:35Z andyrtr $
+# $Id: PKGBUILD 133458 2011-07-28 09:24:50Z jgc $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.7
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -12,10 +12,12 @@ makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils
'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme')
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-avahi.patch
+ cups-no-export-ssllibs.patch
cups cups.logrotate cups.pam)
#options=('!emptydirs')
md5sums=('1590033ab4c739b859aeb672fe849089'
'8ebd390197501ffd709f0ee546937fd5'
+ '9b8467a1e51d360096b70e2c3c081e6c'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17')
@@ -26,6 +28,9 @@ build() {
cd ${srcdir}/${pkgbase}-${pkgver}
# Avahi support in the dnssd backend. patch from Fedora
patch -Np1 -i ${srcdir}/cups-avahi.patch
+
+ # Do not export SSL libs in cups-config
+ patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
# Rebuild configure script for --enable-avahi.
aclocal -I config-scripts
diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch
new file mode 100644
index 000000000..9be3c819b
--- /dev/null
+++ b/extra/cups/cups-no-export-ssllibs.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+
+
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index 0b7245aa7..47c3d9b82 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -14,7 +14,7 @@ post_upgrade() {
fi
if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
# important upgrade notice
- echo "daemon srcript has been renamed to /etc/rc.d/cupsd"
+ echo "daemon script has been renamed to /etc/rc.d/cupsd"
echo "change your entry in /etc/rc.conf"
fi
}
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 601ccbe31..10957e5f3 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 123352 2011-05-10 15:42:26Z ibiru $
+# $Id: PKGBUILD 132956 2011-07-26 15:21:51Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=dconf
-pkgver=0.7.5
+pkgver=0.8.0
pkgrel=1
pkgdesc="A low-level configuration system."
arch=(i686 x86_64 'mips64el')
@@ -11,8 +11,8 @@ depends=('glib2')
makedepends=('vala' 'gobject-introspection' 'gtk3')
optdepends=('gtk3: for dconf-editor')
install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33')
+source=(http://download.gnome.org/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('05111e973c365696759dd1b37e3f5acc877eff24dd2e4036d742aac5da5dda3b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 0fc581317..e40f2c6c3 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,37 +1,84 @@
-# $Id: PKGBUILD 112844 2011-03-07 07:38:30Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 134112 2011-08-01 17:31:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=digikam
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Digital photo management application for kde"
+pkgbase=digikam
+pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libmediawiki')
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-url="http://digikam.sourceforge.net"
-depends=('kdebase-runtime' 'kdegraphics-libs' 'kdepimlibs' 'kdeedu-marble' 'liblqr')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'doxygen')
-replaces=('digikamimageplugins')
-install=digikam.install
-optdepends=('kipi-plugins: for more extras and plugins')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+url="http://www.digikam.org/"
+makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
+ 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
+ 'cmake' 'automoc4' 'doxygen')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('7b1ab69fc2fb36a45dc3ca38b01d42d8')
build() {
- cd ${srcdir}
- mkdir build
- cd build
- # use internel lensfun packages
- cmake ../${pkgname}-${pkgver} \
- -DLENSFUN_LIBRARY="" \
- -DLENSFUN_INCLUDE_DIR="" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_MARBLEWIDGET=yes \
- -DWITH_MarbleWidget=yes \
- -DCMAKE_SKIP_RPATH=ON
- make all
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ # Use internal lensfun (FS#21816)
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLENSFUN_LIBRARY="" \
+ -DLENSFUN_INCLUDE_DIR=""
+ make
}
-package() {
- cd ${srcdir}/build
+package_digikam() {
+ pkgdesc="Digital photo management application for KDE"
+ depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
+ 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
+ optdepends=('kipi-plugins: for more extras and plugins')
+ install=digikam.install
+
+ cd "${srcdir}"/build/core
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/po
+ make DESTDIR="${pkgdir}" install
+}
+
+package_libkface() {
+ pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
+ depends=('kdelibs' 'opencv')
+
+ cd "${srcdir}"/build/extra/libkface
+ make DESTDIR="${pkgdir}" install
+}
+
+package_libkgeomap() {
+ pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
+ depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
+
+ cd "${srcdir}"/build/extra/libkgeomap
+ make DESTDIR="${pkgdir}" install
+}
+
+package_libmediawiki() {
+ pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
+ depends=('kdelibs')
+
+ cd "${srcdir}"/build/extra/libmediawiki
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kipi-plugins() {
+ pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
+ depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
+ 'opencv' 'qjson')
+ optdepends=('libkgeomap'
+ 'libmediawiki'
+ 'libgpod'
+ 'hugin')
+ install=kipi-plugins.install
+
+ cd "${srcdir}"/build/extra/kipi-plugins
make DESTDIR="${pkgdir}" install
}
-md5sums=('08934e97b63e8b1981f4087ec1a3372e')
diff --git a/extra/digikam/digikam.install b/extra/digikam/digikam.install
index e70c054ec..81ce5c4b0 100644
--- a/extra/digikam/digikam.install
+++ b/extra/digikam/digikam.install
@@ -1,5 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/digikam/kipi-plugins.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/extra/kdepim/kdepim-kleopatra.install
+++ b/extra/digikam/kipi-plugins.install
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index a8a00c533..ec11d1c4b 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $
+# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
-pkgver=3.3.0
-pkgrel=4
+pkgver=3.3.1
+pkgrel=1
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
@@ -12,13 +12,11 @@ arch=(i686 x86_64 mips64el)
depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
optdepends=('evolution-data-server: Evolution integration')
-provides=('gnomemeeting')
-replaces=('gnomemeeting')
options=(!emptydirs)
groups=('gnome-extra')
install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 5a2bab348..3fc7ee10d 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105523 2011-01-10 10:25:14Z jgc $
+# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=freetype2
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
pkgdesc="TrueType font rendering library"
arch=(i686 x86_64 'mips64el')
license=('GPL')
@@ -12,9 +12,8 @@ depends=('zlib')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
freetype-2.3.0-enable-spr.patch
- freetype-2.2.1-enable-valid.patch
- allow-hlineto-vlineto-without-arguments.patch)
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
+ freetype-2.2.1-enable-valid.patch)
+md5sums=('5e6510613f612809d2d7862592b92ab7'
'816dc8619a6904a7385769433c0a8653'
'214119610444c9b02766ccee5e220680')
@@ -22,13 +21,12 @@ build() {
cd "${srcdir}/freetype-${pkgver}"
patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
- patch -Np1 -i "${srcdir}/allow-hlineto-vlineto-without-arguments.patch"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/freetype-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
- '816dc8619a6904a7385769433c0a8653'
- '214119610444c9b02766ccee5e220680'
- 'bb094e147b25892f1d04cfb5ff877bce')
diff --git a/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch b/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch
deleted file mode 100644
index 5990041aa..000000000
--- a/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 396b11b840f84e8bff62f3c361d0b592e77ee703 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Thu, 09 Dec 2010 22:16:18 +0000
-Subject: [cff] Allow `hlineto' and `vlineto' without arguments.
-
-We simply ignore such instructions. This is invalid, but it doesn't
-harm; and indeed, there exist such subsetted fonts in PDFs.
-
-Reported by Albert Astals Cid <aacid@kde.org>.
-
-* src/cff/cffgload.c (cff_decoder_parse_charstrings)
-[cff_op_hlineto]: Ignore instruction if there aren't any arguments
-on the stack.
----
-diff --git a/ChangeLog b/ChangeLog
-index b7aea52..579ae62 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,16 @@
-+2010-12-09 Werner Lemberg <wl@gnu.org>
-+
-+ [cff] Allow `hlineto' and `vlineto' without arguments.
-+
-+ We simply ignore such instructions. This is invalid, but it doesn't
-+ harm; and indeed, there exist such subsetted fonts in PDFs.
-+
-+ Reported by Albert Astals Cid <aacid@kde.org>.
-+
-+ * src/cff/cffgload.c (cff_decoder_parse_charstrings)
-+ [cff_op_hlineto]: Ignore instruction if there aren't any arguments
-+ on the stack.
-+
- 2010-11-28 Werner Lemberg <wl@gnu.org>
-
- * Version 2.4.4 released.
-diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
-index e99ee70..99c5b0c 100644
---- a/src/cff/cffgload.c
-+++ b/src/cff/cffgload.c
-@@ -1438,9 +1438,14 @@
- FT_TRACE4(( op == cff_op_hlineto ? " hlineto\n"
- : " vlineto\n" ));
-
-- if ( num_args < 1 )
-+ if ( num_args < 0 )
- goto Stack_Underflow;
-
-+ /* there exist subsetted fonts (found in PDFs) */
-+ /* which call `hlineto' without arguments */
-+ if ( num_args == 0 )
-+ break;
-+
- if ( cff_builder_start_point ( builder, x, y ) ||
- check_points( builder, num_args ) )
- goto Fail;
---
-cgit v0.8.3.2
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 947212a4c..86090d46c 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90312 2010-09-10 14:58:18Z allan $
+# $Id: PKGBUILD 133976 2011-07-31 04:32:05Z 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
+pkgver=7.3
pkgrel=2
pkgdesc="The GNU Debugger"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,18 +15,16 @@ backup=('etc/gdb/gdbinit')
options=('!libtool')
install=gdb.install
source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('64260e6c56979ee750a01055f16091a5')
+md5sums=('485022b8df7ba2221f217e128f479fe7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --disable-nls \
--with-system-readline \
+ --with-python=/usr/bin/python2 \
--with-system-gdbinit=/etc/gdb/gdbinit
make
-
- # requires dejagnu
- #make check
}
package() {
diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install
index 44302170f..986ec547c 100644
--- a/extra/gdb/gdb.install
+++ b/extra/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/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 469b6725b..d3d81d091 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $
+# $Id: PKGBUILD 132804 2011-07-26 10:40:38Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-vfs
pkgver=2.24.4
-pkgrel=3
+pkgrel=4
pkgdesc="The GNOME Virtual File System"
arch=(i686 x86_64 'mips64el')
license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
options=('!libtool' '!emptydirs')
url="http://www.gnome.org"
install=gnome-vfs.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
- gnutls-config.patch)
+ gnutls-config.patch
+ gcrypt-config.patch)
sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
- '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
+ '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
+ 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
#Fix build with new gnutls
patch -Np1 -i "${srcdir}/gnutls-config.patch"
+ #fix build with new libgcrypt >= 1.5.0
+ patch -Np1 -i "${srcdir}/gcrypt-config.patch"
libtoolize --force
gtkdocize
aclocal
diff --git a/extra/gnome-vfs/gcrypt-config.patch b/extra/gnome-vfs/gcrypt-config.patch
new file mode 100644
index 000000000..8ce91870a
--- /dev/null
+++ b/extra/gnome-vfs/gcrypt-config.patch
@@ -0,0 +1,31 @@
+# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0
+--- gnome-vfs-2.24.4/configure.in 2010-07-01 12:36:09.000000000 -0300
++++ gnome-vfs-2.24.4-libgcrypt//configure.in 2011-07-22 15:55:02.296325640 -0300
+@@ -689,6 +689,16 @@
+ AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue)
+
+ dnl ****************************
++dnl LibGCrypt 1.5.0
++dnl ****************************
++
++AM_PATH_LIBGCRYPT(1.5.0)
++
++if test "x${LIBGCRYPT_LIBS}" = "x"; then
++ AC_MSG_ERROR([unable to find libgcrypt])
++fi
++
++dnl ****************************
+ dnl DNS-SD implementations
+ dnl ****************************
+ AM_CONDITIONAL(HAVE_AVAHI, false)
+@@ -1045,8 +1055,8 @@
+ dnl ==============================================================================
+
+ PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS"
++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS $LIBGCRYPT_LIBS"
+ AC_SUBST(LIBGNOMEVFS_CFLAGS)
+ AC_SUBST(LIBGNOMEVFS_LIBS)
+
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 9d507c317..77c1e9866 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132466 2011-07-24 17:33:27Z giovanni $
+# $Id: PKGBUILD 133584 2011-07-29 19:07:04Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
pkgname=gparted
pkgver=0.9.0
-pkgrel=2
+pkgrel=3
pkgdesc="A Partition Magic clone, frontend to GNU Parted"
arch=('i686' 'x86_64' 'mips64el')
url="http://gparted.sourceforge.net"
diff --git a/extra/gpgme/PKGBUILD b/extra/gpgme/PKGBUILD
index 664b5d3d4..4b3767af5 100644
--- a/extra/gpgme/PKGBUILD
+++ b/extra/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78424 2010-04-23 17:42:52Z andrea $
+# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgname=gpgme
-pkgver=1.3.0
+pkgver=1.3.1
pkgrel=1
pkgdesc="A C wrapper library for GnuPG"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,7 @@ license=('GPL')
depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
install=${pkgname}.install
options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f148c73f6f540f91e02141df72844f62')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -28,3 +27,4 @@ package() {
rm ${pkgdir}/usr/share/info/dir
gzip ${pkgdir}/usr/share/info/*
}
+md5sums=('90afa8436ce2b2683c001c824bd22601')
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 035e9632f..6692d95d8 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127207 2011-06-11 09:02:04Z remy $
+# $Id: PKGBUILD 134122 2011-08-01 22:48:36Z giovanni $
# Maintainer : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
pkgname=hplip
-pkgver=3.11.5
+pkgver=3.11.7
pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
arch=('i686' 'x86_64' 'mips64el')
@@ -24,8 +24,8 @@ optdepends=('cups: for printing support'
replaces=('hpijs')
options=('!libtool')
install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
-md5sums=('0a3d0f46ec89857b4c0feea6923864f1')
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz")
+md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 15dfdc82b..155602fa5 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126376 2011-06-05 04:38:18Z eric $
+# $Id: PKGBUILD 132767 2011-07-25 23:16:55Z eric $
# Maintainer: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=hugin
pkgver=2011.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="A frontend to the panorama-tools"
arch=('i686' 'x86_64' 'mips64el')
url="http://hugin.sourceforge.net/"
@@ -13,7 +13,7 @@ license=('LGPL')
depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
makedepends=('zip' 'cmake' 'boost')
-install=${pkgname}.install
+install=hugin.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
md5sums=('ac8a129b4c3021233df6d9368c8164cf')
sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116')
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index ba344c666..fc95815a0 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130010 2011-06-30 20:37:27Z schiv $
+# $Id: PKGBUILD 133558 2011-07-29 12:20:37Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: tobias <tobias@archlinux.net>
# Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,16 +6,17 @@
pkgname=jack
_longname=jack-audio-connection-kit
pkgver=0.121.2
-pkgrel=1
+pkgrel=2
pkgdesc="A low-latency audio server"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL')
depends=('libsamplerate' 'readline')
-makedepends=('doxygen' 'libffado')
-optdepends=('libffado: FireWire support')
+makedepends=('doxygen' 'libffado' 'celt-0.7')
+optdepends=('libffado: FireWire support'
+ 'celt-0.7: NetJACK driver')
[ "$CARCH" = "mips64el" ] && {
-makedepends=('doxygen')
-unset optdepends
+makedepends=('doxygen' 'celt-0.7')
+optdepends=('celt-0.7: NetJACK driver')
}
url="http://jackaudio.org/"
options=('!libtool')
diff --git a/extra/jack/jack.changelog b/extra/jack/jack.changelog
index 47909c872..54b9df6e5 100644
--- a/extra/jack/jack.changelog
+++ b/extra/jack/jack.changelog
@@ -1,3 +1,9 @@
+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 :
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
index 0fd7b21bc..5943c4d47 100644
--- a/extra/kdeaccessibility/PKGBUILD
+++ b/extra/kdeaccessibility/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 130258 2011-07-04 19:27:34Z andrea $
+# $Id: PKGBUILD 132588 2011-07-25 00:13:13Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-colorschemes'
- 'kdeaccessibility-iconthemes'
- 'kdeaccessibility-jovie'
+pkgname=('kdeaccessibility-jovie'
'kdeaccessibility-kaccessible'
'kdeaccessibility-kmag'
'kdeaccessibility-kmousetool'
'kdeaccessibility-kmouth')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://accessibility.kde.org'
license=('GPL' 'FDL')
groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
- 'speech-dispatcher')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('6e40aab7c95671070cad0b5f59507ff887414ce0')
+sha1sums=('69ecaa186edd07cfc391d6c630b6a95da602d3b1')
build() {
cd ${srcdir}
@@ -33,18 +30,6 @@ build() {
make
}
-package_kdeaccessibility-colorschemes() {
- pkgdesc='KDE Accessibility color schemes'
- cd $srcdir/build/ColorSchemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-iconthemes() {
- pkgdesc='KDE Accessibility icon themes'
- cd $srcdir/build/IconThemes
- make DESTDIR=$pkgdir install
-}
-
package_kdeaccessibility-jovie() {
pkgdesc='A text to speech application'
depends=('kdebase-runtime' 'speech-dispatcher')
@@ -52,7 +37,7 @@ package_kdeaccessibility-jovie() {
install='kdeaccessibility.install'
cd $srcdir/build/jovie
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/jovie
+ cd $srcdir/build/jovie/doc
make DESTDIR=$pkgdir install
}
@@ -71,7 +56,7 @@ package_kdeaccessibility-kmag() {
install='kdeaccessibility.install'
cd $srcdir/build/kmag
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmag
+ cd $srcdir/build/kmag/doc
make DESTDIR=$pkgdir install
}
@@ -82,7 +67,7 @@ package_kdeaccessibility-kmousetool() {
install='kdeaccessibility.install'
cd $srcdir/build/kmousetool
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmousetool
+ cd $srcdir/build/kmousetool/doc
make DESTDIR=$pkgdir install
}
@@ -93,6 +78,6 @@ package_kdeaccessibility-kmouth() {
install='kdeaccessibility.install'
cd $srcdir/build/kmouth
make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmouth
+ cd $srcdir/build/kmouth/doc
make DESTDIR=$pkgdir install
}
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 68dbd407d..4d390e1cd 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130259 2011-07-04 19:27:38Z andrea $
+# $Id: PKGBUILD 132589 2011-07-25 00:13:15Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -7,17 +7,17 @@ pkgname=('kdeadmin-kcron'
'kdeadmin-ksystemlog'
'kdeadmin-kuser'
'kdeadmin-system-config-printer-kde')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeadmin')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
- 'system-config-printer-common' 'python2-pyqt')
+ 'system-config-printer-common')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
'syslog-path.patch')
-sha1sums=('010912294a12461a8a0bfdce69c5373b37342cb6'
+sha1sums=('792eaf403f1c95be0028145345ddd80a99cf3c15'
'20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
build() {
@@ -31,9 +31,6 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_kpackage=OFF \
- -DBUILD_knetworkconf=OFF \
- -DBUILD_lilo-config=OFF \
-DBUILD_strigi-analyzer=OFF
make
}
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index e1847e906..3ae6bdb9d 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130260 2011-07-04 19:27:42Z andrea $
+# $Id: PKGBUILD 132590 2011-07-25 00:13:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
'kdeartwork-styles'
'kdeartwork-wallpapers'
'kdeartwork-weatherwallpapers')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeartwork')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
- 'kdebase-workspace' 'kdegraphics-libs')
+ 'kdebase-workspace' 'libkexiv2')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d')
+sha1sums=('b534a07ccd258135d72902a664198fd2bd22d508')
build() {
cd $srcdir
@@ -43,6 +43,7 @@ package_kdeartwork-aurorae() {
package_kdeartwork-colorschemes() {
pkgdesc='KDE color schemes'
+ replaces=('kdeaccessibility-colorschemes')
cd $srcdir/build/ColorSchemes
make DESTDIR=$pkgdir install
}
@@ -61,13 +62,14 @@ package_kdeartwork-emoticons() {
package_kdeartwork-iconthemes() {
pkgdesc='KDE icon themes'
+ replaces=('kdeaccessibility-iconthemes')
cd $srcdir/build/IconThemes
make DESTDIR=$pkgdir install
}
package_kdeartwork-kscreensaver() {
pkgdesc='KDE screensaver'
- depends=('kdebase-workspace' 'kdegraphics-libs')
+ depends=('kdebase-workspace' 'libkexiv2')
cd $srcdir/build/kscreensaver
make DESTDIR=$pkgdir install
}
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
new file mode 100644
index 000000000..6b32d20cb
--- /dev/null
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132591 2011-07-25 00:13:21Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebase-konsole
+pkgver=4.7.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://kde.org/applications/system/konsole/'
+pkgdesc="Terminal"
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdebase')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
+sha1sums=('e1e9fef5cb222e9d9eaba17e227ac66aed3e19d6')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../konsole-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 742c11888..4b2663d4c 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130252 2011-07-04 19:27:07Z andrea $
+# $Id: PKGBUILD 132995 2011-07-26 16:04:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-runtime
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
pkgdesc="KDE Base Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,15 +16,14 @@ optdepends=('htdig: to build the search index in khelpcenter'
'rarian: needed by khelpcenter'
'gdb: drkonq crash handler')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e91d35af2a916259305cc7efc2f3a3fbc8b22def')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
+sha1sums=('79c9b8323368f1a2a9b03830bd9ae02b2b20482b')
build() {
- cd "${srcdir}"
+ cd "${srcdir}"
mkdir build
cd build
- CXX="g++" \
- cmake ../${pkgname}-${pkgver} \
+ cmake ../kde-runtime-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index b969a4b1a..97bc50a48 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 130255 2011-07-04 19:27:20Z andrea $
+# $Id: PKGBUILD 133463 2011-07-28 09:27:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
-pkgver=4.6.5
-pkgrel=1
+_pkgname=kde-workspace
+pkgver=4.7.0
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -13,10 +14,11 @@ groups=('kde')
# note on libxdamage:
# not detected by namcap because libgl depends on it
# but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
'xorg-xsetroot' 'libxcomposite' 'libxinerama')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
+optdepends=('kde-wallpapers: officials KDE wallapers')
replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
install="${pkgname}.install"
@@ -25,10 +27,10 @@ backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kde-np'
'etc/pam.d/kscreensaver')
options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
'fixpath.patch' 'terminate-server.patch')
-sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c'
+sha1sums=('cbc61a20013c746f424681020c29480c6249fd10'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -38,7 +40,7 @@ sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${srcdir}/${_pkgname}-${pkgver}
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
@@ -46,19 +48,24 @@ build() {
cd ${srcdir}
mkdir build
cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_NetworkManager=OFF
+ cmake ../${_pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Xmms=OFF \
+ -DWITH_Googlegadgets=OFF \
+ -DWITH_libgps=OFF \
+ -DWITH_Prison=OFF \
+ -DWITH_NetworkManager=OFF \
+ -DKWIN_MOBILE_EFFECTS=OFF \
+ -DWITH_OpenGLES=OFF \
+ -DKWIN_BUILD_WITH_OPENGLES=OFF
make
}
package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
+ cd ${srcdir}/build
+ make DESTDIR=${pkgdir} install
install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 1faff3b6b..942f43eb1 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130256 2011-07-04 19:27:25Z andrea $
+# $Id: PKGBUILD 132581 2011-07-25 00:12:45Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -8,26 +8,25 @@ pkgname=('kdebase-dolphin'
'kdebase-kdialog'
'kdebase-keditbookmarks'
'kdebase-kfind'
+ 'kdebase-konq-plugins'
'kdebase-konqueror'
- 'kdebase-konsole'
- 'kdebase-kwrite'
'kdebase-lib'
'kdebase-plasma')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
-makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1a902d22956daaf380ceefe68f8db75b8b760ae6')
+makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
+sha1sums=('99f6b99039fbe41f470699232de703b4f4be802e')
build() {
cd ${srcdir}
mkdir build
cd build
- cmake ../${pkgbase}-${pkgver} \
+ cmake ../kde-baseapps-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr
@@ -37,7 +36,9 @@ build() {
package_kdebase-dolphin() {
pkgdesc='File Manager'
depends=('kdebase-runtime' 'kdebase-lib')
- optdepends=('ruby: servicemenu installation')
+ optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
+ 'kdegraphics-thumbnailers: thumbnailers for graphics file'
+ 'ruby: servicemenu installation')
url="http://kde.org/applications/system/dolphin/"
cd $srcdir/build/dolphin
make DESTDIR=$pkgdir install
@@ -79,6 +80,15 @@ package_kdebase-kfind() {
make DESTDIR=$pkgdir install
}
+package_kdebase-konq-plugins() {
+ pkgdesc='Extra plugins for Konqueror'
+ depends=('kdebase-konqueror' 'tidyhtml')
+ replaces=('konq-plugins')
+ install='kdebase.install'
+ cd $srcdir/build/konq-plugins
+ make DESTDIR=$pkgdir install
+}
+
package_kdebase-konqueror() {
pkgdesc='KDE File Manager & Web Browser'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -93,26 +103,6 @@ package_kdebase-konqueror() {
done
}
-package_kdebase-konsole() {
- pkgdesc='Terminal'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/konsole/"
- cd $srcdir/build/konsole
- make DESTDIR=$pkgdir install
- cd $srcdir/build/konsole/doc/manual
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kwrite() {
- pkgdesc='Text Editor'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kwrite/"
- cd $srcdir/build/kwrite
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kwrite
- make DESTDIR=$pkgdir install
-}
-
package_kdebase-lib() {
pkgdesc='KDE libraries for the basic desktop applications'
groups=()
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
new file mode 100644
index 000000000..83fa80260
--- /dev/null
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132592 2011-07-25 00:13:24Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-kimono
+pkgver=4.7.0
+pkgrel=1
+pkgdesc=".NET/Mono bindings for the KDE libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-qyoto' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
+conflicts=('kdebindings-csharp')
+source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
+sha1sums=('3b9c6e12f5fdc57214db841b98bde90d8dbd40cf')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kimono-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Soprano=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
new file mode 100644
index 000000000..6c48dfb58
--- /dev/null
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132593 2011-07-25 00:13:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-korundum
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE bindings for ruby"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-qtruby' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
+ 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
+conflicts=('kdebindings-ruby')
+source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
+sha1sums=('6f96a412077d3b198ee64c88e26fe60227e723c9')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../korundum-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
new file mode 100644
index 000000000..6ce6f5538
--- /dev/null
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 132594 2011-07-25 00:13:31Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdebindings-kross
+pkgname=('kdebindings-kross-python'
+# 'kdebindings-kross-ruby'
+ 'kdebindings-kross-java')
+pkgver=4.7.0
+pkgrel=1
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
+source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
+sha1sums=('bd31f249a63696b34e33fe8ccd4adde07f386806')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kross-interpreters-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_ruby=OFF
+ make
+}
+
+package_kdebindings-kross-python() {
+ pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
+ depends=('kdelibs' 'python2')
+
+ cd "${srcdir}"/build/python
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-kross-java() {
+ pkgdesc="Java language interpreters to enable in-process scripting with Kross"
+ depends=('kdelibs' 'openjdk6')
+
+ cd "${srcdir}"/build/java
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-kross-ruby() {
+ pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
+ depends=('kdelibs' 'ruby')
+
+ cd "${srcdir}"/build/ruby
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
new file mode 100644
index 000000000..323a84382
--- /dev/null
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132595 2011-07-25 00:13:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-perlkde
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Perl bindings for the KDE libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-perlqt' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
+ 'kdegraphics-okular' 'kdesdk-kate')
+source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
+sha1sums=('cc4a9c1e966b3baae0f0b0b82224a9bef96bf7d7')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../perlkde-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
new file mode 100644
index 000000000..04f64deea
--- /dev/null
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132575 2011-07-25 00:12:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-perlqt
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Perl bindings for the Qt libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
+sha1sums=('a48f2f34374258793c7394914645cf2b8e597aaa')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../perlqt-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
new file mode 100644
index 000000000..3fa56c015
--- /dev/null
+++ b/extra/kdebindings-python/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-python
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE bindings for python"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
+sha1sums=('8f4cf7c9a99ee5b0fb2c7284518a129dced31c94')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../pykde4-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # Use the python2 executable
+ find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
new file mode 100644
index 000000000..f80efdaec
--- /dev/null
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132578 2011-07-25 00:12:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-qtruby
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Qt bindings for ruby"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt' 'ruby')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-ruby')
+source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
+sha1sums=('c42bf8eb7e237ce3b6ab061e30c8243d0e9ecae1')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../qtruby-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
new file mode 100644
index 000000000..6860cdb9f
--- /dev/null
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132577 2011-07-25 00:12:33Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-qyoto
+pkgver=4.7.0
+pkgrel=1
+pkgdesc=".NET/Mono bindings for the Qt libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt' 'mono')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-csharp')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
+sha1sums=('2d55a08882679f2693008741f53deabc57898487')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../qyoto-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
new file mode 100644
index 000000000..2afa7fe17
--- /dev/null
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132570 2011-07-25 00:12:08Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokegen
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A general purpose C++ parser with a plugin infrastructure"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
+sha1sums=('e6116d95aabe1fa00fb9126b582ad028765e56fc')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../smokegen-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
new file mode 100644
index 000000000..9e58d553f
--- /dev/null
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132574 2011-07-25 00:12:24Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokekde
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Language independent library for KDE bindings"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
+ 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
+sha1sums=('c1cd38131c841f1f386bc270225fc5950db1c7a0')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../smokekde-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
new file mode 100644
index 000000000..122ba1559
--- /dev/null
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokeqt
+pkgver=4.6.95
+pkgrel=1
+pkgdesc="Language independent library for Qt bindings"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
+sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../smokeqt-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings/PKGBUILD b/extra/kdebindings/PKGBUILD
deleted file mode 100644
index 48a76a359..000000000
--- a/extra/kdebindings/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebindings
-pkgname=('kdebindings-csharp'
- 'kdebindings-python'
- 'kdebindings-ruby'
- 'kdebindings-smoke')
-pkgver=4.6.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono'
- 'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('e63a0b0eec92320df2c2c539b916c5ee9425a689')
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/build/.mono"
- mkdir -p "$MONO_SHARED_DIR"
-
- cd ${srcdir}/build
-
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DRUBY_SITE_LIB_DIR="/usr/lib/ruby/site_ruby/1.9.1" \
- -DRUBY_SITE_ARCH_DIR="/usr/lib/ruby/site_ruby/1.9.1/${CARCH}-linux" \
- -DBUILD_falcon=OFF \
- -DBUILD_java=OFF \
- -DBUILD_php=OFF \
- -DWITH_PolkitQt=OFF \
- -DWITH_Soprano=OFF
- make
-}
-
-package_kdebindings-csharp() {
- pkgdesc='KDE bindings for mono'
- depends=('kdebindings-smoke' 'mono')
- export MONO_SHARED_DIR="${srcdir}/build/.mono"
- mkdir -p "$MONO_SHARED_DIR"
- cd $srcdir/build/csharp
- make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-python() {
- pkgdesc='KDE bindings for python'
- depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
- cd $srcdir/build/python
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdebindings-ruby() {
- pkgdesc='KDE Bindings for ruby'
- depends=('kdebindings-smoke' 'ruby')
- cd $srcdir/build/ruby
- make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-smoke() {
- pkgdesc='Language independent library for Qt and KDE bindings'
- depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
- cd $srcdir/build/smoke
- make DESTDIR=$pkgdir install
- cd $srcdir/build/generator/smokebase
- make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
new file mode 100644
index 000000000..8836294a8
--- /dev/null
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132596 2011-07-25 00:13:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-blinken
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Memory Enhancement Game"
+url="http://kde.org/applications/education/blinken/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
+sha1sums=('8d6677b0c1b98bbb631730152e9edc1352af76c2')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../blinken-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu/kdeedu.install b/extra/kdeedu-blinken/kdeedu-blinken.install
index e70c054ec..e70c054ec 100644
--- a/extra/kdeedu/kdeedu.install
+++ b/extra/kdeedu-blinken/kdeedu-blinken.install
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
new file mode 100644
index 000000000..b916917b9
--- /dev/null
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132597 2011-07-25 00:13:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-cantor
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE Frontend to Mathematical Software"
+url="http://kde.org/applications/education/cantor/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libspectre')
+makedepends=('cmake' 'automoc4' 'r')
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
+sha1sums=('2ab29119e2289d697cc0f623cbdd90933697c1de')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../cantor-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdepim/kdepim-kmail.install b/extra/kdeedu-cantor/kdeedu-cantor.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/extra/kdepim/kdepim-kmail.install
+++ b/extra/kdeedu-cantor/kdeedu-cantor.install
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
new file mode 100644
index 000000000..2743c3e3e
--- /dev/null
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132598 2011-07-25 00:13:43Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kalgebra
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Graph Calculator"
+url="http://kde.org/applications/education/kalgebra/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
+sha1sums=('55def835948c6dff69ee87835c45630a1ae5cbc4')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kalgebra-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdeedu-kalgebra/kdeedu-kalgebra.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/extra/kdepim/kdepim-korganizer.install
+++ b/extra/kdeedu-kalgebra/kdeedu-kalgebra.install
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
new file mode 100644
index 000000000..6f3050406
--- /dev/null
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132599 2011-07-25 00:13:46Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kalzium
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Periodic Table of Elements"
+url="http://kde.org/applications/education/kalzium/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdelibs' 'avogadro' 'ocaml')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
+sha1sums=('786890c54d8ea61841c2cfa4ca6b9c05492fae38')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kalzium-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics/kdegraphics.install b/extra/kdeedu-kalzium/kdeedu-kalzium.install
index e70c054ec..e70c054ec 100644
--- a/extra/kdegraphics/kdegraphics.install
+++ b/extra/kdeedu-kalzium/kdeedu-kalzium.install
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
new file mode 100644
index 000000000..559d58097
--- /dev/null
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132600 2011-07-25 00:13:52Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kanagram
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Letter Order Game"
+url="http://kde.org/applications/education/kanagram/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
+sha1sums=('7d3d423960958cae8df7113f722d92428037ff8e')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kanagram-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kipi-plugins/kipi-plugins.install b/extra/kdeedu-kanagram/kdeedu-kanagram.install
index e70c054ec..e70c054ec 100644
--- a/extra/kipi-plugins/kipi-plugins.install
+++ b/extra/kdeedu-kanagram/kdeedu-kanagram.install
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
new file mode 100644
index 000000000..cc2df7229
--- /dev/null
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132601 2011-07-25 00:13:57Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kbruch
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Exercise Fractions"
+url="http://kde.org/applications/education/kbruch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
+sha1sums=('c3ca0d7a19787796faf8c7b96aeed46081613ac2')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kbruch-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/konq-plugins/konq-plugins.install b/extra/kdeedu-kbruch/kdeedu-kbruch.install
index e70c054ec..e70c054ec 100644
--- a/extra/konq-plugins/konq-plugins.install
+++ b/extra/kdeedu-kbruch/kdeedu-kbruch.install
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
new file mode 100644
index 000000000..7cb32b49b
--- /dev/null
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132602 2011-07-25 00:14:02Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kgeography
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Geography Trainer"
+url="http://kde.org/applications/education/kgeography/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
+sha1sums=('5fa6bff0e67e11657d55435c3faffdfcaf318e1e')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kgeography-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/partitionmanager/partitionmanager.install b/extra/kdeedu-kgeography/kdeedu-kgeography.install
index e70c054ec..e70c054ec 100644
--- a/extra/partitionmanager/partitionmanager.install
+++ b/extra/kdeedu-kgeography/kdeedu-kgeography.install
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
new file mode 100644
index 000000000..6ce8beb4b
--- /dev/null
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132603 2011-07-25 00:14:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-khangman
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Hangman Game"
+url="http://kde.org/applications/education/khangman/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
+sha1sums=('41ca66dd44de19e073993cc192bf6caf512b23d0')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../khangman-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-khangman/kdeedu-khangman.install b/extra/kdeedu-khangman/kdeedu-khangman.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-khangman/kdeedu-khangman.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
new file mode 100644
index 000000000..be9ed46c1
--- /dev/null
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132604 2011-07-25 00:14:12Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kig
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Interactive Geometry"
+url="http://kde.org/applications/education/kig/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
+sha1sums=('a6f46c28c4da5de14e3e46c19c11bd2ccdb16abf')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kig-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # Use the python2 executable
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
+}
diff --git a/extra/kdeedu-kig/kdeedu-kig.install b/extra/kdeedu-kig/kdeedu-kig.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kig/kdeedu-kig.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
new file mode 100644
index 000000000..afbfb5676
--- /dev/null
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132605 2011-07-25 00:14:17Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kiten
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Japanese Reference/Study Tool"
+url="http://kde.org/applications/education/kiten/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
+sha1sums=('7caa8c13f6431d54eabc3a88f874f279134181c3')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kiten-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kiten/kdeedu-kiten.install b/extra/kdeedu-kiten/kdeedu-kiten.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kiten/kdeedu-kiten.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
new file mode 100644
index 000000000..5722dec40
--- /dev/null
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132606 2011-07-25 00:14:23Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-klettres
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Learn The Alphabet"
+url="http://kde.org/applications/education/klettres/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
+sha1sums=('1701b1c83856686b5123036dcf3c17643bf1ccc6')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../klettres-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-klettres/kdeedu-klettres.install b/extra/kdeedu-klettres/kdeedu-klettres.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-klettres/kdeedu-klettres.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
new file mode 100644
index 000000000..e56d89cbb
--- /dev/null
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132607 2011-07-25 00:14:26Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kmplot
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Mathematical Function Plotter"
+url="http://kde.org/applications/education/kmplot/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
+sha1sums=('5123c7855497e6374dbd7211890cf9e69a4ee886')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kmplot-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kmplot/kdeedu-kmplot.install b/extra/kdeedu-kmplot/kdeedu-kmplot.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kmplot/kdeedu-kmplot.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
new file mode 100644
index 000000000..e69b38abd
--- /dev/null
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132608 2011-07-25 00:14:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kstars
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Desktop Planetarium"
+url="http://kde.org/applications/education/kstars/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
+sha1sums=('7ef3b53889aceb97b9452bf0b581a3aeefd243dc')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kstars-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Xplanet=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kstars/kdeedu-kstars.install b/extra/kdeedu-kstars/kdeedu-kstars.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kstars/kdeedu-kstars.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
new file mode 100644
index 000000000..030fe2928
--- /dev/null
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132609 2011-07-25 00:14:32Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-ktouch
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Touch Typing Tutor"
+url="http://kde.org/applications/education/ktouch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
+sha1sums=('b310e264e3fe8c96e2ceee233f364ae5cbd38048')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../ktouch-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-ktouch/kdeedu-ktouch.install b/extra/kdeedu-ktouch/kdeedu-ktouch.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-ktouch/kdeedu-ktouch.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
new file mode 100644
index 000000000..dbfc6916d
--- /dev/null
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132610 2011-07-25 00:14:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kturtle
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Educational Programming Environment"
+url="http://kde.org/applications/education/kturtle/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
+sha1sums=('d7bba4f06ac21b37bf32a84903ba6366a094ac1f')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kturtle-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kturtle/kdeedu-kturtle.install b/extra/kdeedu-kturtle/kdeedu-kturtle.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kturtle/kdeedu-kturtle.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
new file mode 100644
index 000000000..4eff81f21
--- /dev/null
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132611 2011-07-25 00:14:37Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kwordquiz
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Flash Card Trainer"
+url="http://kde.org/applications/education/kwordquiz/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
+sha1sums=('57064fa6044c65c13da69a8954598357b6499622')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kwordquiz-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
new file mode 100644
index 000000000..519a8d9a0
--- /dev/null
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 132583 2011-07-25 00:12:54Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-marble
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Desktop Globe"
+url="http://kde.org/applications/education/marble/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'gpsd')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
+ 'gpsd-2.96.patch')
+sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
+ 'f44dfd3bb384e631d59b93d7dda3413795da8183')
+
+build() {
+ cd "${srcdir}"/marble-${pkgver}
+ patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../marble-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu/gpsd-2.96.patch b/extra/kdeedu-marble/gpsd-2.96.patch
index ec515e99d..e27702181 100644
--- a/extra/kdeedu/gpsd-2.96.patch
+++ b/extra/kdeedu-marble/gpsd-2.96.patch
@@ -1,7 +1,5 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
@@ -18,6 +18,9 @@ using namespace Marble;
GpsdConnection::GpsdConnection( QObject* parent )
diff --git a/extra/kdeedu-marble/kdeedu-marble.install b/extra/kdeedu-marble/kdeedu-marble.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-marble/kdeedu-marble.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
new file mode 100644
index 000000000..0f3749239
--- /dev/null
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132612 2011-07-25 00:14:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-parley
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Vocabulary Trainer"
+url="http://kde.org/applications/education/parley/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
+sha1sums=('b0925b3658656933410eaee701ec5f30eebee88e')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../parley-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-parley/kdeedu-parley.install b/extra/kdeedu-parley/kdeedu-parley.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-parley/kdeedu-parley.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
new file mode 100644
index 000000000..7537baa0b
--- /dev/null
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132613 2011-07-25 00:14:43Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-rocs
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Rocs Graph Theory"
+url="http://kde.org/applications/education/rocs/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
+sha1sums=('f7cb5e17d469e6f88851f1104145e3d02cff27c0')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../rocs-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
new file mode 100644
index 000000000..2f89c8c4f
--- /dev/null
+++ b/extra/kdeedu-step/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132614 2011-07-25 00:14:47Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-step
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Interactive Physical Simulator"
+url="http://kde.org/applications/education/step/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
+sha1sums=('134fe3b80f0ea1931a81cd82981ef5d683442518')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../step-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-step/kdeedu-step.install b/extra/kdeedu-step/kdeedu-step.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-step/kdeedu-step.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
deleted file mode 100644
index 449a41c1c..000000000
--- a/extra/kdeedu/PKGBUILD
+++ /dev/null
@@ -1,273 +0,0 @@
-# $Id: PKGBUILD 130257 2011-07-04 19:27:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeedu
-pkgname=('kdeedu-blinken'
- 'kdeedu-cantor'
- 'kdeedu-kalgebra'
- 'kdeedu-kalzium'
- 'kdeedu-kanagram'
- 'kdeedu-kbruch'
- 'kdeedu-kgeography'
- 'kdeedu-khangman'
- 'kdeedu-kig'
- 'kdeedu-kiten'
- 'kdeedu-klettres'
- 'kdeedu-kmplot'
- 'kdeedu-kstars'
- 'kdeedu-ktouch'
- 'kdeedu-kturtle'
- 'kdeedu-kwordquiz'
- 'kdeedu-libkdeedu'
- 'kdeedu-marble'
- 'kdeedu-parley'
- 'kdeedu-rocs'
- 'kdeedu-step')
-pkgver=4.6.5
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
- 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
- 'python2' 'avogadro')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'gpsd-2.96.patch'
- 'remove-libkdeedu-libscience.patch')
-sha1sums=('64247eb68b2710a66baaf824d798e46b34ca4d4f'
- 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
- 'cd4e18f2b30d42f6e2bcc518ad72fd49839fd8dc')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np1 -i ${srcdir}/gpsd-2.96.patch
- patch -p1 -i ${srcdir}/remove-libkdeedu-libscience.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeedu-blinken() {
- pkgdesc='A memory enhancement game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/blinken
- make DESTDIR=$pkgdir install
- cd $srcdir/build/blinken/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-cantor() {
- pkgdesc='KDE Frontend to Mathematical Software'
- depends=('kdeedu-libkdeedu' 'libspectre')
- optdepends=('kdeedu-kalgebra: backend'
- 'maxima: backend'
- 'r: backend')
- install='kdeedu.install'
- cd $srcdir/build/cantor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/cantor/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalgebra() {
- pkgdesc='Math Expression Solver and Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kalgebra
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kalgebra/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalzium() {
- pkgdesc='KDE Periodic Table of Elements'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro')
- install='kdeedu.install'
- cd $srcdir/build/kalzium
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kalzium/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kanagram() {
- pkgdesc='KDE Letter Order Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/kanagram
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kanagram/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kbruch() {
- pkgdesc='Practice exercises with fractions'
- depends=('kdelibs' 'kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kbruch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kbruch/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kgeography() {
- pkgdesc='A Geography Learning Program'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kgeography
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgeography/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-khangman() {
- pkgdesc='KDE Hangman Game'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/khangman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/khangman/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kig() {
- pkgdesc='Explore Geometric Constructions'
- depends=('kdebase-runtime' 'boost-libs' 'python2')
- install='kdeedu.install'
- cd $srcdir/build/kig
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kig/doc
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
-}
-
-package_kdeedu-kiten() {
- pkgdesc='Japanese Reference and Study Tool'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kiten
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kiten/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-klettres() {
- pkgdesc='a KDE program to learn the alphabet'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/klettres
- make DESTDIR=$pkgdir install
- cd $srcdir/build/klettres/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kmplot() {
- pkgdesc='Function Plotter'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kmplot
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmplot/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kstars() {
- pkgdesc='Desktop Planetarium'
- depends=('kdebase-runtime' 'libindi')
- install='kdeedu.install'
- cd $srcdir/build/kstars
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kstars/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-ktouch() {
- pkgdesc='Touch Typing Tutor'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/ktouch
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ktouch/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kturtle() {
- pkgdesc='Educational Programming Environment'
- depends=('kdebase-runtime')
- install='kdeedu.install'
- cd $srcdir/build/kturtle
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kturtle/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kwordquiz() {
- pkgdesc='A flashcard and vocabulary learning program'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/kwordquiz
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwordquiz/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-libkdeedu() {
- pkgdesc='Support library for KDE Educational Software'
- groups=()
- depends=('kdelibs')
- install='kdeedu.install'
- replaces=('kdeedu-data')
- conflicts=('kdeedu-data')
- cd $srcdir/build/libkdeedu
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-marble() {
- pkgdesc='Desktop Globe'
- depends=('kdebase-runtime' 'gpsd')
- install='kdeedu.install'
- cd $srcdir/build/marble
- make DESTDIR=$pkgdir install
- cd $srcdir/build/marble/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-parley() {
- pkgdesc='Vocabulary Trainer'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
- install='kdeedu.install'
- cd $srcdir/build/parley
- make DESTDIR=$pkgdir install
- cd $srcdir/build/parley/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-rocs() {
- pkgdesc='Graph Theory Tool for Professors and Students.'
- depends=('kdebase-runtime' 'kdeedu-libkdeedu')
- install='kdeedu.install'
- cd $srcdir/build/rocs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/rocs/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-step() {
- pkgdesc='Simulate physics experiments'
- depends=('kdebase-runtime' 'gsl' 'libqalculate')
- install='kdeedu.install'
- cd $srcdir/build/step
- make DESTDIR=$pkgdir install
- cd $srcdir/build/step/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeedu/remove-libkdeedu-libscience.patch b/extra/kdeedu/remove-libkdeedu-libscience.patch
deleted file mode 100644
index a8643d49f..000000000
--- a/extra/kdeedu/remove-libkdeedu-libscience.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeedu-4.6.4/libkdeedu/CMakeLists.txt~ 2011-06-10 16:59:34.922935038 +0000
-+++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt 2011-06-10 16:59:56.279802081 +0000
-@@ -8,7 +8,6 @@
-
- add_subdirectory(keduvocdocument)
- add_subdirectory(kdeeduui)
--add_subdirectory(libscience)
- add_subdirectory(data)
- #add_subdirectory(widgets)
- add_subdirectory(qtmmlwidget)
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 21bc2765c..16f25e84a 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130261 2011-07-04 19:27:48Z andrea $
+# $Id: PKGBUILD 132615 2011-07-25 00:14:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -43,7 +43,7 @@ pkgname=('kdegames-bomber'
'kdegames-libkmahjongg'
'kdegames-lskat'
'kdegames-palapeli')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -52,7 +52,7 @@ groups=('kde' 'kdegames')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
'kdebindings-python' 'openal')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('28c4908439f493fa30436875a77de01a21e88f4c')
+sha1sums=('4921fc802f02d0f4b21b8c99cb2ac8c24867fe16')
build() {
cd $srcdir
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
new file mode 100644
index 000000000..fbda6ccfe
--- /dev/null
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132616 2011-07-25 00:14:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-gwenview
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A fast and easy to use image viewer for KDE"
+url="http://kde.org/applications/graphics/gwenview/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-lib' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins: extra plugins to share photos')
+install=$pkgname.install
+source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
+sha1sums=('30058dc40ea6ae8e3298facb9582d6bf91753d8b')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../gwenview-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-gwenview/kdegraphics-gwenview.install b/extra/kdegraphics-gwenview/kdegraphics-gwenview.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-gwenview/kdegraphics-gwenview.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
new file mode 100644
index 000000000..ab444ebb5
--- /dev/null
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132617 2011-07-25 00:14:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kamera
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Configure Kamera"
+url="http://kde.org/applications/graphics/kamera/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'gphoto2')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
+sha1sums=('4b8b0bd1bddba96fbc0c856d985ccb7419aa0d75')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kamera-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
new file mode 100644
index 000000000..6e6ca0ffd
--- /dev/null
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132618 2011-07-25 00:14:59Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kcolorchooser
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Color Chooser"
+url="http://kde.org/applications/graphics/kcolorchooser/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
+sha1sums=('d4be9b00eecb8c7a9aad45ed5861ad0ea0bc764f')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kcolorchooser-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
new file mode 100644
index 000000000..ef84635f1
--- /dev/null
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 132619 2011-07-25 00:15:02Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kgamma
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A monitor calibration tool"
+url="http://kde.org/applications/graphics/kgamma/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+# note on libxxf86vm:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxxf86vm
+depends=('kdebase-runtime' 'libxxf86vm')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
+sha1sums=('4534ea82e0d1f48414f1380e22d7aa8e7e50db98')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kgamma-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
new file mode 100644
index 000000000..931272982
--- /dev/null
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132620 2011-07-25 00:15:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kolourpaint
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Paint Program"
+url="http://kde.org/applications/graphics/kolourpaint/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'qimageblitz')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
+sha1sums=('e6095508eac71201b19a63d416ff771b7bc5b9ab')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kolourpaint-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
new file mode 100644
index 000000000..a60d544bd
--- /dev/null
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132621 2011-07-25 00:15:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kruler
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Screen Ruler"
+url="http://kde.org/applications/graphics/kruler/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
+sha1sums=('d77be8bc37dc684253b0f18952ad463908d55561')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kruler-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kruler/kdegraphics-kruler.install b/extra/kdegraphics-kruler/kdegraphics-kruler.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-kruler/kdegraphics-kruler.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
new file mode 100644
index 000000000..d663ed51a
--- /dev/null
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134039 2011-08-01 10:40:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksaneplugin
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A scan plugin that implements the scanning"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libksane')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
+sha1sums=('2d1b61bad04d24f699ea64b203a112df15d37946')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../ksaneplugin-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
new file mode 100644
index 000000000..9a57e639b
--- /dev/null
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132623 2011-07-25 00:15:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksnapshot
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Screen Capture Program"
+url="http://kde.org/applications/graphics/ksnapshot/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdelibs' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
+sha1sums=('771002ae1b047ffc850060f128f11514a3349f89')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../ksnapshot-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
new file mode 100644
index 000000000..7cbd4151c
--- /dev/null
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134044 2011-08-01 10:41:01Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-mobipocket
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A collection of plugins to handle mobipocket files"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
+sha1sums=('13e3c48a903411bc461f029564dd2e968dac719b')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../mobipocket-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
new file mode 100644
index 000000000..67f9edee1
--- /dev/null
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132572 2011-07-25 00:12:14Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-okular
+pkgver=4.7.0
+pkgrel=1
+pkgdesc='Document Viewer'
+arch=('i686' 'x86_64')
+url="http://kde.org/applications/graphics/okular/"
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
+ 'ebook-tools' 'libspectre')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+optdepends=('kdegraphics-mobipocket: mobipocket support')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
+sha1sums=('3fb935d79c2c24af9ea2874dbdb88f46d82154c2')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../okular-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-okular/kdegraphics-okular.install b/extra/kdegraphics-okular/kdegraphics-okular.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-okular/kdegraphics-okular.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
new file mode 100644
index 000000000..3f2508ade
--- /dev/null
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134049 2011-08-01 10:42:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-strigi-analyzer
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="Strigi analyzers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('2c2ff7e6b13ac1c073f112df9c794065d191e085')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
new file mode 100644
index 000000000..d5923547d
--- /dev/null
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134054 2011-08-01 10:43:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-svgpart
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A KPart for viewving SVGs"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
+sha1sums=('1b6f7eccf84c0cb6f92a37d8f65cd6720ed2e72b')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../svgpart-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
new file mode 100644
index 000000000..a4ea8f9d5
--- /dev/null
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134059 2011-08-01 10:44:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-thumbnailers
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="Thumbnailers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libkexiv2' 'libkdcraw')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6402d5a73d88ea4004aced3e68fc5e5c6454aaab')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD
deleted file mode 100644
index 0bb7e9615..000000000
--- a/extra/kdegraphics/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# $Id: PKGBUILD 131255 2011-07-12 11:55:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegraphics
-pkgname=('kdegraphics-gwenview'
- 'kdegraphics-kamera'
- 'kdegraphics-kcolorchooser'
- 'kdegraphics-kgamma'
- 'kdegraphics-kolourpaint'
- 'kdegraphics-kruler'
- 'kdegraphics-ksnapshot'
- 'kdegraphics-libs'
- 'kdegraphics-okular')
-pkgver=4.6.5
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
- 'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre'
- 'ebook-tools' 'kdebase-runtime')
-[ "$CARCH" = "mips64el" ] && makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'lcms'
- 'libxxf86vm' 'poppler-qt' 'libspectre' 'djvulibre'
- 'ebook-tools' 'kdebase-runtime')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1e64698993d0754dfae1296d8d16ba9370f9a08c')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- CXX="g++" \
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdegraphics-gwenview() {
- pkgdesc='A simple image viewer'
- depends=('kdebase-runtime' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/gwenview/"
- replaces=('gwenview' 'gwenview-i18n')
- install='kdegraphics.install'
- cd $srcdir/build/gwenview
- make DESTDIR=$pkgdir install
- cd $srcdir/build/gwenview/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kamera() {
- pkgdesc='Configure Kamera'
- depends=('kdelibs' 'libgphoto2')
- cd $srcdir/build/kamera
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kamera/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kcolorchooser() {
- pkgdesc='Color Chooser'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/graphics/kcolorchooser/"
- install='kdegraphics.install'
- cd $srcdir/build/kcolorchooser
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kgamma() {
- pkgdesc='A monitor calibration tool'
- # note on libxxf86vm:
- # not detected by namcap because libgl depends on it
- # but nvidia providing libgl does not depend on libxxf86vm
- depends=('kdebase-runtime' 'libxxf86vm')
- install='kdegraphics.install'
- cd $srcdir/build/kgamma
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgamma/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kolourpaint() {
- pkgdesc='Paint Program'
- depends=('kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/kolourpaint/"
- install='kdegraphics.install'
- cd $srcdir/build/kolourpaint
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kolourpaint/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kruler() {
- pkgdesc='Screen Ruler'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/graphics/kruler/"
- install='kdegraphics.install'
- cd $srcdir/build/kruler
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kruler/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-ksnapshot() {
- pkgdesc='Screen Capture Program'
- depends=('kdebase-runtime' 'kdegraphics-libs')
- url="http://kde.org/applications/graphics/ksnapshot/"
- install='kdegraphics.install'
- cd $srcdir/build/ksnapshot
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ksnapshot/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-libs() {
- pkgdesc='Support library for KDE Graphics Software'
- groups=()
- depends=('kdelibs' 'sane' 'lcms')
-[ "$CARCH" = "mips64el" ] && \
- depends=('kdelibs' 'lcms')
- conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer'
- 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
- replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin'
- 'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
- install='kdegraphics.install'
- for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
- [ "$CARCH" = "mips64el" -a $i = ksaneplugin ] && continue
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
- $pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
-}
-
-package_kdegraphics-okular() {
- pkgdesc='Document Viewer'
- depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
-[ "$CARCH" = "mips64el" ] && \
- depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'djvulibre'
- 'ebook-tools' 'libspectre')
- url="http://kde.org/applications/graphics/okular/"
- install='kdegraphics.install'
- cd $srcdir/build/okular
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/okular
- make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 55535c10c..759360ddd 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131295 2011-07-12 17:46:50Z andrea $
+# $Id: PKGBUILD 132565 2011-07-25 00:11:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdelibs
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -16,36 +16,22 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
'docbook-xsl')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
'hspell')
-replaces=('arts' 'kdelibs-experimental')
+replaces=('kdelibs-experimental')
install='kdelibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch'
- 'abs-syntax-highlight.patch'
- 'fix-lineedit-clear-button.patch'
- 'fix-lineedit-completion-tab.patch')
-sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- 'd994f262356af5b9e4e9619646e471bd98c91efb'
- '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
- 'a5f223b61499fa03043def0b3a45b1712cc72d70')
+ 'kde-applications-menu.patch')
+sha1sums=('2a7a59ac78a161c7c2393db89179449b495dd2db'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# avoid file conflict with gnome-menu
patch -p1 -i $srcdir/kde-applications-menu.patch
- # add syntax highlightning for PKGBUILD and .install files
- patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
- # Already fixed upstream
- patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch
- patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.patch
cd ${srcdir}
mkdir build
cd build
-# Fix for distcc
- CXX="g++" \
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@@ -54,8 +40,7 @@ build() {
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DKAUTH_BACKEND=PolkitQt-1
+ -DWITH_FAM=OFF
make
}
diff --git a/extra/kdelibs/fix-lineedit-clear-button.patch b/extra/kdelibs/fix-lineedit-clear-button.patch
deleted file mode 100644
index 315892940..000000000
--- a/extra/kdelibs/fix-lineedit-clear-button.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
-Author: Andrea Iacovitti <aiacovitti@libero.it>
-Date: Sat Jul 9 19:51:40 2011 +0200
-
- Fix regression about input text clearButton stopping to work on khtml forms
- BUG: 246513
- FIXED-IN: 4.7.0
-
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
-index 7382806..8f1c8a4 100644
---- a/kdeui/widgets/klineedit.cpp
-+++ b/kdeui/widgets/klineedit.cpp
-@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- if ( (e->button() == Qt::LeftButton ||
- e->button() == Qt::MidButton ) &&
- d->clearButton ) {
-- d->clickInClear = d->clearButton == childAt( e->pos() );
-+ d->clickInClear = ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() );
-
- if ( d->clickInClear ) {
- d->possibleTripleClick = false;
-@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
- {
- if ( d->clickInClear ) {
-- if ( d->clearButton == childAt( e->pos() ) ) {
-+ if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) {
- QString newText;
- if ( e->button() == Qt::MidButton ) {
- newText = QApplication::clipboard()->text( QClipboard::Selection );
diff --git a/extra/kdelibs/fix-lineedit-completion-tab.patch b/extra/kdelibs/fix-lineedit-completion-tab.patch
deleted file mode 100644
index 0c88dffc9..000000000
--- a/extra/kdelibs/fix-lineedit-completion-tab.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- kdelibs/khtml/rendering/render_form.cpp
-+++ kdelibs/khtml/rendering/render_form.cpp
-@@ -1012,11 +1012,11 @@
- // -----------------------------------------------------------------------------
-
- RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
-- : RenderFormElement(element)
-+ : RenderFormElement(element), m_blockElementUpdates(false)
- {
- LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
- connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
-- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
-+ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
-
- if(element->inputType() == HTMLInputElementImpl::PASSWORD)
- edit->setEchoMode( QLineEdit::Password );
-@@ -1142,17 +1142,21 @@
- }
-
- if (element()->value().string() != widget()->text()) {
-+ m_blockElementUpdates = true;
- int pos = widget()->cursorPosition();
- widget()->setText(element()->value().string());
- widget()->setCursorPosition(pos);
-+ m_blockElementUpdates = false;
- }
- widget()->setReadOnly(element()->readOnly());
-
- RenderFormElement::updateFromElement();
- }
-
--void RenderLineEdit::slotTextEdited(const QString &string)
-+void RenderLineEdit::slotTextChanged(const QString &string)
- {
-+ if (m_blockElementUpdates) return;
-+
- // don't use setValue here!
- element()->m_value = string;
- element()->m_unsubmittedFormChange = true;
---- kdelibs/khtml/rendering/render_form.h
-+++ kdelibs/khtml/rendering/render_form.h
-@@ -282,12 +282,13 @@
- void setSelectionRange(long start, long end);
- public Q_SLOTS:
- void slotReturnPressed();
-- void slotTextEdited(const QString &string);
-+ void slotTextChanged(const QString &string);
- protected:
-
- private:
- virtual bool isEditable() const { return true; }
- virtual bool canHaveBorder() const { return true; }
-+ bool m_blockElementUpdates;
- };
-
- // -------------------------------------------------------------------------
diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install
index ce5c32e1b..c77e68041 100644
--- a/extra/kdelibs/kdelibs.install
+++ b/extra/kdelibs/kdelibs.install
@@ -1,6 +1,7 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
@@ -9,4 +10,4 @@ post_upgrade() {
post_remove() {
post_install
-} \ No newline at end of file
+}
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 77a61b427..a51dd670b 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131350 2011-07-12 19:23:57Z andrea $
+# $Id: PKGBUILD 132843 2011-07-26 13:58:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -10,25 +10,20 @@ pkgname=('kdemultimedia-dragonplayer'
'kdemultimedia-kmix'
'kdemultimedia-kscd'
'kdemultimedia-mplayerthumbs')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
- 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
+ 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'mplayerthumbs.config'
- 'fix-memleak-in-kmix.patch')
-sha1sums=('081bead5ee758d169f3119c138424929b001d04f'
- 'ba016fa2563c14ffcba852c62506b66bfc6ee683'
- '80370de30898f1ba1a6db057d34324abdcc57384')
+ 'mplayerthumbs.config')
+sha1sums=('3ad5f6e806a0e8ea9f7c88697d6f605a112a9d21'
+ 'ba016fa2563c14ffcba852c62506b66bfc6ee683')
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
-
cd ${srcdir}
mkdir build
cd build
diff --git a/extra/kdemultimedia/fix-memleak-in-kmix.patch b/extra/kdemultimedia/fix-memleak-in-kmix.patch
deleted file mode 100644
index 31ea4a606..000000000
--- a/extra/kdemultimedia/fix-memleak-in-kmix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
-===================================================================
---- kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241345)
-+++ kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241346)
-@@ -754,7 +754,12 @@
- return;
- }
- addDevice((*map)[index]);
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- }
-
- void Mixer_PULSE::removeWidget(int index)
-@@ -778,7 +783,12 @@
- {
- delete *iter;
- m_mixDevices.erase(iter);
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- return;
- }
- }
-@@ -799,7 +809,12 @@
- delete *iter;
- m_mixDevices.erase(iter);
- }
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- }
-
- void Mixer_PULSE::addDevice(devinfo& dev)
-@@ -990,7 +1005,7 @@
- kDebug(67100) << "Using PulseAudio for mixer: " << m_mixerName;
- m_isOpen = true;
- }
--
-+
- return 0;
- }
-
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 3d6a6fcf4..1cbd71e49 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130263 2011-07-04 19:27:58Z andrea $
+# $Id: PKGBUILD 132629 2011-07-25 00:15:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -10,18 +10,18 @@ pkgname=('kdenetwork-filesharing'
'kdenetwork-kppp'
'kdenetwork-krdc'
'kdenetwork-krfb')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
- 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'telepathy-qt4' 'libktorrent' 'mediastreamer')
+ 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+ 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
+ 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('cc398063da61f9f9ef0db4455dc0c989a4e68a25')
+sha1sums=('e9e9d9c648d7d0e38852bc3417faa605bd62c1d1')
build() {
cd "${srcdir}"
@@ -33,8 +33,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-DWITH_Xmms=OFF \
- -DWITH_LibMeanwhile=OFF \
- -DWITH_msiLBC=OFF
+ -DWITH_LibMeanwhile=OFF
make
}
@@ -55,7 +54,7 @@ package_kdenetwork-kdnssd() {
package_kdenetwork-kget() {
pkgdesc='Download Manager'
- depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent')
+ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
optdepends=('python2: YouTube plugin')
url="http://kde.org/applications/internet/kget/"
install='kdenetwork.install'
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index c88d69ffe..97aed039f 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 130494 2011-07-06 23:34:26Z andrea $
+# $Id: PKGBUILD 132642 2011-07-25 00:21:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepim-runtime
-pkgver=4.6.1
+pkgver=4.7.0
pkgrel=1
pkgdesc='KDE PIM Runtime Environment'
arch=('i686' 'x86_64' 'mips64el')
-url='http://pim.kde.org'
+url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
depends=('kdepimlibs' 'kdebase-runtime')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
install=${pkgname}.install
-source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'disable-l10n.patch')
-sha1sums=('e416ffd0142c720a779b4eb2e4a841ca751efdce'
- 'd4f8c39911cf288973a30d4b71087906ebb26359')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('00286df86a64eecee64e6cf9199b69d87f62135e')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/disable-l10n.patch
-
cd "${srcdir}"
mkdir build
cd build
diff --git a/extra/kdepim-runtime/disable-l10n.patch b/extra/kdepim-runtime/disable-l10n.patch
deleted file mode 100644
index b49cd54a8..000000000
--- a/extra/kdepim-runtime/disable-l10n.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdepim-runtime-4.6.0/CMakeLists.txt~ 2011-06-10 16:49:12.130427269 +0000
-+++ kdepim-runtime-4.6.0/CMakeLists.txt 2011-06-10 16:56:52.871414776 +0000
-@@ -194,7 +194,3 @@
- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
-
- macro_display_feature_log()
--
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory(po)
diff --git a/extra/kdepim-runtime/kdepim-runtime.install b/extra/kdepim-runtime/kdepim-runtime.install
index c77e68041..ce5c32e1b 100644
--- a/extra/kdepim-runtime/kdepim-runtime.install
+++ b/extra/kdepim-runtime/kdepim-runtime.install
@@ -1,7 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
}
post_upgrade() {
@@ -10,4 +9,4 @@ post_upgrade() {
post_remove() {
post_install
-}
+} \ No newline at end of file
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 797351c17..df93dcef2 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130497 2011-07-06 23:35:24Z andrea $
+# $Id: PKGBUILD 132630 2011-07-25 00:15:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
'kdepim-ktimetracker'
'kdepim-libkdepim'
'kdepim-wizards')
-pkgver=4.6.1
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
@@ -28,24 +28,19 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdepim')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'disable-l10n.patch')
-sha1sums=('aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a'
- 'f52c8d3918e3cd6d8e0180af243333ee2d87d382')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d8a131d886b923b397a50439028ea45880aa9404')
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -p1 -i "${srcdir}"/disable-l10n.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDEPIM_BUILD_MOBILE=OFF
- make
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDEPIM_BUILD_MOBILE=OFF
+ make
}
package_kdepim-akonadiconsole() {
@@ -133,7 +128,6 @@ package_kdepim-kleopatra() {
pkgdesc='Certificate Manager and Unified Crypto GUI'
depends=('kdepim-libkdepim')
url="http://kde.org/applications/utilities/kleopatra/"
- install='kdepim-kleopatra.install'
cd "${srcdir}"/build/kleopatra
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/kleopatra
@@ -144,7 +138,7 @@ package_kdepim-kmail() {
pkgdesc='Mail Client'
depends=('kdepim-libkdepim')
url="http://kde.org/applications/internet/kmail/"
- install='kdepim-kmail.install'
+ install='kdepim.install'
conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -201,7 +195,7 @@ package_kdepim-korganizer() {
pkgdesc='Calendar and Scheduling Program'
depends=('kdepim-libkdepim')
url="http://kde.org/applications/office/korganizer"
- install='kdepim-korganizer.install'
+ install='kdepim.install'
cd "${srcdir}"/build/korganizer
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/korganizer
diff --git a/extra/kdepim/disable-l10n.patch b/extra/kdepim/disable-l10n.patch
deleted file mode 100644
index 0c24ab408..000000000
--- a/extra/kdepim/disable-l10n.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdepim-4.6.1/CMakeLists.txt~ 2011-07-06 19:17:16.801814825 +0000
-+++ kdepim-4.6.1/CMakeLists.txt 2011-07-06 19:17:34.141961840 +0000
-@@ -425,7 +425,3 @@
- endif(NOT QGPGME_FOUND)
- # All done, let's display what we found...
- macro_display_feature_log()
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory(po)
--add_subdirectory(doc-translations)
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 964f26bf9..47ee8ce4e 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 130250 2011-07-04 19:26:55Z andrea $
+# $Id: PKGBUILD 133488 2011-07-28 15:16:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepimlibs
-pkgver=4.6.5
-pkgrel=1
+pkgver=4.7.0
+pkgrel=2
pkgdesc="KDE PIM Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
+depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
install='kdepimlibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6bf82a0934d5a16223f193e848bf3696a40e4820')
+sha1sums=('b5296ef96b94cab5aeb39dabde466e28670c20bd')
build() {
cd ${srcdir}
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index f17c7c32d..b5c2f98fc 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $
+# $Id: PKGBUILD 132844 2011-07-26 13:58:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -72,25 +72,24 @@ pkgname=('kdeplasma-addons-applets-bball'
'kdeplasma-addons-wallpapers-pattern'
'kdeplasma-addons-wallpapers-virus'
'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL')
groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
- 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
+ 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- "kdeobservatory-qwt6.patch")
-sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8'
+ 'kdeobservatory-qwt6.patch')
+sha1sums=('7a153131b84156ab33707c2ee21ffcf7021e099a'
'140b2611fb23aed583c2691a77870e5c48152409')
build() {
- cd ${srcdir}
-
- # qwt 6.0.0 patch
- patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch
-
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/kdeobservatory-qwt6.patch
+
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgbase}-${pkgver} \
@@ -199,7 +198,7 @@ package_kdeplasma-addons-applets-filewatcher() {
package_kdeplasma-addons-applets-frame() {
pkgdesc='Display your favorite pictures'
- depends=('kdebase-workspace' 'kdegraphics-libs')
+ depends=('kdebase-workspace' 'libkexiv2')
cd $srcdir/build/applets/frame
make DESTDIR=$pkgdir install
}
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 9dcdac939..1ae2fd5e4 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=kdeplasma-applets-networkmanagement
epoch=1
-pkgver=git20110713
-_commit=ac332a3e9f6e8ae7427e017b5826e51789437949
+pkgver=git20110726
+_commit=72f48aff1a672af24f66c26dd83b3ac6ee87df5f
pkgrel=1
pkgdesc="KDE control panel and widget network connections"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
install=${pkgname}.install
source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('e367743c72b072ae6d1b6988a3bc4406')
+md5sums=('1176f19901b6667c846a14fc0a04c07f')
build() {
cd "${srcdir}"
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
new file mode 100644
index 000000000..35a8a9b41
--- /dev/null
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 132573 2011-07-25 00:12:17Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdesdk-kate
+pkgname=('kdebase-kwrite'
+ 'kdesdk-kate')
+pkgver=4.7.0
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs ''cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
+ 'pkgbuild-syntax-highlight.patch')
+sha1sums=('8a9685f58c9a7cc2c317ffc4f2bd18b76639a2cd'
+ 'ab0c5d2a796b0f283154799add161c99f48ffcd5')
+
+build() {
+ cd "${srcdir}"/kate-${pkgver}
+ patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../kate-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_KTEXTEDITOR=OFF
+ make
+}
+
+package_kdebase-kwrite() {
+ pkgdesc="Text Editor"
+ depends=('kdebase-runtime')
+ groups=('kde' 'kdebase')
+ install='kdebase-kwrite.install'
+
+ cd "${srcdir}"/build/kwrite
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}"/build/part
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}"/build/doc/kwrite
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdesdk-kate() {
+ pkgdesc="Advanced Text Editor"
+ depends=('kdebase-kwrite')
+ groups=('kde' 'kdesdk')
+ install='kdesdk-kate.install'
+
+ cd "${srcdir}"/build/kate
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}"/build/doc/kate
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdesdk-kate/kdebase-kwrite.install b/extra/kdesdk-kate/kdebase-kwrite.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdesdk-kate/kdebase-kwrite.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/kdesdk/kdesdk-kate.install b/extra/kdesdk-kate/kdesdk-kate.install
index a60d358ce..81ce5c4b0 100644
--- a/extra/kdesdk/kdesdk-kate.install
+++ b/extra/kdesdk-kate/kdesdk-kate.install
@@ -1,6 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
diff --git a/extra/kdelibs/abs-syntax-highlight.patch b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
index 477479a9b..3c43eca0f 100644
--- a/extra/kdelibs/abs-syntax-highlight.patch
+++ b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
@@ -1,12 +1,11 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200
+--- kate-4.6.80/part/syntax/data/bash.xml~ 2011-05-23 21:20:34.295137123 +0000
++++ kate-4.6.80/part/syntax/data/bash.xml 2011-05-23 21:20:54.581993368 +0000
@@ -8,7 +8,7 @@
<!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
<!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
]>
-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 7c51f7b13..b67a61092 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130265 2011-07-04 19:28:07Z andrea $
+# $Id: PKGBUILD 132632 2011-07-25 00:15:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,6 @@ pkgbase=kdesdk
pkgname=('kdesdk-cervisia'
'kdesdk-dolphin-plugins'
'kdesdk-kapptemplate'
- 'kdesdk-kate'
'kdesdk-kcachegrind'
'kdesdk-kdeaccounts-plugin'
'kdesdk-kdepalettes'
@@ -15,25 +14,27 @@ pkgname=('kdesdk-cervisia'
'kdesdk-kompare'
'kdesdk-kpartloader'
'kdesdk-kprofilemethod'
+# 'kdesdk-kspy'
'kdesdk-kstartperf'
'kdesdk-kuiviewer'
'kdesdk-lokalize'
'kdesdk-okteta'
'kdesdk-poxml'
+# 'kdesdk-scheck'
'kdesdk-scripts'
'kdesdk-strigi-analyzer'
'kdesdk-umbrello')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion'
- 'antlr2' 'kdebase-konqueror')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
+ 'kdepimlibs' 'kdebase-lib')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
'fix-python2-path.patch')
-sha1sums=('8cffa0472fbe1096ebfea9bde49aaff76a145b34'
+sha1sums=('619e9e6255888c989997fa02a1b6b97220ae9f11'
'd05ca0231869c484fd3861955d960a60aff7dcfb')
build() {
@@ -87,17 +88,6 @@ package_kdesdk-kapptemplate() {
make DESTDIR=$pkgdir install
}
-package_kdesdk-kate() {
- pkgdesc='Advanced Text Editor'
- depends=('kdebase-runtime' 'kdebase-lib')
- url="http://kde.org/applications/utilities/kate/"
- install='kdesdk-kate.install'
- cd $srcdir/build/kate
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kate
- make DESTDIR=$pkgdir install
-}
-
package_kdesdk-kcachegrind() {
pkgdesc='Visualization of Performance Profiling Data'
depends=('kdebase-runtime' 'python2')
@@ -111,10 +101,10 @@ package_kdesdk-kcachegrind() {
}
package_kdesdk-kdeaccounts-plugin() {
- pkgdesc='KDE Repository Accounts'
- depends=('kdepim-runtime')
- cd $srcdir/build/kdeaccounts-plugin
- make DESTDIR=$pkgdir install
+ pkgdesc='KDE Repository Accounts'
+ depends=('kdepim-runtime')
+ cd $srcdir/build/kdeaccounts-plugin
+ make DESTDIR=$pkgdir install
}
package_kdesdk-kdepalettes() {
@@ -165,6 +155,13 @@ package_kdesdk-kprofilemethod() {
make DESTDIR=$pkgdir install
}
+package_kdesdk-kspy() {
+ pkgdesc='An Object Inspector for Qt/KDE applications'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/kspy
+ make DESTDIR=$pkgdir install
+}
+
package_kdesdk-kstartperf() {
pkgdesc='Startup time measurement tool for KDE applications'
depends=('kdebase-runtime')
@@ -215,6 +212,13 @@ package_kdesdk-poxml() {
make DESTDIR=$pkgdir install
}
+package_kdesdk-scheck() {
+ pkgdesc='An interface style to highlight accel and style guide conflicts'
+ depends=('kdebase-runtime')
+ cd $srcdir/build/scheck
+ make DESTDIR=$pkgdir install
+}
+
package_kdesdk-scripts() {
pkgdesc='KDE SDK scripts'
depends=('python2')
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index b9afc3add..a4137abcd 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130266 2011-07-04 19:28:12Z andrea $
+# $Id: PKGBUILD 132633 2011-07-25 00:15:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,7 @@ pkgbase=kdetoys
pkgname=('kdetoys-amor'
'kdetoys-kteatime'
'kdetoys-ktux')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdetoys')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('0ce43a76f5b7005d60430692ae87421661281f1f')
+sha1sums=('2a4b3838293fedf9a814bf5ef8fbceba7460a8c5')
build() {
cd $srcdir
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index 5f8d96085..c11b250af 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130960 2011-07-09 08:56:36Z andrea $
+# $Id: PKGBUILD 132634 2011-07-25 00:15:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -16,8 +16,8 @@ pkgname=('kdeutils-ark'
'kdeutils-printer-applet'
'kdeutils-superkaramba'
'kdeutils-sweeper')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -25,16 +25,11 @@ groups=('kde' 'kdeutils')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-kcalc-keys.patch')
-sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb'
- 'db87ec4d674a0979fc607f5b438e3e1c403b6eac')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('829eb0935ffd26fa4bb33b6e66841e3599f92c94')
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -p3 -i "${srcdir}"/fix-kcalc-keys.patch
-
- cd "${srcdir}"
+ cd ${srcdir}
mkdir build
cd build
cmake ../${pkgbase}-${pkgver} \
diff --git a/extra/kdeutils/fix-kcalc-keys.patch b/extra/kdeutils/fix-kcalc-keys.patch
deleted file mode 100644
index a8046817c..000000000
--- a/extra/kdeutils/fix-kcalc-keys.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:29 1240129
-+++ trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:58 1240130
-@@ -616,7 +616,7 @@
- <string>7</string>
- </property>
- <property name="shortcut">
-- <string notr="true">7</string>
-+ <string>7</string>
- </property>
- </widget>
- </item>
-@@ -632,7 +632,7 @@
- <string>8</string>
- </property>
- <property name="shortcut">
-- <string notr="true">8</string>
-+ <string>8</string>
- </property>
- </widget>
- </item>
-@@ -648,7 +648,7 @@
- <string>9</string>
- </property>
- <property name="shortcut">
-- <string notr="true">9</string>
-+ <string>9</string>
- </property>
- </widget>
- </item>
-@@ -680,7 +680,7 @@
- <string>4</string>
- </property>
- <property name="shortcut">
-- <string notr="true">4</string>
-+ <string>4</string>
- </property>
- </widget>
- </item>
-@@ -696,7 +696,7 @@
- <string>5</string>
- </property>
- <property name="shortcut">
-- <string notr="true">5</string>
-+ <string>5</string>
- </property>
- </widget>
- </item>
-@@ -712,7 +712,7 @@
- <string>6</string>
- </property>
- <property name="shortcut">
-- <string notr="true">6</string>
-+ <string>6</string>
- </property>
- </widget>
- </item>
-@@ -728,7 +728,7 @@
- <string>1</string>
- </property>
- <property name="shortcut">
-- <string notr="true">1</string>
-+ <string>1</string>
- </property>
- </widget>
- </item>
-@@ -744,7 +744,7 @@
- <string>2</string>
- </property>
- <property name="shortcut">
-- <string notr="true">2</string>
-+ <string>2</string>
- </property>
- </widget>
- </item>
-@@ -760,7 +760,7 @@
- <string>3</string>
- </property>
- <property name="shortcut">
-- <string notr="true">3</string>
-+ <string>3</string>
- </property>
- </widget>
- </item>
-@@ -786,7 +786,7 @@
- <string>0</string>
- </property>
- <property name="shortcut">
-- <string notr="true">0</string>
-+ <string>0</string>
- </property>
- </widget>
- </item>
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index ee5efbdbd..b75c6e4c2 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130268 2011-07-04 19:28:19Z andrea $
+# $Id: PKGBUILD 132635 2011-07-25 00:15:47Z andrea $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=kdewebdev
@@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace'
'kdewebdev-kimagemapeditor'
'kdewebdev-klinkstatus'
'kdewebdev-kommander')
-pkgver=4.6.5
+pkgver=4.7.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
'boost')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b7ec635c438f865337f5ef1e7bbaca23643ed871')
+sha1sums=('bc11c574260f596d20317827f468778df9352037')
build() {
cd $srcdir
diff --git a/extra/kipi-plugins/PKGBUILD b/extra/kipi-plugins/PKGBUILD
deleted file mode 100644
index b3abd8af3..000000000
--- a/extra/kipi-plugins/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 132346 2011-07-23 09:53:11Z andrea $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kipi-plugins
-pkgver=1.9.0
-pkgrel=2
-pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.kipi-plugins.org"
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'libgpod' 'opencv' 'qjson')
-depends=('kdegraphics-libs' 'kdepimlibs')
-source=("http://downloads.sourceforge.net/kipi/$pkgname-$pkgver.tar.bz2")
-optdepends=('imagemagick: for picture manipulation'
- 'qca: for shwup webservice support'
- 'libgpod: send images to ipod'
- 'opencv: red eye removal plugin'
- 'hugin: for expoblending plugin'
- 'qjson: for debianscreenshots plugin')
-install=${pkgname}.install
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=$pkgdir install
-}
-md5sums=('a3200b0ce90251bc631fa90ff0818dc0')
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index c13780881..59ce7b6de 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $
+# $Id: PKGBUILD 133446 2011-07-28 00:46:22Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,24 +37,23 @@ pkgname=(
# 'koffice-kdgantt' # still an empty package
)
pkgver=2.3.3
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64' 'mips64el')
url='http://koffice.kde.org'
license=('GPL' 'LGPL' 'FDL')
makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
- 'libwpg' 'opengtl' 'kdegraphics-libs')
+ 'libwpg' 'opengtl' 'libkdcraw')
[ "$CARCH" = "mips64el" ] && \
makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
- 'libwpg' 'kdegraphics-libs' 'libgsf')
+ 'libwpg' 'libkdcraw')
groups=('koffice')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
'kde4-koffice-libwpg02.patch' 'gcc46.patch')
sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
'69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
-options=(!distcc)
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -65,7 +64,6 @@ build() {
cd "${srcdir}"
mkdir build
cd build
- CXX="g++" \
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@@ -77,9 +75,9 @@ build() {
package_koffice-filters(){
pkgdesc="Filters for the KDE office suite"
- optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
- 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
- 'kdegraphics-libs: support for raw images')
+ optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+ 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
+ 'libkdcraw: support for raw images')
install=filters.install
cd "${srcdir}/build/filters"
make DESTDIR="${pkgdir}" install
diff --git a/extra/konq-plugins/PKGBUILD b/extra/konq-plugins/PKGBUILD
deleted file mode 100644
index 4d6916b41..000000000
--- a/extra/konq-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 112174 2011-03-04 09:55:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=konq-plugins
-pkgver=4.6.1
-pkgrel=1
-pkgdesc="Extra plugins for Konqueror"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('LGPL')
-depends=('kdebase-konqueror' 'tidyhtml')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('38facbeb5627ff6affa0fa0d676d1d19')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-}
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 8da57646f..5060eb640 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 126098 2011-06-01 12:39:10Z giovanni $
+# $Id: PKGBUILD 134004 2011-07-31 16:07:36Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
pkgname=libass
-pkgver=0.9.12
+pkgver=0.9.13
pkgrel=1
pkgdesc="A portable library for SSA/ASS subtitles rendering"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/libass/"
-license=('GPL')
+license=('BSD')
depends=('enca' 'fontconfig' 'libpng')
makedepends=('pkgconfig')
options=(!libtool)
source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('fcef4b048ca2655a14073d692551cd1f')
+md5sums=('d99381922dcbeb7a766d2e7825cca193')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,4 +26,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/libcl/PKGBUILD b/extra/libcl/PKGBUILD
deleted file mode 100644
index 27e0ea272..000000000
--- a/extra/libcl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 131923 2011-07-17 14:52:39Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libcl
-pkgver=1.0
-_pkgver=275.19
-pkgrel=1
-pkgdesc="OpenCL library and ICD loader from NVIDIA"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('gcc-libs')
-license=('custom')
-options=('!strip')
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${_pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
- md5sums=('9e74b1913ff5eb6786600d47b64ba57d')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
- md5sums=('45a6074db3efe961d025afa7a89fa036')
-fi
-build() {
- cd $srcdir
- sh ${_pkg}.run --extract-only
-}
-
-package() {
- cd $srcdir/${_pkg}
- install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
- ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1
- ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
new file mode 100644
index 000000000..d7fc94479
--- /dev/null
+++ b/extra/libkdcraw/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134064 2011-08-01 10:46:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkdcraw
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A C++ interface used to decode RAW picture"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'lcms')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('7c8d7ed8eb18c3f2951d451a2cf46dde9a336216')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkdcraw/libkdcraw.install b/extra/libkdcraw/libkdcraw.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkdcraw/libkdcraw.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
new file mode 100644
index 000000000..e8ae228c0
--- /dev/null
+++ b/extra/libkdeedu/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132582 2011-07-25 00:12:47Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkdeedu
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Libraries used by KDE Education applications"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+replaces=('kdeedu-libkdeedu' 'kdeedu-data')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('fbe1f3a7416d58bd4b0653280181da192e330214')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkdeedu/libkdeedu.install b/extra/libkdeedu/libkdeedu.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkdeedu/libkdeedu.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
new file mode 100644
index 000000000..0307a60c7
--- /dev/null
+++ b/extra/libkexiv2/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134069 2011-08-01 10:49:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkexiv2
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A library to manipulate pictures metadata"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('ee5f524d02c7b1fb29767177890f556fa155c5fc')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
new file mode 100644
index 000000000..29bd12de6
--- /dev/null
+++ b/extra/libkipi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134074 2011-08-01 10:50:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkipi
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="An interface to use kipi-plugins from a KDE application"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('252a55484ee282ada6dd88e8ec4991b2ccdc74f3')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkipi/libkipi.install b/extra/libkipi/libkipi.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkipi/libkipi.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
new file mode 100644
index 000000000..ea1d6f695
--- /dev/null
+++ b/extra/libksane/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134075 2011-08-01 10:50:59Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libksane
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="An image scanning library"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'sane')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('73a3f2c4619ccd8da7c362fc3832c1d52795933f')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libksane/libksane.install b/extra/libksane/libksane.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libksane/libksane.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index 0bd976da0..0059600cb 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 110602 2011-02-20 15:55:20Z andyrtr $
+# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=liblrdf
pkgver=0.4.0
-pkgrel=7
+pkgrel=8
pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lrdf"
-depends=('raptor1' 'ladspa')
+url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
+depends=('raptor' 'ladspa')
makedepends=('pkgconfig')
license=('GPL')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
- md5.patch)
+ md5.patch
+ raptor2.diff)
groups=('ladspa-plugins')
md5sums=('327a5674f671c4b360c6353800226877'
- 'a6d231d052dc188cbc4c1039cf3a2003')
+ 'a6d231d052dc188cbc4c1039cf3a2003'
+ '80e938469da06a178e03107ca5b41e55')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/md5.patch"
+ patch -Np1 -i ${srcdir}/md5.patch
+ patch -Np0 -i ${srcdir}/raptor2.diff
+ autoreconf -vfi
./configure --prefix=/usr
make
}
diff --git a/testing/liblrdf/raptor2.diff b/extra/liblrdf/raptor2.diff
index 77f1ad0e3..77f1ad0e3 100644
--- a/testing/liblrdf/raptor2.diff
+++ b/extra/liblrdf/raptor2.diff
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 9d29118a9..61dd30f38 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $
+# $Id: PKGBUILD 132812 2011-07-26 11:18:58Z ibiru $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgbase=liborigin2
pkgname=('liborigin2' 'liborigin2-docs')
pkgver=20100913
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="http://soft.proindependent.com/liborigin2/"
license=('GPL3')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 614c58ea4..9241e1ad8 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $
+# $Id: PKGBUILD 132809 2011-07-26 11:04:44Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.49
-pkgrel=3
+pkgver=0.6.53
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
makedepends=('python2' 'boost')
source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('a0a0f927e82ab14bb042bd8bbd97c312')
-sha1sums=('c10f4af9dc1d22b331420bc3931036a3d41115cb')
+sha1sums=('b8e5972429091fd0e915fd3eb695b68adbe1f7cc')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 9887f5d3d..52a249faa 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 113455 2011-03-08 17:41:58Z ibiru $
+# $Id: PKGBUILD 132743 2011-07-25 18:52:55Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase=libsigc++
pkgname=('libsigc++' 'libsigc++-docs')
-pkgver=2.2.9
+pkgver=2.2.10
pkgrel=1
arch=(i686 x86_64 'mips64el')
license=('LGPL')
url="http://libsigc.sourceforge.net/"
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2)
options=(!libtool !emptydirs)
-sha256sums=('2f4c083e01d9be377669206bd97090d2e95bc05f2e8d95447c9f9ce92bdfbb63')
+sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index 27b130565..3c8303ed8 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116432 2011-03-23 19:57:46Z eric $
+# $Id: PKGBUILD 133971 2011-07-31 04:15:25Z heftig $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=libsndfile
-pkgver=1.0.24
+pkgver=1.0.25
pkgrel=1
pkgdesc="A C library for reading and writing files containing sampled sound"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('LGPL')
depends=('alsa-lib' 'flac' 'libvorbis')
options=('!libtool')
source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8f823c30c1d8d44830db6ab845d6679e')
-sha1sums=('ade2dad272b52f61bb58aca3a4004b28549ee0f8')
+md5sums=('e2b7bb637e01022c7d20f95f9c3990a2')
+sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 0367ee9c9..e6f271723 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $
+# $Id: PKGBUILD 133504 2011-07-28 18:24:45Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libsoup
pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.2
+pkgver=2.34.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
options=('!libtool' '!emptydirs')
-sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261')
+sha256sums=('c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 24f4aea76..62858d9a7 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $
+# $Id: PKGBUILD 132751 2011-07-25 19:30:07Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
pkgver=0.15.6
-pkgrel=2
+pkgrel=3
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
url="http://www.rasterbar.com/products/libtorrent/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index b9dc6c5fa..b01530d09 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 125889 2011-05-31 13:21:31Z ibiru $
+# $Id: PKGBUILD 133625 2011-07-30 07:35:29Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=libva
-pkgver=1.0.13
+pkgver=1.0.14
pkgrel=1
pkgdesc="Video Acceleration (VA) API for Linux"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,14 +11,11 @@ depends=('libgl' 'libdrm>=2.4.23' 'libxfixes')
makedepends=('mesa')
optdepends=('vdpau-video: VDPAU backend for VA API')
options=('!libtool')
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2
- libva-dont-install-tests.patch)
-md5sums=('221207c386129e02fc05827147af7aa6'
- 'd13d1868f2db99bedec1057bbfbd9c61')
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i "${srcdir}/libva-dont-install-tests.patch"
./autogen.sh
./configure --prefix=/usr \
--enable-i965-driver \
diff --git a/extra/libva/libva-dont-install-tests.patch b/extra/libva/libva-dont-install-tests.patch
deleted file mode 100644
index 97f33e32d..000000000
--- a/extra/libva/libva-dont-install-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur libva-1.0.13.orig/test/basic/Makefile.am libva-1.0.13/test/basic/Makefile.am
---- libva-1.0.13.orig/test/basic/Makefile.am 2011-05-31 13:10:55.021797329 +0000
-+++ libva-1.0.13/test/basic/Makefile.am 2011-05-31 13:11:52.252331062 +0000
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
-+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
- test_07 test_08 test_09 test_10 test_11
-
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-diff -Nur libva-1.0.13.orig/test/decode/Makefile.am libva-1.0.13/test/decode/Makefile.am
---- libva-1.0.13.orig/test/decode/Makefile.am 2011-05-31 13:10:55.021797329 +0000
-+++ libva-1.0.13/test/decode/Makefile.am 2011-05-31 13:12:12.175851534 +0000
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--bin_PROGRAMS = mpeg2vldemo
-+check_PROGRAMS = mpeg2vldemo
-
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-
-diff -Nur libva-1.0.13.orig/test/encode/Makefile.am libva-1.0.13/test/encode/Makefile.am
---- libva-1.0.13.orig/test/encode/Makefile.am 2011-05-31 13:10:55.021797329 +0000
-+++ libva-1.0.13/test/encode/Makefile.am 2011-05-31 13:12:35.499399421 +0000
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--bin_PROGRAMS = h264encode avcenc
-+check_PROGRAMS = h264encode avcenc
-
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-
-diff -Nur libva-1.0.13.orig/test/putsurface/Makefile.am libva-1.0.13/test/putsurface/Makefile.am
---- libva-1.0.13.orig/test/putsurface/Makefile.am 2011-05-31 13:10:55.021797329 +0000
-+++ libva-1.0.13/test/putsurface/Makefile.am 2011-05-31 13:12:48.836190403 +0000
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--bin_PROGRAMS = putsurface
-+check_PROGRAMS = putsurface
-
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index e673596eb..c2f1b8cc5 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130979 2011-07-09 11:00:04Z ronald $
+# $Id: PKGBUILD 133449 2011-07-28 03:31:32Z heftig $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
pkgver=2.0.0
-pkgrel=1
+pkgrel=3
pkgdesc="An advanced open-source document processor."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lyx.org"
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index fd8125c2c..468b0eb11 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127537 2011-06-16 08:28:21Z juergen $
+# $Id: PKGBUILD 132840 2011-07-26 13:33:34Z juergen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
pkgver=5.24.0
-pkgrel=3
+pkgrel=4
pkgdesc="Maxima - a sophisticated computer algebra system"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
if [ "${CARCH}" == "mips64el" ] ; then
depends=('clisp' 'texinfo' 'sh')
else
- depends=('sbcl=1.0.49' 'texinfo' 'sh')
+ depends=('sbcl=1.0.50' 'texinfo' 'sh')
fi
makedepends=('python2')
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 49187e522..458f173f9 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109292 2011-02-07 17:22:01Z ibiru $
+# $Id: PKGBUILD 133031 2011-07-27 01:25:28Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Contributor: Michael Irwin <6d6469@gmail.com>
pkgname=memcached
-pkgver=1.4.5
-pkgrel=3
+pkgver=1.4.6
+pkgrel=1
pkgdesc="A distributed memory object caching system"
arch=(i686 x86_64 'mips64el')
url="http://memcached.org/"
@@ -14,26 +14,22 @@ optdepends=('perl: for memcached-tool usage')
backup=('etc/conf.d/memcached')
source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
memcached.conf
- memcached.sh
- fix-type-punning-issues.patch)
+ memcached.sh)
changelog=ChangeLog
+sha256sums=('4dba55457e4e7f5a3e8255325671bf1e1efbe89ee224fcc6993fcd659956d3f7'
+ '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
+ '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
build() {
- cd $srcdir/$pkgname-$pkgver
- patch -Np1 < $srcdir/fix-type-punning-issues.patch
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
install -D -m 755 scripts/memcached-tool $pkgdir/usr/bin/memcached-tool
- install -D -m 644 $srcdir/$pkgname.conf $pkgdir/etc/conf.d/$pkgname
- install -D -m 755 $srcdir/$pkgname.sh $pkgdir/etc/rc.d/$pkgname
+ install -D -m 644 "$srcdir/memcached.conf" $pkgdir/etc/conf.d/memcached
+ install -D -m 755 "$srcdir/memcached.sh" $pkgdir/etc/rc.d/memcached
}
-
-md5sums=('583441a25f937360624024f2881e5ea8'
- 'bf15619930dadf0c08669566e4aa809c'
- '65f88b69cf3112b178725af121327765'
- 'c4f6da682cb4e7599fede4904021f4ae')
diff --git a/extra/memcached/fix-type-punning-issues.patch b/extra/memcached/fix-type-punning-issues.patch
deleted file mode 100644
index 60bb94110..000000000
--- a/extra/memcached/fix-type-punning-issues.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit df15887584f0025e7b188e408dd3c9f638d68518
-Author: Dan McGee <dan@archlinux.org>
-Date: Tue Nov 2 18:43:00 2010 -0500
-
- Fix type-punning issues exposed with GCC 4.5.1
-
- The errors below are due to pointer magic that isn't allowed if following C
- strict-aliasing rules:
-
- memcached.c: In function ‘complete_incr_bin’:
- memcached.c:1023:16: error: dereferencing type-punned pointer will break
- strict-aliasing rules
- memcached.c:1044:13: error: dereferencing type-punned pointer will break
- strict-aliasing rules
- memcached.c:1061:17: error: dereferencing type-punned pointer will break
- strict-aliasing rules
-
- Fix this by introducing a union type that allows access to the uint64_t
- member as necessary, but doesn't add any additional length to the structure.
- The size remains the same before and after; the only difference is explict
- casts are now refactored into union member accesses and all compilers should
- be happy.
-
- Signed-off-by: Dan McGee <dan@archlinux.org>
-
-diff --git a/memcached.h b/memcached.h
-index 4a7295b..74a6592 100644
---- a/memcached.h
-+++ b/memcached.h
-@@ -77,18 +77,22 @@
- #define TAIL_REPAIR_TIME (3 * 3600)
-
- /* warning: don't use these macros with a function, as it evals its arg twice */
--#define ITEM_get_cas(i) ((uint64_t)(((i)->it_flags & ITEM_CAS) ? \
-- *(uint64_t*)&((i)->end[0]) : 0x0))
--#define ITEM_set_cas(i,v) { if ((i)->it_flags & ITEM_CAS) { \
-- *(uint64_t*)&((i)->end[0]) = v; } }
-+#define ITEM_get_cas(i) (((i)->it_flags & ITEM_CAS) ? \
-+ (i)->data->cas : (uint64_t)0)
-
--#define ITEM_key(item) (((char*)&((item)->end[0])) \
-+#define ITEM_set_cas(i,v) { \
-+ if ((i)->it_flags & ITEM_CAS) { \
-+ (i)->data->cas = v; \
-+ } \
-+}
-+
-+#define ITEM_key(item) (((char*)&((item)->data)) \
- + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-
--#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_suffix(item) ((char*) &((item)->data) + (item)->nkey + 1 \
- + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-
--#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_data(item) ((char*) &((item)->data) + (item)->nkey + 1 \
- + (item)->nsuffix \
- + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-
-@@ -302,7 +306,12 @@ typedef struct _stritem {
- uint8_t it_flags; /* ITEM_* above */
- uint8_t slabs_clsid;/* which slab class we're in */
- uint8_t nkey; /* key length, w/terminating null and padding */
-- void * end[];
-+ /* this odd type prevents type-punning issues when we do
-+ * the little shuffle to save space when not using CAS. */
-+ union {
-+ uint64_t cas;
-+ char end;
-+ } data[];
- /* if it_flags & ITEM_CAS we have 8 bytes CAS */
- /* then null-terminated key */
- /* then " flags length\r\n" (no terminating null) */
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index b6dd3fbad..476d271bc 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131260 2011-07-12 12:02:03Z giovanni $
+# $Id: PKGBUILD 133025 2011-07-26 21:15:25Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=mkvtoolnix
pkgver=4.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index 47ca36d41..b50af4b07 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 72879 2010-03-21 12:12:44Z thomas $
+# $Id: PKGBUILD 133036 2011-07-27 01:53:07Z dan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=mod_fcgid
-pkgver=2.3.5
+pkgver=2.3.6
pkgrel=1
pkgdesc="A FastCGI module for Apache HTTP Server."
license=('APACHE')
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
url="http://httpd.apache.org/mod_fcgid/"
depends=('apache')
source=(http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz)
-sha256sums=('3280fd287659539d577fc3c77a975739c06bb9d0a9cef48275d4beb13c64ef39')
+sha256sums=('e831795498d91cf27a519ea1332c2a92a2a9920b0844d817b2ea7f079056d12b')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 70da42fb6..ead761fa6 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $
+# $Id: PKGBUILD 133474 2011-07-28 13:52:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.14
-pkgrel=2
+pkgver=5.5.15
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.mysql.com/"
@@ -15,7 +15,7 @@ options=('!libtool')
source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
'mysqld'
'my.cnf')
-md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244'
+md5sums=('306b5549c7bd72e8e705a890db0da82b'
'2234207625baa29b2ff7d7b4f088abce'
'1c949c0dbea5206af0db14942d9927b6')
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 2b7321e6c..b348676f3 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111695 2011-02-28 18:26:03Z heftig $
+# $Id: PKGBUILD 132761 2011-07-25 20:47:45Z ibiru $
# Maintainer: Jan de Groot <jan@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=opal
-pkgver=3.8.3
+pkgver=3.10.1
pkgrel=1
pkgdesc="Open Phone Abstraction Library"
arch=(i686 x86_64 'mips64el')
@@ -10,12 +10,13 @@ url="http://www.ekiga.org"
license=('GPL')
depends=('ptlib' 'libtheora' 'x264' 'speex')
makedepends=('ffmpeg')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d775626d786028357a8535fb2ff8f04bce9c1bff51db0e962f0939c2b988767f')
+options=(!makeflags)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('093ff27589f5884af452e6e954ab4da1cc36ff4cc27138230b7d551f22d4f230')
build() {
cd "${srcdir}/opal-${pkgver}"
- CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" \
+ CXXFLAGS="$CXXFLAGS -fpermissive" \
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
}
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index a27d7abfd..06527527a 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123677 2011-05-12 11:19:55Z andrea $
+# $Id: PKGBUILD 133245 2011-07-27 22:51:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=oxygen-gtk
-pkgver=1.0.5
+pkgver=1.1.1
pkgrel=1
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,10 @@ license=('LGPL')
depends=('gtk2')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4a30da4b5442d896c054cfcae783248e')
+md5sums=('8e7454f2a1a97f7580995276d78aa35d')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index a9be13e80..3a50e33ea 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132447 2011-07-24 17:00:59Z giovanni $
+# $Id: PKGBUILD 133576 2011-07-29 18:39:57Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=parted
pkgver=3.0
-pkgrel=2
+pkgrel=3
pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
@@ -13,12 +13,17 @@ depends=('device-mapper' 'e2fsprogs')
makedepends=('pkgconfig')
options=('!libtool')
install=${pkgname}.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ linux.c.patch)
+md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7'
+ '08c942e212424e238271217f52c59706')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # FS#25307
+ patch -Np1 -i ${srcdir}/linux.c.patch
+
./configure --prefix=/usr \
--disable-debug \
--disable-rpath
diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch
new file mode 100644
index 000000000..c9feea142
--- /dev/null
+++ b/extra/parted/linux.c.patch
@@ -0,0 +1,25 @@
+--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200
++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200
+@@ -601,17 +601,17 @@
+ static int kver = -1;
+
+ struct utsname uts;
+- int major;
+- int minor;
+- int teeny;
++ int major = 0;
++ int minor = 0;
++ int teeny = 0;
+
+ if (kver != -1)
+ return kver;
+
+ if (uname (&uts))
+ return kver = 0;
+- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3)
+- return kver = 0;
++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny);
++ assert (n == 2 || n == 3);
+
+ return kver = KERNEL_VERSION (major, minor, teeny);
+ }
diff --git a/extra/partitionmanager/PKGBUILD b/extra/partitionmanager/PKGBUILD
deleted file mode 100644
index 061d656eb..000000000
--- a/extra/partitionmanager/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 124524 2011-05-22 18:37:51Z giovanni $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=partitionmanager
-pkgver=1.0.3
-pkgrel=2
-pkgdesc="A KDE 4 utility that allows you to manage disks, partitions, and file systems."
-arch=('i686' 'x86_64' 'mips64el')
-url="https://sourceforge.net/projects/partitionman/"
-license=('GPL2')
-depends=('kdebase-runtime' 'parted')
-makedepends=('cmake' 'automoc4' 'pkgconfig')
-optdepends=('e2fsprogs: ext2/3/4 support'
- 'xfsprogs: XFS support'
- 'jfsutils: JFS support'
- 'reiserfsprogs: Reiser support'
- 'ntfsprogs: NTFS support'
- 'dosfstools: FAT32 support')
-install=partitionmanager.install
-source=(http://downloads.sourceforge.net/partitionman/$pkgname-$pkgver.tar.bz2)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- mkdir build
- cd build
- cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
-}
-md5sums=('1f987d314c717ba2579c69eeef16336d')
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 1d0bfbead..941f3309b 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120790 2011-04-26 15:17:21Z andrea $
+# $Id: PKGBUILD 134014 2011-08-01 08:35:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-vlc
-pkgver=0.4.0
+pkgver=0.4.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://phonon.kde.org"
@@ -11,11 +11,11 @@ license=('LGPL')
depends=('vlc')
makedepends=('cmake' 'automoc4' 'phonon')
provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.bz2")
-md5sums=('e6ef8c5b54a49610d4dad67754392420')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.bz2")
+md5sums=('bdf188c0d3ad3458e7e39ecad06a500b')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../phonon-backend-vlc-${pkgver} \
@@ -25,6 +25,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index cd316b5e8..bd6391e64 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 116776 2011-03-25 20:41:06Z andrea $
+# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon
-pkgver=4.5.0
+pkgver=4.5.55
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://phonon.kde.org"
license=('LGPL')
pkgdesc="The multimedia framework for KDE4"
-depends=('qt' 'phonon-backend' 'libpulse')
+depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
optdepends=('pulseaudio: PulseAudio support')
makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('32f8d388c18fde2e23dea7bb103f9713')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2")
+#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ce1316c88df988320e75a2b4c3cb8804')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
- cmake ../${pkgname}-${pkgver} \
+ cmake ../${pkgname} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON \
- -DWITH_QZeitgeist=OFF
+ -DCMAKE_SKIP_RPATH=ON
make
}
package(){
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index bb6bd296d..d8e5b3782 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117304 2011-03-30 19:38:26Z ibiru $
+# $Id: PKGBUILD 133630 2011-07-30 09:21:56Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: onestep_ua <onestep@ukr.net>
pkgname=polkit-gnome
pkgver=0.101
-pkgrel=2
+pkgrel=3
pkgdesc="PolicyKit integration for the GNOME desktop"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -15,7 +15,7 @@ options=(!libtool)
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2
polkit-gnome-authentication-agent-1.desktop)
md5sums=('da6aaff473ed80f8958fd6f67a59defe'
- '5668cffbfd031452c86db8adceba79b5')
+ '147a0534adb37452edb4b27cdb2eabb2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
index 2016294e9..fc2acc28d 100644
--- a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ b/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
@@ -85,4 +85,4 @@ Type=Application
Categories=
NoDisplay=true
NotShowIn=KDE;
-AutostartCondition=GNOME3 if-session gnome-fallback
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
new file mode 100644
index 000000000..793db4535
--- /dev/null
+++ b/extra/prison/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 133482 2011-07-28 15:01:26Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=prison
+pkgver=1.0
+pkgrel=1
+pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('qt' 'libdmtx' 'qrencode')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
+md5sums=('8baac61506e37a31482a0df4a5d02cd2')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 863d7c4d2..97a79caac 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111692 2011-02-28 18:24:37Z heftig $
+# $Id: PKGBUILD 132754 2011-07-25 19:54:44Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=ptlib
-pkgver=2.8.3
+pkgver=2.10.1
pkgrel=1
pkgdesc="Portable Windows Library"
arch=(i686 x86_64 'mips64el')
@@ -11,8 +11,8 @@ license=('GPL')
depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
replaces=('pwlib')
conflicts=('pwlib')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('076afde4e53e5fd0989adc344c3741aea8342b105c3e879e2f4f9a42ef36793e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9d5ad6baede23ed893f70a4a21948aa656bf96013f04c5c1ad5154a5dbe13c5f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index 91fc194fb..9c30e7266 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127690 2011-06-17 17:53:00Z andrea $
+# $Id: PKGBUILD 134034 2011-08-01 10:36:25Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: nesl247 <nesl247@gmail.com>
pkgname=pycups
-pkgver=1.9.57
+pkgver=1.9.58
pkgrel=1
pkgdesc="Python CUPS Bindings"
url="http://cyberelk.net/tim/software/pycups/"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libcups' 'python2')
source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('64e328e2c628e41862efe97f04e66da4')
+md5sums=('320d8ce1f10dea9a3dd9054befaf6239')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 8b5709cfb..08b7bd67c 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 120090 2011-04-19 21:33:57Z ibiru $
+# $Id: PKGBUILD 133523 2011-07-28 20:25:13Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=pygobject
pkgname=(pygobject py3gobject pygobject-devel)
-pkgver=2.28.4
+pkgver=2.28.6
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
depends=('glib2' 'gobject-introspection')
makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2
- fix-pycairo-capi-declaration.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+ python3-fix-build.patch
+ python3-fix-maketrans.patch)
options=('!libtool')
url="http://www.pygtk.org/"
-sha256sums=('70e3a05dd5f688e68b5dafa2412cd4fdbc0af83792a5752ef6353c4accf2022c'
- '3757565e6b6306f956d5ad2b414e5238144f3c67a76a5eec9f3b5fef70f08096')
+sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+ 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
+ '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
build() {
cd "${srcdir}"
- patch -Nup0 < "${srcdir}/fix-pycairo-capi-declaration.patch"
cp -a "${pkgbase}-${pkgver}" python2-build
mkdir devel
@@ -31,6 +32,10 @@ build() {
(
cd "${pkgbase}-${pkgver}"
+ #patches available in 2.28 branch but unreleased.
+ patch -Np1 -i "${srcdir}/python3-fix-build.patch"
+ patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+
./configure --prefix=/usr
make
)
diff --git a/extra/pygobject/python3-fix-build.patch b/extra/pygobject/python3-fix-build.patch
new file mode 100644
index 000000000..4cb8cfe57
--- /dev/null
+++ b/extra/pygobject/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/extra/pygobject/python3-fix-maketrans.patch b/extra/pygobject/python3-fix-maketrans.patch
new file mode 100644
index 000000000..f5bc0e77c
--- /dev/null
+++ b/extra/pygobject/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/community/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index a719c25fe..5a816e0b9 100644
--- a/community/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 133485 2011-07-28 15:04:33Z andrea $
# Maintainer: Florian Pritz< flo@xinu.at>
# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
diff --git a/community/qrencode/libpng14.diff b/extra/qrencode/libpng14.diff
index eadf68dde..eadf68dde 100644
--- a/community/qrencode/libpng14.diff
+++ b/extra/qrencode/libpng14.diff
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 44adf0a39..98318e7d2 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,20 +1,27 @@
-# $Id: $
+# $Id: PKGBUILD 134127 2011-08-02 03:47:07Z eric $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: xduugu
# Contributor: Elis Hughes <elishughes@googlemail.com>
+
pkgname=rtmpdump
-pkgver=2.3
-pkgrel=3
+pkgver=2.4
+pkgrel=1
pkgdesc="A tool to download rtmp streams"
arch=('i686' 'x86_64' 'mips64el')
url="http://rtmpdump.mplayerhq.hu/"
-license=('LGPL')
+license=('GPL2' 'LGPL2.1')
depends=('openssl')
-source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz)
-sha256sums=('ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c')
+#source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('2c3b76d46d56180176ef099b8ad50a1608bef1dac35d8cb0b21ceac31b5c0656')
build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's/^install_so.0:.*/& install_base/' librtmp/Makefile
- make prefix=/usr MANDIR="${pkgdir}/usr/share/man" DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}/usr/lib"
+ make prefix=/usr mandir=/usr/share/man DESTDIR="${pkgdir}" install
}
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 03e72f86b..262d81f00 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130383 2011-07-06 08:32:50Z tpowa $
+# $Id: PKGBUILD 133513 2011-07-28 20:13:17Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=samba
pkgname=('smbclient' 'samba')
-pkgver=3.5.9
+pkgver=3.5.10
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=3.5.9
-pkgrel=2
+_realver=3.5.10
+pkgrel=1
arch=(i686 x86_64 mips64el)
url="http://www.samba.org"
license=('GPL3')
@@ -129,7 +129,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
-md5sums=('fc3fe1103cf9d71abe12a8c604f31c76'
+md5sums=('63f092b7a7a7e10121fbf79a492a5ce5'
'a3da19515a234c703876cf850c44e996'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 0ca331123..6b53be48d 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 127534 2011-06-16 08:21:30Z juergen $
+# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
-pkgver=1.0.49
+pkgver=1.0.50
pkgrel=1
pkgdesc="Steel Bank Common Lisp"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
depends=('glibc')
provides=('common-lisp' 'cl-asdf')
+makedepends=('sbcl' 'texinfo')
+[ "$CARCH" = "mips64el" ] && \
makedepends=('clisp' 'texinfo')
source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp"
"mips-arch.h.diff")
-md5sums=('8d15c6af6388fcd9efbd13f301b7ba33'
+md5sums=('74ce9b24516885d066ec4287cde52e8c'
'7ac0c1936547f4278198b8bf7725204d'
'a456535d65d6c5b85b1b646f11455fce')
url="http://www.sbcl.org/"
@@ -34,13 +36,17 @@ build() {
(lambda (features)
(flet ((enable (x) (pushnew x features))
(disable (x) (setf features (remove x features))))
- (disable :sb-thread)
+ (enable :sb-thread)
(disable :largefile)))
EOF
patch -Nup1 < "${srcdir}/mips-arch.h.diff"
+ if [ "$CARCH" = "mips64el" ]; then
sh make.sh clisp
+ else
+ sh make.sh sbcl
+ fi
mkdir -p ${startdir}/pkg/usr
pushd doc/manual
make info || return 1
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
index 52a872c0c..5b40b1484 100644
--- a/extra/skanlite/PKGBUILD
+++ b/extra/skanlite/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 101716 2010-11-30 22:05:56Z andrea $
+# $Id: PKGBUILD 133044 2011-07-27 07:39:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=skanlite
pkgver=0.7
-pkgrel=1
+pkgrel=2
pkgdesc="Image Scanning Application for KDE"
arch=('i686' 'x86_64' 'mips64el')
url='http://kde-apps.org/content/show.php?content=109803'
license=('GPL')
-depends=('kdegraphics-libs')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
+depends=('kdebase-runtime' 'libksane')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
md5sums=('cb256c392210c43d51e317c6a5ba9ad2')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD
index 4b01c3dae..d86c8a099 100644
--- a/extra/slv2/PKGBUILD
+++ b/extra/slv2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120979 2011-04-27 19:40:32Z andrea $
+# $Id: PKGBUILD 131701 2011-07-13 15:39:04Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Leslie P. Polzer <polzer@stardawn.org>
pkgname=slv2
pkgver=0.6.6
-pkgrel=4
+pkgrel=6
pkgdesc="Library for LV2 hosts"
arch=('i686' 'x86_64' 'mips64el')
url="http://drobilla.net/software/slv2"
license=('GPL')
-depends=('redland>=1.0.12' 'lv2core' 'jack')
+depends=('redland>=1.0.13' 'lv2core' 'jack')
makedepends=('python2')
install=$pkgname.install
changelog=$pkgname.changelog
diff --git a/extra/sonata/ChangeLog b/extra/sonata/ChangeLog
index b83211d02..8311a287c 100644
--- a/extra/sonata/ChangeLog
+++ b/extra/sonata/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-26 Angel Velasquez <angvp@archlinux.org>
+ * sonata 1.6.2.1-7:
+ Applied patch to pull lyrics FS#25036
+
2009-03-30 Alexander Fehr <pizzapunk gmail com>
* sonata-1.6-1:
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index d8b4e1468..00fff2cbe 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112050 2011-03-03 12:31:43Z angvp $
+# $Id: PKGBUILD 132792 2011-07-26 09:02:50Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=sonata
pkgver=1.6.2.1
-pkgrel=5
+pkgrel=7
pkgdesc="Elegant GTK+ music client for MPD"
arch=('i686' 'x86_64' 'mips64el')
url="http://sonata.berlios.de/"
@@ -12,12 +12,19 @@ license=('GPL3')
depends=('pygtk' 'python-mpd')
optdepends=('gnome-python-extras: Enhanced system tray support'
'tagpy: Metadata editing support'
- 'zsi: Lyrics fetching support'
'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz)
-md5sums=('0b912325e7175abad3bf6c0edc071e05')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+ info.py.patch)
+changelog=ChangeLog
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+ '595fcf7615035829b264afecb5a1beeb')
build() {
cd "$srcdir/${pkgname}-$pkgver"
- python2 setup.py install --prefix=/usr --root="$pkgdir"
+ patch -Np0 -i $srcdir/info.py.patch
+}
+
+package() {
+ cd "$srcdir/${pkgname}-$pkgver"
+ python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
}
diff --git a/extra/sonata/info.py.patch b/extra/sonata/info.py.patch
new file mode 100644
index 000000000..e95cc3a08
--- /dev/null
+++ b/extra/sonata/info.py.patch
@@ -0,0 +1,15 @@
+--- sonata/info.py 2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ if content.startswith("#REDIRECT [["):
+ addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ content = urllib.urlopen(addr).read()
+- lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
+- if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
+- lyrics = misc.unescape_html(lyrics)
++ content = misc.unescape_html(content)
++ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ lyrics = misc.wiki_to_html(lyrics)
+ lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file:
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 955e7c858..1e57a577a 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130173 2011-07-02 23:43:27Z andrea $
+# $Id: PKGBUILD 133416 2011-07-27 23:26:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=soprano
-pkgver=2.6.50git20110703
+pkgver=2.6.50git20110728
pkgrel=1
pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
makedepends=('cmake' 'openjdk6' 'doxygen')
[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=3a7a527fd07c0d58146eb9e6770ecbcfb6717bc6&fmt=tbz2")
-md5sums=('21ef1f075062ea13d3e55d89d8f92fd2')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=a2f8207cc83fb33253d548eaca8029c8f836addf&fmt=tbz2")
+md5sums=('1d7f99d7d5954fc88e4f7653aa89862e')
build() {
cd "${srcdir}"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 5f2c69b20..74ee51e37 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $
+# $Id: PKGBUILD 133028 2011-07-26 22:29:32Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=source-highlight
pkgver=3.1.4
-pkgrel=3
+pkgrel=4
pkgdesc="Convert source code to syntax highlighted document"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/src-highlite/"
@@ -29,5 +29,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make prefix="${pkgdir}/usr" install
- rm -rf ${pkgdir}/usr/share/info/dir
}
diff --git a/extra/source-highlight/source-highlight.install b/extra/source-highlight/source-highlight.install
index fb764f5ed..4fd1b3005 100644
--- a/extra/source-highlight/source-highlight.install
+++ b/extra/source-highlight/source-highlight.install
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
info_files=(source-highlight.info source-highlight-lib.info)
post_install() {
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index ecfc34576..04417f4a5 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131906 2011-07-17 09:25:51Z andrea $
+# $Id: PKGBUILD 134084 2011-08-01 10:53:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=system-config-printer
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
-pkgver=1.3.4
+pkgver=1.3.5
pkgrel=1
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('8e4b1b1fd078c09769708f09b77cb3ed')
+md5sums=('9d806643f17dc65a492a1d4e8a60f2ec')
build() {
cd "${srcdir}"/${pkgbase}-${pkgver}
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 9548fa5d8..cff9140ab 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 129881 2011-06-29 11:16:17Z ibiru $
+# $Id: PKGBUILD 133089 2011-07-27 19:11:28Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Daniel Balieiro <daniel@balieiro.com>
# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
pkgname=telepathy-gabble
-pkgver=0.12.3
+pkgver=0.12.4
pkgrel=1
pkgdesc="A Jabber/XMPP connection manager for Telepathy"
arch=('i686' 'x86_64' 'mips64el')
url="http://telepathy.freedesktop.org"
groups=('telepathy')
license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'util-linux' 'sqlite3')
+depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
makedepends=('libxslt' 'python2')
options=('!libtool')
source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
install=telepathy-gabble.install
-md5sums=('07d927f1299dbb6bb7ca91ee9dce5d1c')
+md5sums=('428962565d568667d3ff1aa7eee3da51')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/telepathy --with-tls=openssl
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/telepathy
make
}
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 74572d980..ead64c0f5 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 132254 2011-07-22 09:07:47Z ibiru $
+# $Id: PKGBUILD 132830 2011-07-26 12:42:33Z andrea $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
+
pkgname=telepathy-glib
-pkgver=0.14.9
+pkgver=0.15.4
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +15,7 @@ options=('!libtool' '!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('212335854fa14b9d6319525ec7546d2f')
+md5sums=('87521a782de115f938787dc17fe158e1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD b/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
new file mode 100644
index 000000000..52c88c6b8
--- /dev/null
+++ b/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-accounts-kcm-plugins
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Plugins for protocol-specific UI's in the Telepathy Accounts KCM"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('telepathy-kde-accounts-kcm')
+makedepends=('cmake' 'automoc4')
+optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
+ 'telepathy-butterfly: MSN/Windows Live support'
+ 'telepathy-haze: all protocols supported by libpurple')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('340202386d0e0e8e0f18fb3cb856a9055fc200a5')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
new file mode 100644
index 000000000..f92cfc332
--- /dev/null
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-accounts-kcm
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('23c1d3289ecaf4b4361d0ed324a7044cccfae801')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
new file mode 100644
index 000000000..631f41f97
--- /dev/null
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-approver
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="KDE Channel Approver for Telepathy"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdelibs' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('ca4bb9d817354e50af18072736843b961a5dc916')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
new file mode 100644
index 000000000..31df73c28
--- /dev/null
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-contact-list
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy contact list application "
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('1875f88842568f800e08d7d1b391d05152834b3b')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install b/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install
new file mode 100644
index 000000000..c0797237a
--- /dev/null
+++ b/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
new file mode 100644
index 000000000..e76a0f9ec
--- /dev/null
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-filetransfer-handler
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy file transfer handler"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('050eb79ee5a24a102512cf4dbef18b4bf8eb5b50')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD
new file mode 100644
index 000000000..e022f4748
--- /dev/null
+++ b/extra/telepathy-kde-presence-dataengine/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-presence-dataengine
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Plasma dataengine for managing Telepathy account presence"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-plasma' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('afaf16ce63eef9c9a4cdb06b1e88e62f887094bd')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
new file mode 100644
index 000000000..777c2ace0
--- /dev/null
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-send-file
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('telepathy-kde-filetransfer-handler')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('ef49d3008294a6eacad846fbe1c042d59c5c8e69')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-send-file/telepathy-kde-send-file.install b/extra/telepathy-kde-send-file/telepathy-kde-send-file.install
new file mode 100644
index 000000000..78681144b
--- /dev/null
+++ b/extra/telepathy-kde-send-file/telepathy-kde-send-file.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_update() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
new file mode 100644
index 000000000..9996d0e96
--- /dev/null
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-text-ui
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy text chat handler"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('3a9a174acd5b955618a74761a380e951c6dce48a')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}_${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 1569d216e..00efe6491 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126269 2011-06-03 14:35:07Z ibiru $
+# $Id: PKGBUILD 132835 2011-07-26 13:03:28Z andrea $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-qt4
-pkgver=0.6.1
+pkgver=0.7.1
pkgrel=1
pkgdesc="A library for Qt-based Telepathy clients"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,9 +11,9 @@ url="http://telepathy.freedesktop.org/wiki/"
license=('LGPL')
options=('!libtool')
depends=('qt' 'telepathy-farsight')
-makedepends=('libxslt' 'python2' 'cmake')
+makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c429458a365f5114bbc9ea3fc971fc45')
+md5sums=('a609c6e9638e8cf24134b2165fec1c8a')
build() {
cd "${srcdir}"
diff --git a/extra/texlive-bin/09-texlive-fonts.conf b/extra/texlive-bin/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/extra/texlive-bin/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <dir>/usr/share/texmf-dist/fonts/opentype</dir>
- <dir>/usr/share/texmf-dist/fonts/truetype</dir>
- <dir>/usr/local/share/texmf/fonts/opentype</dir>
- <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD
deleted file mode 100644
index 7892a0892..000000000
--- a/extra/texlive-bin/PKGBUILD
+++ /dev/null
@@ -1,348 +0,0 @@
-# Maintainer: francois <francois.archlinux.org>
-
-pkgname=texlive-bin
-pkgver=2010.1
-_luatex_ver=0.66.0
-pkgrel=9
-pkgdesc="TeX Live binaries"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall')
-optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('pdfjam')
-options=('!libtool')
-url='http://tug.org/texlive/'
-source=('texmf.cnf'
- 'fix-fontforge-encoding.patch'
- '09-texlive-fonts.conf'
- 'dvipng-fix-options.patch'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20100926.tar.xz'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20101105.tar.xz'
- #"http://foundry.supelec.fr/gf/download/frsrelease/387/1715/luatex-beta-${_luatex_ver}-source.tar.bz2"
- "ftp://ftp.archlinux.org/other/texlive/luatex-svn4193.tar.xz"
-)
-backup=(etc/texmf/web2c/texmf.cnf \
- etc/texmf/chktex/chktexrc \
- etc/texmf/web2c/mktex.cnf \
- etc/texmf/web2c/updmap.cfg \
- etc/texmf/web2c/fmtutil.cnf \
- etc/texmf/tex/generic/config/language.dat \
- etc/texmf/tex/generic/config/language.def \
- etc/texmf/tex/generic/config/pdftexconfig.tex \
- etc/texmf/ttf2pk/ttf2pk.cfg \
- etc/texmf/dvips/config/config.ps \
- etc/texmf/dvipdfmx/dvipdfmx.cfg \
- etc/texmf/dvipdfm/config/config \
- etc/texmf/xdvi/XDvi)
-
-md5sums=('626f900fb59f036d6fea95f08c74b00b'
- 'bfb9716aa00c86c08cd31e5b32edeb98'
- '393a4bf67adc7ca5df2b386759d1a637'
- '60e405158f53519348d9783e8d420670'
- '0b2c3a4a1b1e4befb90d7fbb5f08a6e9'
- '7ae1400dafdb079dcd08d233de83ec44'
- '523802a23bc174374403415d9cc87946')
-
-build() {
- if [ "${CARCH}" != "i686" ]; then
- export CFLAGS="${CFLAGS} -fPIC"
- export CXXFLAGS="${CXXFLAGS} -fPIC"
- fi
-
- cd $srcdir
- # Building LuaTeX
- #cd luatex-beta-${_luatex_ver}
- cd luatex
- patch -p0 -i ../fix-fontforge-encoding.patch
- mkdir build
- cd build
- ../source/configure --prefix=/usr -C \
- --disable-native-texlive-build \
- --with-banner-add="/Parabola GNU Linux-libre" \
- --enable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-dump-share \
- --disable-ptex \
- --enable-luatex \
- --without-system-ptexenc \
- --with-system-graphite \
- --without-system-icu \
- --without-system-kpathsea \
- --with-system-freetype2 \
- --with-system-poppler \
- --with-freetype2-libdir=/usr/lib \
- --with-freetype2-include=/usr/include/freetype2 \
- --with-system-gd \
- --with-system-libpng \
- --without-system-teckit \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-t1lib \
- --disable-shared \
- --disable-largefile \
- --disable-ipc \
- --without-mf-x-toolkit \
- --without-x
- make
- make -C libs/obsdcompat
- make -C texk/kpathsea
- make -C texk/web2c luatex
-
- cd "$srcdir"
- # this patch removes spurious error message with locale "xx_YY.utf8"
- patch -p0 -i fix-fontforge-encoding.patch
- ## fix dvipng (bug #20157)
- pushd "source/texk/dvipng/dvipng-1.13"
- patch -p0 -i "$srcdir/dvipng-fix-options.patch"
- popd
-
- #############################################################
- ### configure
- cd source
- ## prevent compiling Xdvi with libXp
- sed -i~ 's|-lXp ||' texk/xdvik/configure
- test ! -d Work && mkdir Work
- cd Work
- echo "--> Initial configuration..."
- # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree
- ../configure --prefix=/usr -C \
- --datarootdir=$srcdir/inst/usr/share \
- --datadir=$srcdir/inst/usr/share \
- --mandir=$srcdir/inst/usr/share/man \
- --disable-native-texlive-build \
- --with-banner-add="/Arch Linux" \
- --disable-multiplatform \
- --disable-dialog \
- --disable-psutils \
- --disable-t1utils \
- --disable-bibtexu \
- --disable-xz \
- --with-system-zlib \
- --with-system-pnglib \
- --with-system-ncurses \
- --with-system-t1lib \
- --with-system-gd \
- --with-system-xpdf \
- --with-system-freetype2 \
- --with-system-graphite \
- --with-freetype2-libdir=/usr/lib \
- --with-freetype2-include=/usr/include/freetype2 \
- --with-xdvi-x-toolkit=xaw \
- --disable-dump-share \
- --disable-aleph \
- --disable-luatex \
- --with-clisp-runtime=default \
- --enable-xindy --disable-xindy-rules --disable-xindy-docs
- #############################################################
- ### make
- echo "-------------------------------------------------------"
- echo "--> Building the whole beast ..."
- echo "-------------------------------------------------------"
- make
-}
-
-package() {
- cd $srcdir
- #############################################################
- ### install texmf tree
- echo "-------------------------------------------------------"
- echo "--> installing the texmf tree"
- echo "-------------------------------------------------------"
- install -m755 -d $pkgdir/usr/share
- cp -r texmf $pkgdir/usr/share/
- install -d -m755 $pkgdir/etc/texmf/web2c
- install -d -m755 $pkgdir/etc/texmf/chktex
- install -d -m755 $pkgdir/etc/texmf/dvips/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfmx
- install -d -m755 $pkgdir/etc/texmf/tex/generic/config
- install -d -m755 $pkgdir/etc/texmf/ttf2pk
- install -d -m755 $pkgdir/etc/texmf/xdvi
- install -d -m755 $pkgdir/etc/fonts/conf.avail
- install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
- # replace upstream texmf.cnf with ours
- rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
- install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
- # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
- # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
- ln -s /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
- # fix location of TEXMFCACHE for luatools
- sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua
- ## remove aleph from fmtutil.cnf
- sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
- # move man files to /usr/share/man
- for i in 1 5; do
- install -d -m755 $pkgdir/usr/share/man/man$i
- mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
- done
- # move info files to /usr/share/info
- install -d -m755 $pkgdir/usr/share/info
- mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
- rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
- # copy config files to $TEXMFCONFIG tree
- cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
- $pkgdir/etc/texmf/chktex/
- cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
- $pkgdir/etc/texmf/dvips/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
- $pkgdir/etc/texmf/dvipdfm/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $pkgdir/etc/texmf/dvipdfmx/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
- $pkgdir/etc/texmf/ttf2pk/
- cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
- $pkgdir/etc/texmf/xdvi/
- # remove TL specific warnings in the language.{dat,def} files:
- sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.*
- # clean updmap.cfg
- sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
- sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
-
- #############################################################
- ### install
- cd source
- # fixes for xindy
- find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-
- echo "-------------------------------------------------------"
- echo "--> Proceeding with make install ..."
- echo "-------------------------------------------------------"
- cd Work
- make prefix=$srcdir/inst/usr texmf=$pkgdir/usr/share/texmf install
-
- # restore install location of bin/lib/include
- mv -f $srcdir/inst/usr/bin $pkgdir/usr/bin
- mv -f $srcdir/inst/usr/lib $pkgdir/usr/lib
- mv -f $srcdir/inst/usr/include $pkgdir/usr/include
- # add symlinks to manpages since they are not included in the original texmf tree
- for m in $srcdir/inst/usr/share/man/man1/*; do
- bm=$(basename $m)
- test -f $pkgdir/usr/share/man/man1/$bm || mv -f $m $pkgdir/usr/share/man/man1/
- done
-
- ## install luatex binary
- #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
- install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/
- cd $pkgdir/usr/bin
- /bin/ln -s luatex texlua
- /bin/ln -s luatex texluac
-
- # symlinks in $pkgdir/usr/bin are incorrect
- echo "--> Fixing symlinks for scripts ..."
- for f in $pkgdir/usr/bin/* ; do
- if [ -L $f ]; then
- target=`ls -l "$f" | sed 's/^.\+ -> //'`
- if [[ "$target" == ..* ]]; then
- newtarget=`echo $target | sed -e 's#../#/usr/share/#'`
- rm -f $f
- ln -s $newtarget $f
- test -f $pkgdir/$newtarget && chmod a+x $pkgdir/$newtarget
- fi
- fi
- done
-
- # create symlinks for formats
- echo "--> Create symlinks for TeX formats ..."
- PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
- #############################################################
- # remove dangling symlinks
- _bibtexextra_scripts="bibexport"
- _core_scripts="
-afm2afm
-arlatex
-autoinst
-bundledoc
-cmap2enc
-de-macro
-dviasm
-epstopdf
-findhyph
-font2afm
-fragmaster
-installfont-tl
-latex2man
-latexdiff
-latexdiff-vc
-latexmk
-latexrevise
-listings-ext.sh
-mkjobtexmf
-mkluatexfontdb
-mkt1font
-mptopdf
-ot2kpx
-pdf180
-pdf270
-pdf90
-pdfatfi
-pdfbook
-pdfcrop
-pdfflip
-pdfjam
-pdfjam-pocketmod
-pdfjam-slides3up
-pdfjam-slides6up
-pdfjoin
-pdfnup
-pdfpun
-pfm2kpx
-pkfix
-pkfix-helper
-purifyeps
-repstopdf
-rpdfcrop
-showglyphs
-texcount
-texdiff
-texdirflatten
-texloganalyser
-thumbpdf
-vpl2ovp
-vpl2vpl
-"
- _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
- _langextra_scripts="ebong"
- _langgreek_scripts="mkgrkindex"
- _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
-vpe"
- _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
- _pstricks_scripts="pst2pdf"
- _science_scripts="ulqda"
- for s in \
- ${_bibtexextra_scripts} \
- ${_core_scripts} \
- ${_htmlxml_scripts} \
- ${_langextra_scripts} \
- ${_langgreek_scripts} \
- ${_latexextra_scripts} \
- ${_pictures_scripts} \
- ${_pstricks_scripts} \
- ${_science_scripts} \
- tlmgr; do
- rm -f $pkgdir/usr/bin/$s
- done
- ###################################################################
-}
-
diff --git a/extra/texlive-bin/dvipng-fix-options.patch b/extra/texlive-bin/dvipng-fix-options.patch
deleted file mode 100644
index c0eda1d90..000000000
--- a/extra/texlive-bin/dvipng-fix-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- papersiz.c 2010/03/17 21:40:00 1.16
-+++ papersiz.c 2010/09/29 21:14:40 1.17
-@@ -52,6 +52,7 @@
- while (*q != ',' && *q !='\0')
- q++;
- tmp = tmp*lengthsp[i]*dpi/4736286L; /* sp * dots/in / (sp/in), convert sp to pixels */
-+ *p=q;
- return((int32_t) tmp);
- }
-
diff --git a/extra/texlive-bin/fix-fontforge-encoding.patch b/extra/texlive-bin/fix-fontforge-encoding.patch
deleted file mode 100644
index 8104b3289..000000000
--- a/extra/texlive-bin/fix-fontforge-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200
-+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200
-@@ -495,6 +495,9 @@
- { "Big5HKSCS", e_big5hkscs },
- { "Big5-HKSCS", e_big5hkscs },
- { "UTF-8", e_utf8 },
-+ { "utf-8", e_utf8 },
-+ { "UTF8", e_utf8 },
-+ { "utf8", e_utf8 },
- { "ISO-10646/UTF-8", e_utf8 },
- { "ISO_10646/UTF-8", e_utf8 },
- { "UCS2", e_unicode },
diff --git a/extra/texlive-bin/texmf.cnf b/extra/texlive-bin/texmf.cnf
deleted file mode 100644
index b9d51682a..000000000
--- a/extra/texlive-bin/texmf.cnf
+++ /dev/null
@@ -1,663 +0,0 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
-% Public domain.
-%
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM. This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-% expanded into the compile-time default. Probably not what you want.
-%
-
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex. You can use the path
-% separator as well as the comma for this: /usr/local/{mytex:othertex}
-% also expands to /usr/local/mytex:/usr/local/othertex. We make
-% extensive use of this.
-
-% Part 1: Search paths and directories.
-
-% You can set an environment variable to override TEXMF if you're testing
-% a new TeX tree, without changing anything else.
-%
-% You may wish to use one of the $SELFAUTO... variables here so TeX will
-% find where to look dynamically. See the manual and the definition
-% below of TEXMFCNF.
-
-% The tree containing the runtime files closely related to the specific
-% program version used:
-TEXMFMAIN = /usr/share/texmf
-
-% The main distribution tree:
-TEXMFDIST = /usr/share/texmf-dist
-
-% Our documentation-only tree, arranged by language:
-TEXMFDOC = /usr/share/texmf-doc
-
-% A place for local additions to a "standard" texmf tree.
-% This tree is not used for local configuration maintained by
-% texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = /usr/local/share/texmf
-
-% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% User texmf trees are allowed as follows.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig stores variable runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig stores configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% Now, list all the texmf trees. If you have multiple trees you can
-% use shell brace notation, like this:
-% TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-% The braces are necessary.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-%
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
-% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as format files. Overriding them would be more
-% likely to cause trouble than help. On the other hand, all the
-% standard packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those (although it is generally a
-% source of confusion to have different versions of a package installed,
-% whatever the trees, so try to avoid it).
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files. There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees. These are the trees that are shared by all the users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-
-% Where generated fonts may be written. This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats. For example
-% TEXMFVAR = /var/lib/texmf
-% is used in many distros. In this case, set VARTEXFONTS like this
-% VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files. The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc. We specify paths for all known
-% formats, past or present. Not all of them are built these days.
-
-% Plain TeX. Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/. In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-
-% ConTeXt.
-TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
-
-% jadetex
-TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/. But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi. Must come before the generic settings.
-PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files. This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs. Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files. bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX). An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR//
-
-% Opentype outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS = .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~. These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for fontconfig library, used by Windows versions of
-% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this.
-FONTCONFIG_FILE=fonts.conf
-FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs. If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% Find scripts that are distributed/installed in the texmf tree.
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-%
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one under texmf/web2c.
-%
-% For security reasons, it is better not to include . in this path.
-%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-% Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first. If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried. The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension. A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases. E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}. When enabled fully (set to
-% t), obviously insecure. When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed. Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-%
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p. They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs. All to the best of our knowledge. They also have practical use
-% for being called from TeX.
-%
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-% and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-% without Unix convert it hardly seems worth it, and Windows convert
-% is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any) : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid) : as `r' and disallow going to parent directories, and
-% restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-% TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT. Set to the
-% empty string or 0 to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible. The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default? These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option. Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-% MKTEXTEX = 0
-% MKTEXPK = 0
-% MKTEXMF = 0
-% MKTEXTFM = 0
-% MKTEXFMT = 0
-% MKOCP = 0
-% MKOFM = 0
-
-% Used by makempx to run TeX. We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option. %d is replaced by the line number and %s by
-% the current filename. The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d "%s"
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*. (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0 % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 200000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences. These values apply to TeX.
-pool_size = 3250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size. TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line. As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much. The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767.
- % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500 % simultaneous semantic levels (e.g., groups)
-max_in_open = 15 % simultaneous input files and error insertions,
- % also applies to MetaPost
-param_size = 10000 % simultaneous macro parameters, also applies to MP
-save_size = 50000 % for saving values outside current group
-stack_size = 5000 % simultaneous input sources
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much. Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384 % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size = 250
-glob_str_size = 5000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 5405b0498..0c1529d9e 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132471 2011-07-24 17:40:16Z giovanni $
+# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=udisks
pkgver=1.0.3
-pkgrel=5
+pkgrel=6
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 6e7f7afe5..4b569279a 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 124164 2011-05-17 08:27:15Z bisson $
+# $Id: PKGBUILD 133084 2011-07-27 18:50:53Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=uim
-pkgver=1.7.0
+pkgver=1.7.1
pkgrel=1
pkgdesc='Multilingual input method library'
arch=('i686' 'x86_64' 'mips64el')
url='http://code.google.com/p/uim/'
license=('custom:BSD')
-depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib')
-makedepends=('intltool' 'gettext' 'gnome-panel')
-optdepends=('gnome-panel: gnome applet indicator')
+depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
+makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel')
+optdepends=('qt: immodule and helper applications'
+ 'gtk2: immodule and helper applications'
+ 'gtk3: immodules and helper applications'
+ 'gnome-panel: gnome applet indicator')
options=('!libtool')
source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73')
+sha1sums=('9001955f9efbd3cf23c9ad62c027f44060553fa8')
install=install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/uim \
- --with-anthy-utf8
+ --with-anthy-utf8 \
+ --with-qt4 \
+
make
}
diff --git a/extra/uim/install b/extra/uim/install
index a2d5e00e6..83a9cf391 100644
--- a/extra/uim/install
+++ b/extra/uim/install
@@ -1,7 +1,6 @@
post_install() {
- echo -n "updating gtk.immodules... "
- usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
- echo "done."
+ [[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+ [[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > usr/lib/gtk-3.0/3.0.0/immodules.cache
}
post_upgrade() {
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 013def142..01ad1b14f 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125313 2011-05-25 20:09:55Z heftig $
+# $Id: PKGBUILD 133479 2011-07-28 14:12:10Z heftig $
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Maintainer: tobias [ tobias at archlinux org ]
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
pkgbase=vim
pkgname=(vim gvim vim-runtime)
_topver=7.3
-_patchlevel=206
+_patchlevel=266
pkgver=${_topver}.${_patchlevel}
-__hgrev=e9538cfd0d9c
+__hgrev=124a81f12ca4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom:vim')
@@ -20,7 +20,7 @@ source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_
md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
'e57777374891063b9ca48a1fe392ac05'
'10353a61aadc3f276692d0e17db1478e'
- '4b83e5fe0e534c53daaba91dd1cd4cbb')
+ '63558c0b3509caea0d0f2b9274049c2a')
__hgroot='http://vim.googlecode.com/hg/'
__hgrepo='vim'
diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
index 56fd61b8f..4f0d294ed 100644
--- a/extra/vim/gvim.desktop
+++ b/extra/vim/gvim.desktop
@@ -1,42 +1,64 @@
[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=gVim
-Name[eo]=VIM-fasado
-Name[sv]=gVim
-Name[xx]=xx
-Comment=GTK2 enhanced vim text editor
-Comment[ar]=محرر نصوص
-Comment[bg]=Текст Редактор
-Comment[de]=Texteditor
-Comment[el]=Διορθωτής Κειμένου
-Comment[eo]=Tekstredaktilo
-Comment[et]=Tekstiredaktor
-Comment[eu]=Testu Editorea
-Comment[fi]=Tekstieditori
-Comment[he]=עורך טקסט
-Comment[is]=Textaritill
-Comment[ja]=テキストエディタ
-Comment[lt]=Teksto redaktorius
-Comment[mt]=Editur tat-test
-Comment[pt_BR]=Editor de Texto
-Comment[ro]=Editor de text
-Comment[ru]=редактор
-Comment[sk]=Textový editor
-Comment[sl]=Urejevalnik besedil
-Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Metin Düzenleyici
-Comment[uk]=Редактор текстів
-Comment[vi]=Trình soạn văn bản
-Comment[xx]=xx
-Comment[zh_CN]=文本编辑器
-Comment[zh_TW]=文字編輯器
-GenericName=Text Editor
-Type=Application
-TryExec=gvim
-Exec=gvim %u
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %F
Icon=gvim
-Terminal=false
-X-MultipleArgs=false
-Categories=GTK;Application;Utility;TextEditor;
-MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
+Type=Application
+Terminal=0
+X-XClassHintResName=VIM
+MapNotify=false
+Categories=Utility;TextEditor;
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7dc877239..27ef0826e 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132018 2011-07-19 08:30:36Z giovanni $
+# $Id: PKGBUILD 133933 2011-07-30 16:56:22Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
pkgver=1.1.11
-pkgrel=2
+pkgrel=3
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
@@ -32,6 +32,10 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'libpulse: PulseAudio support')
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
+backup=('usr/share/vlc/http/.hosts'
+ 'usr/share/vlc/http/dialogs/.hosts'
+ 'usr/share/vlc/lua/http/.hosts'
+ 'usr/share/vlc/lua/http/dialogs/.hosts')
options=('!libtool')
install=vlc.install
source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index ec1cd77a8..9a2ef8d08 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $
+# $Id: PKGBUILD 132797 2011-07-26 09:16:15Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Jacobo Arvelo <unix4all@ya.com>
@@ -6,7 +6,7 @@
pkgname=wesnoth
pkgver=1.8.6
-pkgrel=1
+pkgrel=2
pkgdesc="A turn-based strategy game on a fantasy world"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -15,13 +15,16 @@ depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pan
makedepends=('boost')
install=wesnoth.install
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- wesnoth-libpng-1.4.0.patch)
+ wesnoth-libpng-1.4.0.patch
+ wesnoth-1.8.6-boost-foreach.patch)
md5sums=('f1c3179869b01b61e253e74aeb241034'
- 'ca7412ffc4682ef55ddf82d56b0e2f08')
+ 'ca7412ffc4682ef55ddf82d56b0e2f08'
+ 'dc414ab7e1334941548e9db6db9c2460')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../wesnoth-libpng-1.4.0.patch
+ patch -Np1 -i "${srcdir}/wesnoth-libpng-1.4.0.patch"
+ patch -Np1 -i "${srcdir}/wesnoth-1.8.6-boost-foreach.patch"
./autogen.sh
./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
make DESTDIR="${pkgdir}" install-exec
diff --git a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
new file mode 100644
index 000000000..5aee3118c
--- /dev/null
+++ b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
@@ -0,0 +1,70 @@
+--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200
++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200
+@@ -238,6 +238,17 @@ void ttree_view_node::clear()
+
+ struct ttree_view_node_implementation
+ {
++ template<class W, class It>
++ static W* find_at_aux(It begin, It end,
++ const tpoint& coordinate, const bool must_be_active) {
++ for (It it = begin; it != end; ++it) {
++ if(W* widget = it->find_at(coordinate, must_be_active)) {
++ return widget;
++ }
++ }
++ return NULL;
++ }
++
+ template<class W>
+ static W* find_at(
+ typename tconst_duplicator<W, ttree_view_node>::type&
+@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
+ }
+
+ typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
+- foreach(thack& node, tree_view_node.children_) {
+- if(W* widget = node.find_at(coordinate, must_be_active)) {
+- return widget;
+- }
+- }
+-
+- return NULL;
++ return find_at_aux<W>(tree_view_node.children_.begin(),
++ tree_view_node.children_.end(),
++ coordinate, must_be_active);
+ }
+ };
+
+@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
+ return size;
+ }
+
+- foreach(const ttree_view_node& node, children_) {
++ for (boost::ptr_vector<ttree_view_node>::const_iterator it
++ = children_.begin (); it != children_.end (); ++it) {
++ const ttree_view_node& node = *it;
+
+ if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ continue;
+@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
+ size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
+ }
+
+- foreach(const ttree_view_node& node, children_) {
++ for (boost::ptr_vector<ttree_view_node>::const_iterator it
++ = children_.begin (); it != children_.end (); ++it) {
++ const ttree_view_node& node = *it;
+
+ if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ continue;
+@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
+
+ DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
+
+- foreach(const ttree_view_node& node, children_) {
++ for (boost::ptr_vector<ttree_view_node>::const_iterator it
++ = children_.begin (); it != children_.end (); ++it) {
++ const ttree_view_node& node = *it;
+
+ if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ continue;
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index 72dbf4b45..dbbbbf2a7 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 67403 2010-02-06 18:09:00Z giovanni $
+# $Id: PKGBUILD 133999 2011-07-31 15:01:38Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Robert Stoffers <rob1@ubuntu.com>
pkgname=xmlto
-pkgver=0.0.23
+pkgver=0.0.24
pkgrel=1
pkgdesc="Convert xml to many other formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://cyberelk.net/tim/software/xmlto/"
license=('GPL')
-depends=('libxslt>=1.1.24' 'perl-yaml-syck' 'perl-test-pod')
+depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod')
makedepends=('docbook-xsl')
-source=(https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3001d6bb2bbc2c8f6c2301f05120f074')
+source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9d45bbe43f7c66c6bf585ba6635df31a')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
./configure --prefix=/usr \
- --mandir=/usr/share/man || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "$srcdir/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
}
diff --git a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
deleted file mode 100644
index 545072807..000000000
--- a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-commit 327ec9a67af653467b670115ebb3e26b00183c1d
-Author: Sebastian Trueg <trueg@kde.org>
-Date: Thu Jul 7 17:33:23 2011 +0200
-
- Throttle the IndexCleaner the same way we do with the IndexScheduler.
-
- BUG: 276593
-
-diff --git a/nepomuk/services/strigi/indexcleaner.cpp b/nepomuk/services/strigi/indexcleaner.cpp
-index 5c604ab..9198d0b 100644
---- a/nepomuk/services/strigi/indexcleaner.cpp
-+++ b/nepomuk/services/strigi/indexcleaner.cpp
-@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary;
-
-
- Nepomuk::IndexCleaner::IndexCleaner(QObject* parent)
-- : KJob(parent)
-+ : KJob(parent),
-+ m_delay(0)
- {
- setCapabilities( Suspendable );
- }
-@@ -268,7 +269,7 @@ void Nepomuk::IndexCleaner::slotRemoveResourcesDone(KJob* job)
-
- QMutexLocker lock(&m_stateMutex);
- if( !m_suspended ) {
-- clearNextBatch();
-+ QTimer::singleShot(m_delay, this, SLOT(clearNextBatch()));
- }
- }
-
-@@ -313,4 +314,9 @@ bool Nepomuk::IndexCleaner::doResume()
- return true;
- }
-
-+void Nepomuk::IndexCleaner::setDelay(int msecs)
-+{
-+ m_delay = msecs;
-+}
-+
- #include "indexcleaner.moc"
-diff --git a/nepomuk/services/strigi/indexcleaner.h b/nepomuk/services/strigi/indexcleaner.h
-index e1c38ca..bf0713e 100644
---- a/nepomuk/services/strigi/indexcleaner.h
-+++ b/nepomuk/services/strigi/indexcleaner.h
-@@ -41,6 +41,16 @@ namespace Nepomuk {
- virtual bool doSuspend();
- virtual bool doResume();
-
-+ public slots:
-+ /**
-+ * Set the delay between the cleanup queries.
-+ * Used for throtteling the cleaner to not grab too
-+ * many resources. Default is 0.
-+ *
-+ * \sa IndexScheduler::setIndexingSpeed()
-+ */
-+ void setDelay(int msecs);
-+
- private slots:
- void clearNextBatch();
- void slotRemoveResourcesDone(KJob* job);
-@@ -52,6 +62,7 @@ namespace Nepomuk {
-
- QMutex m_stateMutex;
- bool m_suspended;
-+ int m_delay;
- };
- }
-
-diff --git a/nepomuk/services/strigi/indexscheduler.cpp b/nepomuk/services/strigi/indexscheduler.cpp
-index 3c92657..f3c6c36 100644
---- a/nepomuk/services/strigi/indexscheduler.cpp
-+++ b/nepomuk/services/strigi/indexscheduler.cpp
-@@ -208,7 +208,7 @@ Nepomuk::IndexScheduler::IndexScheduler( QObject* parent )
- : QObject( parent ),
- m_suspended( false ),
- m_indexing( false ),
-- m_speed( FullSpeed )
-+ m_indexingDelay( 0 )
- {
- m_cleaner = new IndexCleaner(this);
- connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
-@@ -266,7 +266,13 @@ void Nepomuk::IndexScheduler::setSuspended( bool suspended )
- void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed )
- {
- kDebug() << speed;
-- m_speed = speed;
-+ m_indexingDelay = 0;
-+ if ( speed != FullSpeed ) {
-+ m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
-+ }
-+ if( m_cleaner ) {
-+ m_cleaner->setDelay(m_indexingDelay);
-+ }
- }
-
-
-@@ -481,11 +487,7 @@ bool Nepomuk::IndexScheduler::analyzeDir( const QString& dir_, Nepomuk::IndexSch
- void Nepomuk::IndexScheduler::callDoIndexing()
- {
- if( !m_suspended ) {
-- uint delay = 0;
-- if ( m_speed != FullSpeed ) {
-- delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
-- }
-- QTimer::singleShot( delay, this, SLOT(doIndexing()) );
-+ QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) );
- }
- }
-
-diff --git a/nepomuk/services/strigi/indexscheduler.h b/nepomuk/services/strigi/indexscheduler.h
-index 9ae1f18..8756206 100644
---- a/nepomuk/services/strigi/indexscheduler.h
-+++ b/nepomuk/services/strigi/indexscheduler.h
-@@ -121,8 +121,6 @@ namespace Nepomuk {
- SnailPace
- };
-
-- IndexingSpeed currentSpeed() const { return m_speed; }
--
- public Q_SLOTS:
- void suspend();
- void resume();
-@@ -226,7 +224,7 @@ namespace Nepomuk {
- QString m_currentFolder;
- KUrl m_currentUrl;
-
-- IndexingSpeed m_speed;
-+ int m_indexingDelay;
- IndexCleaner* m_cleaner;
- };
-
diff --git a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
deleted file mode 100644
index 31ea4a606..000000000
--- a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
-===================================================================
---- kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241345)
-+++ kdemultimedia/kmix/backends/mixer_pulse.cpp (revision 1241346)
-@@ -754,7 +754,12 @@
- return;
- }
- addDevice((*map)[index]);
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- }
-
- void Mixer_PULSE::removeWidget(int index)
-@@ -778,7 +783,12 @@
- {
- delete *iter;
- m_mixDevices.erase(iter);
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- return;
- }
- }
-@@ -799,7 +809,12 @@
- delete *iter;
- m_mixDevices.erase(iter);
- }
-- emit controlsReconfigured(_mixer->id());
-+ // Do not emit directly to ensure all connected slots are executed
-+ // in their own event loop.
-+ QMetaObject::invokeMethod(this,
-+ "controlsReconfigured",
-+ Qt::QueuedConnection,
-+ Q_ARG(QString, _mixer->id()));
- }
-
- void Mixer_PULSE::addDevice(devinfo& dev)
-@@ -990,7 +1005,7 @@
- kDebug(67100) << "Using PulseAudio for mixer: " << m_mixerName;
- m_isOpen = true;
- }
--
-+
- return 0;
- }
-
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD
index 96b874fd5..0751fb372 100644
--- a/libre/aif-libre/PKGBUILD
+++ b/libre/aif-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
pkgname=aif-libre
-pkgver=2011.07.20
+pkgver=2011.08.1
pkgrel=1
pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)"
arch=('any')
@@ -34,3 +34,4 @@ build() {
}
# vim:set ts=2 sw=2 et:
+md5sums=('f4e5215cd27354e3915878d4c2bcee09')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e219e6b91..b76294ad4 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,56 +1,69 @@
# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgbase="linux-libre"
+# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+
+pkgbase=linux-libre
pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux-libre}
_basekernel=3.0
pkgver=${_basekernel}
-pkgrel=2
-makedepends=('xmlto' 'docbook-xsl')
-arch=(i686 x86_64)
-license=('GPL2')
+pkgrel=4
+arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org"
-options=(!strip)
-source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl')
+options=('!strip')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz"
# the main kernel config files
- config.i686 config.x86_64
+ 'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
- ${pkgname}.preset
- boot-logo.patch
- fix-i915.patch)
+ "${pkgname}.preset"
+ 'boot-logo.patch'
+ 'fix-i915.patch'
+ 'change-default-console-loglevel.patch')
md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
- 'd4805e76a2b0c883ed8269f3dad601fb'
- 'fbefcac9fecd28e4d2e12dbee77f6602'
- '18341549f090fc403d7f4c47fff395a4'
+ '66dff8af6b00eb8d054b2af85aaa5ef7'
+ '1a98b8b8f2140ac8f95c3814cba8cc95'
+ '7af24ad1789055e991b1e1f090ff276d'
'04b21c79df0a952c22d681dd4f4562df'
- 'fe04ae7274a1f76ba2a8054aec60ef08')
+ '263725f20c0b9eb9c353040792d644e5'
+ '7396b811db06dec0250a1a098f527b83')
build() {
+ cd "${srcdir}/linux-${_basekernel}"
+
+ # Add freedo as boot logo
+ patch -Np1 -i "${srcdir}/boot-logo.patch"
- cd ${srcdir}/linux-$pkgver
- #patch -p1 -i ${srcdir}/patch-${pkgver}
-
# fix #19234 i1915 display size
- patch -Np1 -i ${srcdir}/fix-i915.patch
+ patch -Np1 -i "${srcdir}/fix-i915.patch"
-# Add freedo as boot logo
- patch -Np1 -i ${srcdir}/boot-logo.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"
- cat $srcdir/config.$CARCH > ./.config # simpler
+ cat "$srcdir/config.$CARCH" > ./.config # simpler
if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
fi
- # remove the extraversion from Makefile
+
+ # remove the "-libre" extraversion from Makefile
+ sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
+
+ # remove the sublevel from Makefile
# this ensures our kernel version is always 3.X-LIBRE
# this way, minor kernel updates will not break external modules
# we need to change this soon, see FS#16702
- sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
+ sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+
# 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
@@ -58,13 +71,16 @@ build() {
#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
}
@@ -72,44 +88,49 @@ build() {
package_linux-libre() {
pkgdesc="The Linux-libre Kernel and modules"
groups=('base')
- backup=(etc/mkinitcpio.d/${pkgname}.preset)
depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+ optdepends=('crda: to set the correct wireless channels of your country')
provides=('kernel26' "linux=$pkgver")
conflicts=('kernel26' 'linux')
replaces=('kernel26' 'linux')
+ backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=${pkgname}.install
- optdepends=('crda: to set the correct wireless channels of your country')
+
+ cd "${srcdir}/linux-${_basekernel}"
KARCH=x86
- cd ${srcdir}/linux-${pkgver}
+
# 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}
+
+ 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 -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
+ install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
# install fallback mkinitcpio.conf file and preset file for kernel
- install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
+ 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
+ -i "${startdir}/${pkgname}.install"
sed \
-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
+ -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
# remove build and source links
- rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
+ rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
# add compat symlink for the kernel image
- ln -sf vmlinuz-${pkgname} ${pkgdir}/boot/vmlinuz26${_kernelname}
+ ln -sf vmlinuz-${pkgname} "${pkgdir}/boot/vmlinuz26${_kernelname}"
# remove the firmware
- rm -rf ${pkgdir}/lib/firmware
+ rm -rf "${pkgdir}/lib/firmware"
# gzip -9 all modules to safe 100MB of space
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
}
package_linux-libre-headers() {
@@ -117,111 +138,130 @@ package_linux-libre-headers() {
provides=('kernel26-headers' "linux-headers=$pkgver")
conflicts=('kernel26-headers' 'linux-headers')
replaces=('kernel26-headers' 'linux-headers')
- mkdir -p ${pkgdir}/lib/modules/${_kernver}
- cd ${pkgdir}/lib/modules/${_kernver}
+
+ mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+
+ cd "${pkgdir}/lib/modules/${_kernver}"
ln -sf ../../../usr/src/linux-${_kernver} build
- cd ${srcdir}/linux-$pkgver
+
+ cd "${srcdir}/linux-${_basekernel}"
install -D -m644 Makefile \
- ${pkgdir}/usr/src/linux-${_kernver}/Makefile
+ "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
install -D -m644 kernel/Makefile \
- ${pkgdir}/usr/src/linux-${_kernver}/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
+ "${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 net pcmcia scsi sound trace video xen; do
- cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
+ 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/
+ 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
+ cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+ cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
- # 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
+ 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"
- mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel
+ cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
- 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/
+ 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/
+
+ 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/
+ 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
+ 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
+ "${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
+ 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/
+ 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/
+ 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/
- # add dvb headers for external modules
- # in reference to:
+ 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/
+ 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
+ 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/
+ 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
+ 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
+ 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 {} \;
+ 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
+ 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,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+ rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
}
package_linux-libre-docs() {
@@ -229,11 +269,16 @@ package_linux-libre-docs() {
provides=('kernel26-docs' "linux-docs=$pkgver")
conflicts=('kernel26-docs' 'linux-docs')
replaces=('kernel26-docs' 'linux-docs')
- cd ${srcdir}/linux-$pkgver
- mkdir -p $pkgdir/usr/src/linux-$_kernver
- mv Documentation $pkgdir/usr/src/linux-$_kernver
- find $pkgdir -type f -exec chmod 444 {} \;
- find $pkgdir -type d -exec chmod 755 {} \;
+
+ cd "${srcdir}/linux-${_basekernel}"
+
+ mkdir -p "$pkgdir/usr/src/linux-$_kernver"
+ cp -r 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
+ rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
new file mode 100644
index 000000000..cec208ee8
--- /dev/null
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -0,0 +1,13 @@
+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/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index d9568618a..8bd0cbe40 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -5770,4 +5770,3 @@ CONFIG_CPU_RMAP=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
-
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index e4b5086d5..8d40df599 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -5511,4 +5511,3 @@ CONFIG_CPU_RMAP=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
-
diff --git a/libre/linux-libre/fix-i915.patch b/libre/linux-libre/fix-i915.patch
index 96654047b..3b631361a 100644
--- a/libre/linux-libre/fix-i915.patch
+++ b/libre/linux-libre/fix-i915.patch
@@ -24,4 +24,3 @@ index dc83b7a..c8f67bf 100644
I915_WRITE(TV_CTL, tv_ctl);
I915_WRITE(TV_DAC, tv_dac);
POSTING_READ(TV_DAC);
-
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 67907bf56..51e78dc60 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.0.0-LIBRE
+KERNEL_VERSION=3.0-LIBRE
post_install () {
# updating module dependencies
@@ -12,9 +12,9 @@ post_install () {
mkinitcpio -p linux-libre${KERNEL_NAME}
# add compat symlinks for the initramfs images
- ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26-libre${KERNEL_NAME}.img
+ ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
- boot/kernel26-libre${KERNEL_NAME}-fallback.img
+ boot/kernel26${KERNEL_NAME}-fallback.img
}
post_upgrade() {
@@ -53,7 +53,6 @@ post_upgrade() {
post_remove() {
# also remove the compat symlinks
- rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}.img
- rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}-fallback.img
+ rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
+ rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
}
-
diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset
index e000cf584..7af90ba7a 100644
--- a/libre/linux-libre/linux-libre.preset
+++ b/libre/linux-libre/linux-libre.preset
@@ -6,10 +6,9 @@ ALL_kver="/boot/vmlinuz-linux-libre"
PRESETS=('default' 'fallback')
#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux.img"
+default_image="/boot/initramfs-linux-libre.img"
#default_options=""
#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback.img"
+fallback_image="/boot/initramfs-linux-libre-fallback.img"
fallback_options="-S autodetect"
-
diff --git a/multilib-testing/lib32-freetype2/PKGBUILD b/multilib-testing/lib32-freetype2/PKGBUILD
deleted file mode 100644
index 16c362357..000000000
--- a/multilib-testing/lib32-freetype2/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 51965 2011-07-18 18:21:09Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.5
-pkgrel=1
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(x86_64)
-license=('GPL')
-url="http://freetype.sourceforge.net"
-depends=('lib32-zlib' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
- freetype-2.3.0-enable-spr.patch
- freetype-2.2.1-enable-valid.patch)
-md5sums=('90428a6d8ec4876cd1eb94858c2a59b0'
- '816dc8619a6904a7385769433c0a8653'
- '214119610444c9b02766ccee5e220680')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/freetype-${pkgver}"
- patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
- patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-
- ./configure --prefix=/usr --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/freetype-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib-testing/lib32-freetype2/freetype-2.2.1-enable-valid.patch b/multilib-testing/lib32-freetype2/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f..000000000
--- a/multilib-testing/lib32-freetype2/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
-
- # OpenType table validation. Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/multilib-testing/lib32-freetype2/freetype-2.3.0-enable-spr.patch b/multilib-testing/lib32-freetype2/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28a4..000000000
--- a/multilib-testing/lib32-freetype2/freetype-2.3.0-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
diff --git a/multilib-testing/lib32-mesa/git_fixes.patch b/multilib-testing/lib32-mesa/git_fixes.patch
deleted file mode 100644
index 22372b328..000000000
--- a/multilib-testing/lib32-mesa/git_fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 08 Jul 2011 22:30:48 +0000
-Subject: i965/gen4: Fix GPU hangs since the program streaming change.
-
-This was tricky. We were doing a use-before-initialize of
-grf_reg_count, but the value usually got overwritten anyway -- when we
-didn't have to do a relocation (typical), or on gen5 when we didn't
-have relocations at all.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
-Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
----
-diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
-index d5010a2..179ca19 100644
---- a/src/mesa/drivers/dri/i965/brw_vs_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
-@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
- memset(vs, 0, sizeof(*vs));
-
- /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
-+ vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
- vs->thread0.kernel_start_pointer =
- brw_program_reloc(brw,
- brw->vs.state_offset +
-@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
- brw->vs.prog_offset +
- (vs->thread0.grf_reg_count << 1)) >> 6;
-
-- vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
- vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
- /* Choosing multiple program flow means that we may get 2-vertex threads,
- * which will have the channel mask for dwords 4-7 enabled in the thread,
---
-cgit v0.8.3-6-g21f6
diff --git a/multilib-testing/lib32-mesa/linking_fix.patch b/multilib-testing/lib32-mesa/linking_fix.patch
deleted file mode 100644
index 34ed7902d..000000000
--- a/multilib-testing/lib32-mesa/linking_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001
-From: Chia-I Wu <olv@lunarg.com>
-Date: Wed, 13 Jul 2011 07:25:46 +0000
-Subject: targets/egl-static: fix a linking error
-
-rbug is always linked in and it needs libpthread.
----
-diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
-index 832d7ba..69e7eec 100644
---- a/src/gallium/targets/egl-static/Makefile
-+++ b/src/gallium/targets/egl-static/Makefile
-@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
- -I$(TOP)/src/egl/main \
- -D_EGL_MAIN=_eglMain
- egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a
--egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm
-+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread
-
- # EGL platforms
- ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD
new file mode 100644
index 000000000..238f6b3b1
--- /dev/null
+++ b/testing/archboot/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=archboot
+pkgver=2011.08
+pkgrel=1
+pkgdesc="Advanced, modular arch boot/install image creation utility"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.archlinux.org/"
+depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1')
+optdepends=('grub2-bios: for grub2 support'
+ 'grub2-efi-i386: for grub2 support'
+ 'grub2-efi-x86_64: for grub2 support'
+ 'efibootmgr: for grub2 support'
+)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
+backup=('etc/archboot/allinone.conf'
+ 'etc/archboot/allinone-lts.conf'
+ 'etc/archboot/default.conf'
+ 'etc/archboot/default-ftp.conf'
+ 'etc/archboot/default-pxelinux.conf'
+ 'etc/archboot/default-ftp-pxelinux.conf'
+ 'etc/archboot/presets/allinone'
+ 'etc/archboot/presets/allinone-lts'
+ 'etc/archboot/presets/isolinux'
+ 'etc/archboot/presets/isolinux-ftp'
+ 'etc/archboot/presets/syslinux'
+ 'etc/archboot/presets/syslinux-ftp'
+ 'etc/archboot/presets/pxelinux'
+ 'etc/archboot/presets/pxelinux-ftp'
+)
+install=archboot.install
+
+### to bump the depends list use this:
+#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
+
+build()
+{
+ cd $srcdir/$pkgname-$pkgver-$pkgrel
+ mv * $pkgdir/
+ # vmware-detect
+ cd $startdir/src
+ gcc -o vmware-detect vmware-detect.c
+ install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
+}
+md5sums=('4b71827d6767c99c1144df9215108349'
+ '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/testing/archboot/archboot.install b/testing/archboot/archboot.install
new file mode 100644
index 000000000..315f97d7e
--- /dev/null
+++ b/testing/archboot/archboot.install
@@ -0,0 +1,20 @@
+# 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
+post_install() {
+ cat << EOF
+ARCHBOOT usage:
+---------------
+--> Main config files were installed to '/etc/archboot/'.
+ Preset files were installed to '/etc/archboot/presets'.
+ Modify them to your needs.
+--> Use the preset files as config file of your build tool:
+ mkisolinux, mksyslinux or mkpxelinux
+--> For Allinone ISOs use archboot-allinone.sh
+EOF
+}
+
+post_upgrade() {
+ post_install $1
+}
diff --git a/testing/archboot/vmware-detect.c b/testing/archboot/vmware-detect.c
new file mode 100644
index 000000000..d242a388d
--- /dev/null
+++ b/testing/archboot/vmware-detect.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+int main() {
+ unsigned char idtr[6];
+ asm("sidt %0" : "=m" (idtr));
+ if(0xff==idtr[5])
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+}
diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD
deleted file mode 100644
index 5780fa159..000000000
--- a/testing/ardour/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z schiv $
-# Maintainer: tobias <tobias@archlinux.org>
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
-# one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions
-
-pkgname=ardour
-pkgver=2.8.11
-pkgrel=5
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
-arch=('i686' 'x86_64')
-url="http://ardour.org/"
-license=('GPL')
-depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat'
- 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6')
- # -rubberband -libgnomecanvas(+libgnomecanvasmm)
- # +soundtouch (these +/- changes are for SYSLIBS)
- # liblrdf versioned for https://bugs.archlinux.org/task/25005
- # slv2 versioned for https://bugs.archlinux.org/task/25060
-makedepends=('scons' 'boost' 'pkg-config')
-changelog=${pkgname}.changelog
-source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
- ${pkgname}.desktop
- gcc46.patch
- raptor2.patch)
-md5sums=('f451a8d0abc133a1700c3932e07a5612'
- '8aeaf433ebf781733db48e5a16b0c4da'
- 'd709add59911d099c813162448e4db99'
- 'a26a9bec0968fa0630c70f70c54f67de')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # gcc 4.6 compatibility
- # http://tracker.ardour.org/view.php?id=3771
- patch -Np1 -i "$srcdir/gcc46.patch"
-
- # raptor2 compatibility
- # https://bugs.archlinux.org/task/25060
- # http://tracker.ardour.org/view.php?id=4179
- patch -Np0 -i "$srcdir/raptor2.patch"
-
- sed -i '/-O3/d' SConstruct
-
- # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves
- # TODO: report upstream
- scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
- PREFIX="/usr" \
- DIST_LIBDIR="lib" \
- FREEDESKTOP=0 \
- FREESOUND=1 \
- SYSLIBS=1 \
- DESTDIR="${pkgdir}"
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- scons PREFIX="/usr" \
- FREEDESKTOP=0 \
- FREESOUND=1 \
- SYSLIBS=1 \
- DESTDIR="${pkgdir}" install
-
- # install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/${pkgname}.desktop" \
- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/ardour/ardour.changelog b/testing/ardour/ardour.changelog
deleted file mode 100644
index 47c111f01..000000000
--- a/testing/ardour/ardour.changelog
+++ /dev/null
@@ -1,49 +0,0 @@
-15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-5:
- Resolve previous issues with slv2 & redland/rasqal/raptor
- - just needed rebuild of slv2 against latest redland suite [1]
- - also needed ardour buildsystem patch for raptor2 [1][2]
- - bring back support for slv2
-
- [1] https://bugs.archlinux.org/task/25060
- [2] http://tracker.ardour.org/view.php?id=4179
-
-9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-4:
- Fix build failures and runtime segfaults
- - gcc 4.6 patch
- - enable SYSLIBS due to ardour sigc++ issues
- - remove slv2 dep due to ardour rasqal incompatibility [1][2]
-
- [1] https://bugs.archlinux.org/task/25060
- [2] https://ardour.org/node/4301
-
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-2 :
- raptor rebuild
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-1 :
- Testing build.
- Removed libgnomecanvasmm depend (ardour internal).
- Removed soundtouch makedepend (ardour internal, unneded).
- Added new depends
- - slv2 ("LV2" plug-ins support)
- - rubberband (can "do more" than soundtouch)
- - libgnomecanvas
- Not using SYSLIBS because upstream does not support it.
- Namcap warnings can be ignored; they're ardour internals.
-
- * PKGBUILD :
- Minor cosmetic ammendments.
-
- * ardour.changelog :
- Added this changelog.
- Only important changes will be logged.
-
- * ardour.install :
- Removed install scriptlet; old and deprecated information.
diff --git a/testing/ardour/ardour.desktop b/testing/ardour/ardour.desktop
deleted file mode 100644
index b50f6c952..000000000
--- a/testing/ardour/ardour.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Ardour
-Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
-Terminal=false
-Type=Application
-X-MultipleArgs=false
-Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
diff --git a/testing/ardour/gcc46.patch b/testing/ardour/gcc46.patch
deleted file mode 100644
index d01610d1d..000000000
--- a/testing/ardour/gcc46.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc
---- ardour-2.8.11.old/libs/ardour/enums.cc 2010-04-20 13:28:37.000000000 -0400
-+++ ardour-2.8.11/libs/ardour/enums.cc 2011-02-13 11:23:02.000000000 -0500
-@@ -31,7 +31,8 @@
-
- using namespace std;
- using namespace PBD;
--using namespace ARDOUR;
-+namespace ARDOUR
-+{
-
- void
- setup_enum_writer ()
-@@ -362,3 +363,5 @@ setup_enum_writer ()
- REGISTER (_Track_FreezeState);
-
- }
-+
-+}
-diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h
---- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h 2009-03-26 10:25:40.000000000 -0400
-+++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h 2011-02-09 21:41:04.000000000 -0500
-@@ -19,6 +19,7 @@
- #define RUBBERBAND_API_MAJOR_VERSION 2
- #define RUBBERBAND_API_MINOR_VERSION 0
-
-+#include <cstddef>
- #include <vector>
-
- /**
-diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc
---- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc 2009-02-24 07:38:19.000000000 -0500
-+++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc 2011-02-13 11:23:24.000000000 -0500
-@@ -177,7 +177,7 @@ wiimote_discovery:
- std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
-
- while (!wiimote_handle && !main_thread_quit) {
-- bdaddr = *BDADDR_ANY;
-+ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
- callback_thread_registered_for_ardour = false;
- wiimote_handle = cwiid_open(&bdaddr, 0);
-
diff --git a/testing/dash/PKGBUILD b/testing/dash/PKGBUILD
deleted file mode 100644
index 8105f73a3..000000000
--- a/testing/dash/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 132155 2011-07-21 15:03:34Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=dash
-pkgver=0.5.7
-pkgrel=1
-pkgdesc="A POSIX compliant shell that aims to be as small as possible"
-arch=('i686' 'x86_64')
-url="http://gondor.apana.org.au/~herbert/dash/"
-license=('BSD')
-groups=('base')
-depends=('glibc')
-source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix=""
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # license
- install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD
new file mode 100644
index 000000000..6870e3d94
--- /dev/null
+++ b/testing/dialog/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 133064 2011-07-27 11:49:01Z stephane $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=dialog
+pkgver=1.1_20110707
+pkgrel=1
+pkgdesc="A tool to display dialog boxes from shell scripts"
+arch=('i686' 'x86_64')
+url="http://invisible-island.net/dialog/"
+license=('LGPL2.1')
+depends=('ncurses')
+source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
+md5sums=('34d01aaacbb2932b77774e6c1eec8d2a')
+sha1sums=('31e0e3c40cd51629cc802d7ee0b1a4e1ada90f00')
+
+build() {
+ 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
+}
diff --git a/testing/freetype2/PKGBUILD b/testing/freetype2/PKGBUILD
deleted file mode 100644
index a23428db0..000000000
--- a/testing/freetype2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 131135 2011-07-11 07:14:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=freetype2
-pkgver=2.4.5
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://freetype.sourceforge.net"
-depends=('zlib')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
- freetype-2.3.0-enable-spr.patch
- freetype-2.2.1-enable-valid.patch)
-md5sums=('90428a6d8ec4876cd1eb94858c2a59b0'
- '816dc8619a6904a7385769433c0a8653'
- '214119610444c9b02766ccee5e220680')
-
-build() {
- cd "${srcdir}/freetype-${pkgver}"
- patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
- patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-
- ./configure --prefix=/usr
- make
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/freetype2/freetype-2.2.1-enable-valid.patch b/testing/freetype2/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f..000000000
--- a/testing/freetype2/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
-
- # OpenType table validation. Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/testing/freetype2/freetype-2.3.0-enable-spr.patch b/testing/freetype2/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28a4..000000000
--- a/testing/freetype2/freetype-2.3.0-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD
deleted file mode 100644
index 3593bb5e7..000000000
--- a/testing/gpgme/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $
-# 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=1
-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' 'gnupg2')
-install=${pkgname}.install
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make || return 1
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
- rm ${pkgdir}/usr/share/info/dir
- gzip ${pkgdir}/usr/share/info/*
-}
-md5sums=('90afa8436ce2b2683c001c824bd22601')
diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install
deleted file mode 100644
index b54620d9a..000000000
--- a/testing/gpgme/gpgme.install
+++ /dev/null
@@ -1,18 +0,0 @@
-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/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index 559a3ac22..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 132371 2011-07-23 18:02:25Z dan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="A Linux kernel packet control tool"
-arch=('i686' 'x86_64')
-license=('GPL2')
-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
- empty-filter.rules
- empty-mangle.rules
- empty-nat.rules
- empty-raw.rules)
-backup=(etc/conf.d/iptables)
-sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3'
- '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
- '2db68906b603e5268736f48c8e251f3a49da1d75'
- '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
- '9907f9e815592837abc7fa3264a401567b7606ab'
- 'cdb830137192bbe002c6d01058656bd053ed0ddd'
- 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
- 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
- '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
- '7db53bb882f62f6c677cc8559cff83d8bae2ef73')
-
-build() {
- 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
-
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
- --with-xtlibdir=/usr/lib/iptables \
- --enable-devel --enable-libipq
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- 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
-
- mkdir -p "${pkgdir}/var/lib/iptables"
- install -m644 empty-{filter,mangle,nat,raw}.rules ${pkgdir}/var/lib/iptables/
-}
diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/testing/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- 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
- fi
- if ck_daemon ip6tables; then
- /usr/sbin/ip6tables-restore < $IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP6 Tables"
- if ! ck_daemon ip6tables; then
- fail=0
- for table in $(cat /proc/net/ip6_tables_names); do
- ip6tables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP6 Tables"
- /usr/sbin/ip6tables-save >$IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables b/testing/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/testing/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IPTABLES_CONF" ]; then
- echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv4/ip_forward
- fi
- if ck_daemon iptables; then
- /usr/sbin/iptables-restore < $IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP Tables"
- if ! ck_daemon iptables; then
- fail=0
- for table in $(cat /proc/net/ip_tables_names); do
- iptables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP Tables"
- /usr/sbin/iptables-save >$IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/testing/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# 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/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules
deleted file mode 100644
index e1604cc36..000000000
--- a/testing/iptables/simple_firewall.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -p icmp -j ACCEPT
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
--A INPUT -i lo -j ACCEPT
--A INPUT -p tcp -j REJECT --reject-with tcp-reset
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
--A INPUT -j REJECT --reject-with icmp-proto-unreachable
-COMMIT
diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD
index c533d134e..ec50d99c8 100644
--- a/testing/keyutils/PKGBUILD
+++ b/testing/keyutils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 132103 2011-07-20 10:53:54Z stephane $
+# $Id: PKGBUILD 133067 2011-07-27 11:57:16Z stephane $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=keyutils
-pkgver=1.5.1
+pkgver=1.5.2
pkgrel=1
pkgdesc="Linux Key Management Utilities"
arch=(i686 x86_64)
@@ -10,6 +10,7 @@ license=('GPL2' 'LGPL2.1')
depends=('glibc' 'sh')
backup=(etc/request-key.conf)
source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('19811ee31f683058a9aae3e6a3a23a7f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,4 +22,3 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('3ab62455a37a20f73b2d6cc794aaba13')
diff --git a/testing/libcap/PKGBUILD b/testing/libcap/PKGBUILD
new file mode 100644
index 000000000..6afa61fee
--- /dev/null
+++ b/testing/libcap/PKGBUILD
@@ -0,0 +1,26 @@
+#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=libcap
+pkgver=2.22
+pkgrel=1
+pkgdesc="POSIX 1003.1e capabilities"
+arch=('i686' 'x86_64')
+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=('b4896816b626bea445f0b3849bdd4077')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install
+ rm ${pkgdir}/lib/*.a
+ chmod 755 ${pkgdir}/lib/libcap.so.${pkgver}
+}
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
deleted file mode 100644
index 1d7c56fb8..000000000
--- a/testing/libedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 132376 2011-07-23 23:23:53Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Roman Cheplyaka <roma@ro-che.info>
-
-pkgname=libedit
-pkgver=20110709_3.0
-pkgrel=1
-pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
-arch=('i686' 'x86_64')
-url='http://www.thrysoee.dk/editline/'
-license=('BSD')
-depends=('ncurses')
-options=('!libtool')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('63a62e0c52a0a2b3c933f400039e24724498cfb4')
-
-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 -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
-}
diff --git a/testing/libgssglue/PKGBUILD b/testing/libgssglue/PKGBUILD
new file mode 100644
index 000000000..d651bf612
--- /dev/null
+++ b/testing/libgssglue/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 133594 2011-07-29 21:01:43Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=libgssglue
+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')
+depends=('glibc')
+makedepends=('pkgconfig' 'autoconf')
+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=('48aaad11b7371ba3270faa322202c038'
+ '080be866717e4e06fa6f7d6f43cb395a')
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+
+ # Configuration
+ install -Dm644 "$srcdir"/gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf
+ # install license
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/libgssglue/COPYING
+}
diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf
new file mode 100644
index 000000000..9a832ee1b
--- /dev/null
+++ b/testing/libgssglue/gssapi_mech.conf
@@ -0,0 +1,22 @@
+# Example /etc/gssapi_mech.conf file
+#
+# GSSAPI Mechanism Definitions
+#
+# This configuration file determines which GSS-API mechanisms
+# the gssd code should use
+#
+# NOTE:
+# The initiaiization function "mechglue_internal_krb5_init"
+# is used for the MIT krb5 gssapi mechanism. This special
+# function name indicates that an internal function should
+# be used to determine the entry points for the MIT gssapi
+# mechanism funtions.
+#
+# 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
+#
+# 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/testing/liblrdf/PKGBUILD b/testing/liblrdf/PKGBUILD
deleted file mode 100644
index 17236fa71..000000000
--- a/testing/liblrdf/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=liblrdf
-pkgver=0.4.0
-pkgrel=8
-pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
-depends=('raptor' 'ladspa')
-makedepends=('pkgconfig')
-license=('GPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
- md5.patch
- raptor2.diff)
-groups=('ladspa-plugins')
-md5sums=('327a5674f671c4b360c6353800226877'
- 'a6d231d052dc188cbc4c1039cf3a2003'
- '80e938469da06a178e03107ca5b41e55')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/md5.patch
- patch -Np0 -i ${srcdir}/raptor2.diff
- autoreconf -vfi
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/liblrdf/md5.patch b/testing/liblrdf/md5.patch
deleted file mode 100644
index 1c43b12e9..000000000
--- a/testing/liblrdf/md5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- liblrdf-0.4.0.orig/src/lrdf_md5.h
-+++ liblrdf-0.4.0/src/lrdf_md5.h
-@@ -32,6 +32,15 @@
- #ifndef __MD5_H__
- #define __MD5_H__
-
-+/* Change function names to prevent symbol conflicts */
-+#define md5_init _lrdf_md5_init
-+#define md5_buffer _lrdf_md5_buffer
-+#define md5_sig_from_string _lrdf_md5_sig_from_string
-+#define md5_finish _lrdf_md5_finish
-+#define md5_process _lrdf_md5_process
-+#define md5_sig_to_string _lrdf_md5_sig_to_string
-+#define md5_get_result _lrdf_md5_get_result
-+
- /*
- * Size of a standard MD5 signature in bytes. This definition is for
- * external programs only. The MD5 routines themselves reference the
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index 067a5654e..96155e9b3 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132066 2011-07-19 19:12:28Z andyrtr $
+# $Id: PKGBUILD 134107 2011-08-01 16:13:27Z stephane $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgbase="libreoffice"
@@ -35,8 +35,8 @@ pkgname=('libreoffice-common'
'libreoffice-extension-validator'
'libreoffice-extension-watch-window'
'libreoffice-extension-wiki-publisher')
-_LOver=3.4.2.2
-pkgver=3.4.2rc2
+_LOver=3.4.2.3
+pkgver=3.4.2
pkgrel=1
arch=('i686' 'x86_64')
#_LO_tree="3.4"
@@ -58,8 +58,8 @@ makedepends=( # makedepends
# translate-toolkit - todo move them to extra to allow --with-system-foo builds
# http://download.documentfoundation.org/mirrors/all.html
# http://wiki.documentfoundation.org/Mirrors
-#_mirror="http://download.documentfoundation.org/libreoffice/src"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src/"
+_mirror="http://download.documentfoundation.org/libreoffice/src"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
_additional_source_url="http://hg.services.openoffice.org/binaries"
source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -92,7 +92,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+ http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
@@ -142,67 +142,69 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('65371f11bcd48b5d4aed68c429784747'
- '566b7a01605517acd3d0e302614ce22d'
- '4becc4d081d59a68355cadf8a2dbfd38'
- 'a426818aee9927d09e26d951594e2d2b'
- '609633d4b6c94b14c53f28a7cdf822e5'
- '31d9f27c33fd60764941a80715aaedde'
- '86a3cb09af51802ce1856db7cd9977cc'
- '8296feb6f6583b7247ef0345e2ac0e8e'
- '610661f26b8997b858dec836cb6b638d'
- '2aa17ecc635f94e647c487ca826431ac'
- 'c802f43a5a099106b2833d27fb0e1324'
- 'b1306ffbd5aafa2ff3e03ce4932b33d7'
- '439816b03287e0c4b3c3175f2bf9bcee'
- '61f45fe2c82439543fc5b39ce9868c77'
- '3b0c3300c90f50983042de7d704078eb'
- '01f0f8ae20201eb08889ebd14a14af79'
- '95245eb754a75a4912ceaeaf9b69a00c'
- '4af50ce86fd2ad3eca30ef2e93c59988'
- 'eaa63fc295b57c834db1b839d215027c'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'fdb27bfe2dbe2e7b57ae194d9bf36bab'
- 'ada24d37d8d638b3d8a9985e80bc2978'
- '2a177023f9ea8ec8bd00837605c5df1b'
- 'a7983f859eafb2677d7ff386a023bc40'
- '3c219630e4302863a9a83d0efde889db'
- '2ae988b339daec234019a7066f96733e'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- 'af3c3acf618de6108d65fcdc92b492e1'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- '18f577b374d60b3c760a3a3350407632'
- '0ff7d225d087793c8c2c680d77aac3e7'
- '185d60944ea767075d27247c3162b3bc'
- 'b4cae0700aa1c2aef7eb7f345365e6f1'
- '90401bca927835b6fbae4a707ed187c8'
- 'f02578f5218f217a9f20e9c30e119c6a'
- '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
- '41c9b65ad60af4b3255bbecdfef11736'
- '451ccf439a36a568653b024534669971'
- 'bbdd5639ada63e3130761daaecae1a10'
- '23bd75552206dfcd8fd4e29137dcac84'
- 'b8cbca7b3363e6ca2d02bc0ba2b63904'
- 'b632bdd25649cc4067bcb410bae23d2b'
- '9d60b6cfa3ef1926848710bbcd11115b'
- 'dbaafd21de055e582d92d7d32fe9da13'
- 'b7b2d0e04e142f26dd96119c80757d1f'
- 'bc228237108cab7745897a9f466b6d39'
- 'eee273f501ff45dc5f1365e78c6d57c0'
- '43b145db28e6c0d73578ae6fd35e510d'
- '37638431e7e40baf2e47966ebb9bc0e9')
+
+md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2
+ '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2
+ 'f106511220a2a0b2a45571cf7605953a' #libreoffice-bootstrap-3.4.2.3.tar.bz2
+ '20854b5961b8b0b38219376a93ecf362' #libreoffice-calc-3.4.2.3.tar.bz2
+ '5799be1571289b7c17bd8fd2020c00f6' #libreoffice-components-3.4.2.3.tar.bz2
+ '75ca9da214abe072e37fb4d19fc2c34f' #libreoffice-extensions-3.4.2.3.tar.bz2
+ '73aa766053ea8f4c84dd0a76c0888f18' #libreoffice-extras-3.4.2.3.tar.bz2
+ '4416cc18cfa84f61eae905ff441a18d0' #libreoffice-filters-3.4.2.3.tar.bz2
+ 'ecfd57a3dfd0ce230e5837b5099a0d5a' #libreoffice-help-3.4.2.3.tar.bz2
+ '40e23531e95617c7fe91e7025f007a91' #libreoffice-impress-3.4.2.3.tar.bz2
+ 'bd2027fc2160798728e49d0fd331d163' #libreoffice-libs-core-3.4.2.3.tar.bz2
+ '9a948012496fcd27c31f755314ff98e3' #libreoffice-libs-extern-3.4.2.3.tar.bz2
+ 'a5a8d9080492968eef001314093cd82d' #libreoffice-libs-extern-sys-3.4.2.3.tar.bz2
+ '810aa9e69b96af0f4de2e6d74b7b1847' #libreoffice-libs-gui-3.4.2.3.tar.bz2
+ '45de04dcbb6f6ff7474110ee982da7b8' #libreoffice-postprocess-3.4.2.3.tar.bz2
+ '545d65e92b674d354dd6511ee552d23f' #libreoffice-sdk-3.4.2.3.tar.bz2
+ '99e306957e38ce5e68deed9568874be6' #libreoffice-testing-3.4.2.3.tar.bz2
+ '2e7277588ef610b7a06953c59dc77c9b' #libreoffice-ure-3.4.2.3.tar.bz2
+ '281973e517d3b5626f5eedd746378fcc' #libreoffice-writer-3.4.2.3.tar.bz2
+ '1f24ab1d39f4a51faf22244c94a6203f' #1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+ '35c94d2df8893241173de1d16b6034c0' #35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ '798b2ffdc8bcfe7bca2cf92b62caf685' #798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ 'fdb27bfe2dbe2e7b57ae194d9bf36bab' #fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+ 'ada24d37d8d638b3d8a9985e80bc2978' #ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+ '2a177023f9ea8ec8bd00837605c5df1b' #2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+ 'a7983f859eafb2677d7ff386a023bc40' #a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ '3c219630e4302863a9a83d0efde889db' #3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+ '2ae988b339daec234019a7066f96733e' #2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+ '2c9b0f83ed5890af02c0df1c1776f39b' #2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+ 'af3c3acf618de6108d65fcdc92b492e1' #af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624' #eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ '39bb3fcea1514f1369fcfc87542390fd' #39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ '3404ab6b1792ae5f16bbd603bd1e1d03' #3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ '97b2d4dba862397f446b217e2b623e71' #97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ 'f94d9870737518e3b597f9265f4e9803' #f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ '8ce2fcd72becf06c41f7201d15373ed9' #8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ 'd8bd5eed178db6e2b18eeed243f85aa8' #d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ '3bdf40c0d199af31923e900d082ca2dd' #3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ 'ace6ab49184e329db254e454a010f56d' #ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ 'db60e4fde8dd6d6807523deb71ee34dc' #db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ 'ba2930200c9f019c2d93a8c88c651a0f' #ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ '18f577b374d60b3c760a3a3350407632' #18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+ '0ff7d225d087793c8c2c680d77aac3e7' #0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+ '185d60944ea767075d27247c3162b3bc' #185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ 'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+ '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+ 'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+ '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
+ '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
+ '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
+ 'bbdd5639ada63e3130761daaecae1a10' #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
+ '23bd75552206dfcd8fd4e29137dcac84' #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
+ 'b8cbca7b3363e6ca2d02bc0ba2b63904' #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
+ 'b632bdd25649cc4067bcb410bae23d2b' #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
+ '9d60b6cfa3ef1926848710bbcd11115b' #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
+ 'dbaafd21de055e582d92d7d32fe9da13' #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
+ 'b7b2d0e04e142f26dd96119c80757d1f' #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
+ 'bc228237108cab7745897a9f466b6d39' #buildfix_boost.diff
+ 'eee273f501ff45dc5f1365e78c6d57c0' #buildfix_ct2n.diff
+ '43b145db28e6c0d73578ae6fd35e510d' #vbahelper.visibility.patch
+ '37638431e7e40baf2e47966ebb9bc0e9' #scp2-more-reasonable-file-access-rights.diff
+ )
build() {
@@ -233,6 +235,9 @@ build() {
patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+ # Temporary workaround to avoid build failure in ct2n
+ mv ${srcdir}/451ccf439a36a568653b024534669971-ConvertTextToNumber{_,-}1.3.2.oxt
+
# unset C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
# unset CFLAGS
diff --git a/testing/libtirpc/PKGBUILD b/testing/libtirpc/PKGBUILD
index 80ae3d14c..6035cdb2c 100644
--- a/testing/libtirpc/PKGBUILD
+++ b/testing/libtirpc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132087 2011-07-20 00:51:34Z eric $
+# $Id: PKGBUILD 133597 2011-07-29 21:03:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libtirpc
pkgver=0.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Transport Independent RPC library (SunRPC replacement)"
arch=('i686' 'x86_64')
url="http://libtirpc.sourceforge.net/"
@@ -12,17 +12,26 @@ depends=('libgssglue')
backup=('etc/netconfig')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
- libtirpc-0.2.1-fortify.patch)
+ libtirpc-0.2.1-fortify.patch
+ libtirpc-0.2.3rc1.patch
+ libtirpc-fix-segfault-0.2.2.patch)
md5sums=('74c41c15c2909f7d11d9c7bfa7db6273'
- '2e5c067f1651469dfbbdc91d3c9c60e8')
+ '2e5c067f1651469dfbbdc91d3c9c60e8'
+ 'ac2a1657b44f4a99c37d8265b05b9133'
+ '5a3ab55934cad4e8b38fc90c54756472')
build() {
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
+ make
}
package() {
diff --git a/testing/libtirpc/libtirpc-0.2.3rc1.patch b/testing/libtirpc/libtirpc-0.2.3rc1.patch
new file mode 100644
index 000000000..d57a59e1f
--- /dev/null
+++ b/testing/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/testing/libtirpc/libtirpc-fix-segfault-0.2.2.patch b/testing/libtirpc/libtirpc-fix-segfault-0.2.2.patch
new file mode 100644
index 000000000..8a04c16de
--- /dev/null
+++ b/testing/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/testing/linux/PKGBUILD b/testing/linux/PKGBUILD
deleted file mode 100644
index 4d4228508..000000000
--- a/testing/linux/PKGBUILD
+++ /dev/null
@@ -1,240 +0,0 @@
-# $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.0
-pkgver=${_basekernel}
-pkgrel=1
-makedepends=('xmlto' 'docbook-xsl')
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.kernel.org"
-options=(!strip)
-source=(ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.bz2
- #ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-${pkgver}.bz2
- # the main kernel config files
- config config.x86_64
- # standard config files for mkinitcpio ramdisk
- ${pkgname}.preset
- fix-i915.patch)
-md5sums=('398e95866794def22b12dfbc15ce89c0'
- 'fc6aae0fb4d70feff92ec762d29dee45'
- 'fd5a1712ddea696eee5255de2d854218'
- 'eb14dcfd80c00852ef81ded6e826826a'
- '263725f20c0b9eb9c353040792d644e5')
-
-build() {
-
- cd ${srcdir}/linux-$_basekernel
- #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
-
- # fix #19234 i1915 display size
- patch -Np1 -i ${srcdir}/fix-i915.patch
-
- if [ "$CARCH" = "x86_64" ]; then
- cat ../config.x86_64 >./.config
- else
- cat ../config >./.config
- fi
- if [ "${_kernelname}" != "" ]; then
- sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
- fi
- # remove the extraversion from Makefile
- # this ensures our kernel version is always 3.X-ARCH
- # this way, minor kernel updates will not break external modules
- # we need to change this soon, see FS#16702
- sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile
- # 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')
- backup=(etc/mkinitcpio.d/${pkgname}.preset)
- depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
- provides=('kernel26')
- conflicts=('kernel26')
- replaces=('kernel26')
- install=${pkgname}.install
- optdepends=('crda: to set the correct wireless channels of your country')
-
- KARCH=x86
- cd ${srcdir}/linux-${_basekernel}
- # 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 -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
-
- # install fallback mkinitcpio.conf file and preset file for kernel
- install -m644 -D ${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|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}
- # add compat symlink for the kernel image
- ln -sf vmlinuz-${pkgname} ${pkgdir}/boot/vmlinuz26${_kernelname}
- # remove the firmware
- rm -rf ${pkgdir}/lib/firmware
- # gzip -9 all modules to safe 100MB of space
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_linux-headers() {
- pkgdesc="Header files and scripts for building modules for linux kernel"
- provides=('kernel26-headers')
- conflicts=('kernel26-headers')
- replaces=('kernel26-headers')
- mkdir -p ${pkgdir}/lib/modules/${_kernver}
- cd ${pkgdir}/lib/modules/${_kernver}
- ln -sf ../../../usr/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 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/
- # add dvb headers for external modules
- # in reference to:
- # 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,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,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
- mv 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/testing/linux/config b/testing/linux/config
deleted file mode 100644
index 7fb68fccc..000000000
--- a/testing/linux/config
+++ /dev/null
@@ -1,5772 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.0 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_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=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_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# 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 is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
-# 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_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# 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_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP 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=y
-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_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_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
-
-#
-# 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 is not set
-# 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_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=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_INLINE_SPIN_UNLOCK is not set
-# 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_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=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_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_CMPXCHG_LOCAL=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_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
-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_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_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_EFI=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=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-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=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_PCIEAER=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=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# 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=m
-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_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-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_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_IOV=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=m
-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_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=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_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_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=m
-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_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_EVENTS=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_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_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_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_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_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 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=y
-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_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=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_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=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_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
-
-#
-# 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_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# CONFIG_HAMRADIO is not set
-# 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_L2CAP=y
-CONFIG_BT_SCO=y
-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_RFKILL_REGULATOR=m
-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_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-
-#
-# 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_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE 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_RAM=m
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-CONFIG_MTD_SST25L=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# 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_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-CONFIG_PROC_DEVICETREE=y
-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_SPI=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=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_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_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=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
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=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_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-# CONFIG_PCH_PHUB is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=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
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# 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_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-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_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_VMWARE_PVSCSI=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_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_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-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_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
-CONFIG_TCM_FC=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_OHCI_DEBUG=y
-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_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-CONFIG_DNET=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_AT1700=m
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=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_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-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=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_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=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_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_IWLAGN=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-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_SPI=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_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
-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_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=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
-
-#
-# 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_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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN 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
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=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
-# CONFIG_PHONE is not set
-
-#
-# 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=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=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_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=m
-CONFIG_MOUSE_SYNAPTICS_I2C=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_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=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_WM831X=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=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_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=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_AD714X_SPI=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-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_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=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_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_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-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=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-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_GPIO=m
-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
-CONFIG_I2C_EG20T=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=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=y
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# 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
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_GPIO=m
-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_ADCXX=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=m
-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_LM70=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_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=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_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=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_SCH5627=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=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_WM831X=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_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_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_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
-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_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_LIRC_CODEC=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_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_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_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_DMA_CONTIG=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_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_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_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=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_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=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_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=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_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_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_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_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_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_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=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_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_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=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 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
-
-#
-# 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
-
-#
-# 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
-
-#
-# 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_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=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_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-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_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=m
-# 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=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-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=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I810=m
-# CONFIG_FB_I810_GTF is not set
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# 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_UDL=m
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# 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_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_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_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-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_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_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_SPI=y
-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=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS 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=m
-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_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_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_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_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=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_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_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_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=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_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_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_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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-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_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=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
-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=y
-
-#
-# 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_OF=m
-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_NET5501=m
-# CONFIG_LEDS_ALIX2 is not set
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_GPIO_OF=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
-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_MCE=y
-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
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# 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_WM831X=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
-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_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-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_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=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_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-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_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_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=m
-CONFIG_FB_OLPC_DCON_1=y
-CONFIG_FB_OLPC_DCON_1_5=y
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-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_DRM_VMWGFX=m
-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_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
-CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_CS5535_GPIO=m
-CONFIG_XVMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=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
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
-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_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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_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_ACPI_ASUS=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_CLKSRC_I8253=y
-
-#
-# 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 is not set
-CONFIG_SIGMA=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_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_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_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_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_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_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-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_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
-
-#
-# 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 is not set
-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_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 is not set
-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_SPINLOCK_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_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_SYSCTL_SYSCALL_CHECK=y
-# 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
-
-#
-# 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_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# 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=m
-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_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_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_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=m
-
-#
-# 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_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=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_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_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
diff --git a/testing/linux/config.x86_64 b/testing/linux/config.x86_64
deleted file mode 100644
index bef112f0c..000000000
--- a/testing/linux/config.x86_64
+++ /dev/null
@@ -1,5513 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0 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_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=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_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=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 is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
-# 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_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=64
-# CONFIG_RCU_FANOUT_EXACT is not set
-# 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_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP 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=y
-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_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_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
-
-#
-# 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 is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-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_INLINE_SPIN_UNLOCK is not set
-# 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_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=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_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEBUG 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=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=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_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=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_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_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_EFI=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=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-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=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_PCIEAER=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=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# 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=m
-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_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_INTR_REMAP 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_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_IOV=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_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-CONFIG_RAPIDIO_DEBUG=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=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_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_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_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=m
-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_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_EVENTS=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_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_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_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_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_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 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=y
-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_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=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_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=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_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
-
-#
-# 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_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_HAVE_BPF_JIT=y
-CONFIG_BPF_JIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# CONFIG_HAMRADIO is not set
-# 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_L2CAP=y
-CONFIG_BT_SCO=y
-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_RFKILL_REGULATOR=m
-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_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-
-#
-# 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_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE 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_RAM=m
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-CONFIG_MTD_SST25L=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# 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_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI 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_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_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=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
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=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_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_PCH_PHUB=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=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
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# 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_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-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_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_VMWARE_PVSCSI=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_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_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-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_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
-CONFIG_TCM_FC=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_OHCI_DEBUG=y
-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_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_DNET=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_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=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_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-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=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_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=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_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_IWLAGN=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-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_SPI=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_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
-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_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=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
-
-#
-# 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_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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN 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
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=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
-# CONFIG_PHONE is not set
-
-#
-# 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=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=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_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=m
-CONFIG_MOUSE_SYNAPTICS_I2C=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_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=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_WM831X=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=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_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=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_AD714X_SPI=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-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_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=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_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_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-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_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=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-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_GPIO=m
-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
-CONFIG_I2C_EG20T=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=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-# CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# 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
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_GPIO=m
-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_ADCXX=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=m
-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_LM70=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_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=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_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=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_SCH5627=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=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_WM831X=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_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_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_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
-CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
-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_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_LIRC_CODEC=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_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_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_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_DMA_CONTIG=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_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_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_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=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_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=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_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=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_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_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_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_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_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_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=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_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_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=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 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
-
-#
-# 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
-
-#
-# 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
-
-#
-# 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_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=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_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-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_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=m
-# 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=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-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=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# 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_UDL=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# 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_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_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_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-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_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_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_SPI=y
-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=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS 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=m
-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_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_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWII_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_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=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_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_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_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=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_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_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_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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-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_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=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
-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=y
-
-#
-# 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_SPI=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_NET5501=m
-# CONFIG_LEDS_ALIX2 is not set
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
-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_MCE=y
-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_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
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# 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_WM831X=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
-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
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=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=m
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-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_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=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_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-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_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_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_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-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_DRM_VMWGFX=m
-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_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
-CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=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
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
-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_DRM_PSB=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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_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_ACPI_ASUS=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
-
-#
-# 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 is not set
-CONFIG_SIGMA=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_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_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_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_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_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_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-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_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
-
-#
-# 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 is not set
-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_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 is not set
-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_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_SPINLOCK_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_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_SYSCTL_SYSCALL_CHECK=y
-# 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
-
-#
-# 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_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# 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=m
-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_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
-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_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_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# 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_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_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=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_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_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
diff --git a/testing/linux/fix-i915.patch b/testing/linux/fix-i915.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/testing/linux/fix-i915.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/testing/linux/linux.install b/testing/linux/linux.install
deleted file mode 100644
index 17e27ec6e..000000000
--- a/testing/linux/linux.install
+++ /dev/null
@@ -1,58 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=3.0.0-ARCH
-
-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}
-
- # 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
-}
-
-post_upgrade() {
- pacman -Q grub &>/dev/null
- hasgrub=$?
- pacman -Q grub2 &>/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 grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
- if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
- echo "WARNING: /boot appears to be a seperate partition but is not mounted"
- echo " This is most likely not what you want. Please mount your /boot"
- echo " partition and reinstall the kernel unless you are sure this is OK"
- fi
- 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/testing/linux/linux.preset b/testing/linux/linux.preset
deleted file mode 100644
index b06292d10..000000000
--- a/testing/linux/linux.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
new file mode 100644
index 000000000..c5525ea12
--- /dev/null
+++ b/testing/lirc/PKGBUILD
@@ -0,0 +1,103 @@
+# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgbase=lirc
+pkgname=('lirc' 'lirc-utils')
+pkgver=0.9.0
+pkgrel=6
+epoch=1
+_kernver=3.0-ARCH
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/"
+license=('GPL')
+makedepends=('help2man' 'linux-headers>=3.0' 'linux-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+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.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+
+build() {
+ cd "${srcdir}/lirc-${pkgver}"
+ patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
+ patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
+ patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
+ patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -e 's/@X_CFLAGS@//g' \
+ -e 's/@X_LIBS@//g' \
+ -e 's/@X_PRE_LIBS@//g' \
+ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+ libtoolize
+ autoreconf
+
+ 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-transmitter
+
+ # Remove drivers already in kernel
+ sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+ -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ make
+}
+
+package_lirc() {
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
+ depends=('lirc-utils' 'linux>=3.0' 'linux<3.1')
+ replaces=('lirc+pctv')
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${pkgver}/drivers"
+ make DESTDIR="${pkgdir}" 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"
+ # gzip -9 modules
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+}
+
+package_lirc-utils() {
+ pkgdesc="Linux Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip' '!libtool')
+ backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+
+ cd "${srcdir}/lirc-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
+ cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+ cp -rp remotes "${pkgdir}/usr/share/lirc"
+ chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+ # install the logrotate config
+ 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"
+
+ # install conf.d file
+ install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
+
+ install -d "${pkgdir}/etc/lirc"
+
+ # remove built modules
+ rm -r "${pkgdir}/lib/"
+}
diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf
new file mode 100644
index 000000000..f911c7515
--- /dev/null
+++ b/testing/lirc/irexec.conf
@@ -0,0 +1,5 @@
+#
+# Parameters for irexec daemon (path to lircrc)
+#
+
+IREXEC_OPTS="" \ No newline at end of file
diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd
new file mode 100755
index 000000000..a64b033a5
--- /dev/null
+++ b/testing/lirc/irexecd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/irexec.conf
+
+PID=`pidof -o %PPID /usr/bin/irexec`
+case "$1" in
+ start)
+ stat_busy "Starting IREXEC Daemon"
+ [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon irexecd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping IREXEC Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon irexecd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch
new file mode 100644
index 000000000..7353d61ca
--- /dev/null
+++ b/testing/lirc/kernel-2.6.39.patch
@@ -0,0 +1,54 @@
+diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
+--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200
+@@ -48,7 +48,6 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+-#include <linux/smp_lock.h>
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
+--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200
+@@ -555,8 +555,8 @@
+ kfree(ir);
+ return -EINVAL;
+ }
+- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+- adap->id, addr, ir->c.name);
++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++ addr, ir->c.name);
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ /* register device */
+diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200
+@@ -361,14 +361,14 @@
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
+- next_one = generic_find_next_le_bit(ldata, size, 0);
++ next_one = find_next_zero_bit_le(ldata, size, 0);
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
+- next_zero = generic_find_next_zero_le_bit(ldata,
++ next_zero = find_next_zero_bit_le(ldata,
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -376,7 +376,7 @@
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
+- next_one = generic_find_next_le_bit(ldata,
++ next_one = find_next_bit_le(ldata,
+ size, next_zero + 1);
+
+ put_pulse_bit(
diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install
new file mode 100644
index 000000000..0d42e8a5c
--- /dev/null
+++ b/testing/lirc/lirc.install
@@ -0,0 +1,16 @@
+KERNEL_VERSION=3.0-ARCH
+
+post_install() {
+ # updating module dependencies
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod $KERNEL_VERSION > /dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install
+}
+
+# arg 1: the old package version
+post_remove() {
+ post_install
+}
diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate
new file mode 100644
index 000000000..623c4f328
--- /dev/null
+++ b/testing/lirc/lirc.logrotate
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch
new file mode 100644
index 000000000..a64984dce
--- /dev/null
+++ b/testing/lirc/lirc_atiusb-kfifo.patch
@@ -0,0 +1,31 @@
+From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
+From: Jason Martin <publicmsu@gmail.com>
+Date: Fri, 3 Jun 2011 00:12:51 -0400
+Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
+
+I came across posts with regards to lirc_atiusb and its compatibility
+with newer kernels, and their use of kfifo.I spent a little bit of time
+this evening, and was able to correct the issues with the driver, and
+now have a functioning lirc_atiusb device under the 2.6.38 kernel.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+index 52080de..bf2b631 100644
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
+ goto new_irctl_failure_check;
+ }
+
+- if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
+ mem_failure = 4;
+ goto new_irctl_failure_check;
+ }
+--
+1.7.0.1
+
diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch
new file mode 100644
index 000000000..e4e2a049b
--- /dev/null
+++ b/testing/lirc/lirc_wpc8769l.patch
@@ -0,0 +1,88 @@
+From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
+Date: Wed, 30 Mar 2011 16:46:35 -0400
+Subject: [PATCH] Make lirc_wpc8769l functional again
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index f820d11..4d04063 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
+ /* Reset last timeout value. */
+ lastus = 0;
+
+- /* Init the read buffer. */
+- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
+- return -ENOMEM;
+-
+ /* Acquire the IRQ. */
+ result = request_irq(irq, irq_handler,
+ IRQF_DISABLED | IRQF_SHARED,
+@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
+ /* Free the IRQ. */
+ free_irq(irq, THIS_MODULE);
+ dprintk("Freed IRQ %d\n", irq);
+-
+- /* Free the RX buffer. */
+- lirc_buffer_free(&rbuf);
+ }
+
+ static struct lirc_driver driver = {
+@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
+ /* Do load-time checks. */
+ wpc8769l_power_up_and_check_if_we_woke_us_up();
+
++ /* Init the read buffer. */
++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
++ rc = -ENOMEM;
++ goto exit_platform_exit;
++ }
++
+ /* Configure the driver hooks. */
+ driver.features = LIRC_CAN_REC_MODE2;
++ driver.dev = &lirc_wpc8769l_platform_dev->dev;
+ driver.minor = lirc_register_driver(&driver);
+ if (driver.minor < 0) {
+ eprintk("lirc_register_driver failed!\n");
+ rc = -EIO;
+- goto exit_platform_exit;
++ goto exit_release_buffer;
+ }
+
+ iprintk("Driver loaded.\n");
+
+ return 0; /* Everything OK. */
+
++exit_release_buffer:
++ lirc_buffer_free(&rbuf);
++
+ exit_platform_exit:
+ lirc_wpc8769l_platform_exit();
+
+@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
+
+ static void __exit lirc_wpc8769l_module_exit(void)
+ {
+- /* Unregister the platform driver and device. */
+- lirc_wpc8769l_platform_exit();
+-
+ /* Unregister the LIRC driver. */
+ lirc_unregister_driver(driver.minor);
+
++ /* Free the buffer. */
++ lirc_buffer_free(&rbuf);
++
++ /* Unregister the platform driver and device. */
++ lirc_wpc8769l_platform_exit();
++
+ /* Release the second range. */
+ if (baseport2)
+ release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
+--
+1.7.0.1
+
diff --git a/testing/lirc/lircd b/testing/lirc/lircd
new file mode 100755
index 000000000..e9739b36e
--- /dev/null
+++ b/testing/lirc/lircd
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/lircd.conf
+
+PID=$(pidof -o %PPID /usr/sbin/lircd)
+LIRCD_SYMLINKFILE=/dev/lircd
+LIRCD_SOCKET=/var/run/lirc/lircd
+case "$1" in
+ start)
+ stat_busy "Starting LIRC Daemon"
+ [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
+ rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
+ if [ $? -ne 0 ]; then
+ stat_fail
+ exit 0
+ fi
+ [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
+ [ -z "$PID" ] &&
+ if [ -n "$LIRC_DEVICE" ] ; then
+ eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ else
+ /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ fi
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping LIRC Daemon"
+ rm -f $LIRCD_SYMLINKFILE
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 start|stop|restart"
+esac
+exit 0
diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch
new file mode 100644
index 000000000..85bc20518
--- /dev/null
+++ b/testing/lirc/lircd-handle-large-config.patch
@@ -0,0 +1,39 @@
+From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 6 Apr 2011 11:04:12 -0400
+Subject: [PATCH] lircd: handle larger config files in write_socket better
+
+Pointed out by Michael Zanetti on list, irsend LIST has issues with long
+config files, which didn't exist in maintainer mode, as we were using a
+do while loop to make sure we spit out everything. Just use that loop
+all the time.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/lircd.c | 8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 6c21a3a..ddcca05 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
+ int done, todo = len;
+
+ while (todo) {
+-#ifdef SIM_REC
+ do {
+ done = write(fd, buf, todo);
+- }
+- while (done < 0 && errno == EAGAIN);
+-#else
+- done = write(fd, buf, todo);
+-#endif
++ } while (done < 0 && errno == EAGAIN);
++
+ if (done <= 0)
+ return (done);
+ buf += done;
+--
+1.7.0.1
+
diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf
new file mode 100644
index 000000000..760dab065
--- /dev/null
+++ b/testing/lirc/lircd.conf
@@ -0,0 +1,8 @@
+#
+# Parameters for lirc daemon
+#
+
+LIRC_DEVICE="/dev/lirc0"
+LIRC_DRIVER=""
+LIRC_EXTRAOPTS=""
+LIRC_CONFIGFILE=""
diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd
new file mode 100755
index 000000000..220c47c9c
--- /dev/null
+++ b/testing/lirc/lircmd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/lircmd`
+case "$1" in
+ start)
+ stat_busy "Starting lircmd Daemon"
+ [ -z "$PID" ] && /usr/sbin/lircmd
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircmd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping lircmd Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircmd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/mesa/git_fixes.patch b/testing/mesa/git_fixes.patch
deleted file mode 100644
index 22372b328..000000000
--- a/testing/mesa/git_fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 08 Jul 2011 22:30:48 +0000
-Subject: i965/gen4: Fix GPU hangs since the program streaming change.
-
-This was tricky. We were doing a use-before-initialize of
-grf_reg_count, but the value usually got overwritten anyway -- when we
-didn't have to do a relocation (typical), or on gen5 when we didn't
-have relocations at all.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
-Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
----
-diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
-index d5010a2..179ca19 100644
---- a/src/mesa/drivers/dri/i965/brw_vs_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
-@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
- memset(vs, 0, sizeof(*vs));
-
- /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
-+ vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
- vs->thread0.kernel_start_pointer =
- brw_program_reloc(brw,
- brw->vs.state_offset +
-@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
- brw->vs.prog_offset +
- (vs->thread0.grf_reg_count << 1)) >> 6;
-
-- vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
- vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
- /* Choosing multiple program flow means that we may get 2-vertex threads,
- * which will have the channel mask for dwords 4-7 enabled in the thread,
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/mesa/linking_fix.patch b/testing/mesa/linking_fix.patch
deleted file mode 100644
index 34ed7902d..000000000
--- a/testing/mesa/linking_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001
-From: Chia-I Wu <olv@lunarg.com>
-Date: Wed, 13 Jul 2011 07:25:46 +0000
-Subject: targets/egl-static: fix a linking error
-
-rbug is always linked in and it needs libpthread.
----
-diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
-index 832d7ba..69e7eec 100644
---- a/src/gallium/targets/egl-static/Makefile
-+++ b/src/gallium/targets/egl-static/Makefile
-@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
- -I$(TOP)/src/egl/main \
- -D_EGL_MAIN=_eglMain
- egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a
--egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm
-+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread
-
- # EGL platforms
- ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
new file mode 100644
index 000000000..69ee72ca5
--- /dev/null
+++ b/testing/nfs-utils/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 134117 2011-08-01 17:55:07Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+# Contributor: abelstr <abel@pinklf.eu>
+# Contributor: Marco Lima <cipparello gmail com>
+
+pkgname=nfs-utils
+pkgver=1.2.4
+pkgrel=2
+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' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ nfs-common
+ nfs-common.conf
+ nfs-server
+ nfs-server.conf
+ exports
+ idmapd.conf
+ start-statd.patch
+ nfs-utils-1.1.4-mtab-sym.patch
+ nfs-utils-1.1.4-no-exec.patch
+ kernel-3.0-segfault.patch)
+install=nfs-utils.install
+md5sums=('938dc0574f3eb9891a8ed4746f806277'
+ 'fc508e10cdf5e8ddd80373b1b2bc99a1'
+ 'f73f197a16b02c3e248488ec35c4cf43'
+ '5ae080f6117cef3140f02bc162bdc755'
+ '2bf71def3263325643a09458635520f0'
+ 'ff585faf410a62c4333a027c50b56bae'
+ 'eb4f4027fab6fc1201f1ca04f5954c76'
+ 'e24f81a8c8657672e262c61235d34b4a'
+ '7674106eaaa4c149bccd4f05fe3604e9'
+ '4f4827dfc93008dfadd0a530ad0872b2'
+ 'ab92e67f3d0ee2935faab9cdabef8003')
+
+build() {
+ cd $srcdir/${pkgname}-${pkgver}
+ 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 ../kernel-3.0-segfault.patch
+ # arch specific patch
+ patch -Np0 -i $srcdir/start-statd.patch
+
+ ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
+ --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc
+
+ make
+}
+
+package() {
+ cd $srcdir/${pkgname}-${pkgver}
+ 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
+ install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
+ # Configuration
+ install -D -m 644 ../exports "$pkgdir/"etc/exports
+ 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
+ # directories
+ mkdir "$pkgdir/"etc/exports.d
+ mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
+ mkdir "$pkgdir/"var/lib/nfs/v4recovery
+}
diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports
new file mode 100644
index 000000000..8f4aac598
--- /dev/null
+++ b/testing/nfs-utils/exports
@@ -0,0 +1,15 @@
+# /etc/exports
+#
+# List of directories exported to NFS clients. See exports(5).
+# Use exportfs -arv to reread.
+#
+# Example for NFSv2 and NFSv3:
+# /srv/home hostname1(rw,sync) hostname2(ro,sync)
+#
+# Example for NFSv4:
+# /srv/nfs4 hostname1(rw,sync,fsid=0)
+# /srv/nfs4/home hostname1(rw,sync,nohide)
+# Using Kerberos and integrity checking:
+# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt)
+# /srv/nfs4/home gss/krb5i(rw,sync,nohide)
+#
diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf
new file mode 100644
index 000000000..b1b23afe9
--- /dev/null
+++ b/testing/nfs-utils/idmapd.conf
@@ -0,0 +1,14 @@
+[General]
+
+Verbosity = 0
+Pipefs-Directory = /var/lib/nfs/rpc_pipefs
+Domain = localdomain
+
+[Mapping]
+
+Nobody-User = nobody
+Nobody-Group = nobody
+
+[Translation]
+
+Method = nsswitch
diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch
new file mode 100644
index 000000000..3dba94a05
--- /dev/null
+++ b/testing/nfs-utils/kernel-3.0-segfault.patch
@@ -0,0 +1,53 @@
+mount.nfs segfaults if kernel version number does not contain
+at least 3 components delimited with a dot.
+
+Avoid this by matching up to three unsigned integers inialised
+to zero, separated by dots.
+
+A version that does not start with an integer is probably a future
+version where the versioning evolved to another scheme.
+Return UINT_MAX which is guaranteed to be higher than existing
+versions. This would also make it possible to easily identify
+versions that do not start with an integer.
+
+Signed-off-by: Luk Claes <luk@...>
+---
+ utils/mount/version.h | 16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/utils/mount/version.h b/utils/mount/version.h
+index af61a6f..531cf68 100644
+--- a/utils/mount/version.h
++++ b/utils/mount/version.h
+@@ -23,8 +23,8 @@
+ #ifndef _NFS_UTILS_MOUNT_VERSION_H
+ #define _NFS_UTILS_MOUNT_VERSION_H
+
+-#include <stdlib.h>
+-#include <string.h>
++#include <stdio.h>
++#include <limits.h>
+
+ #include <sys/utsname.h>
+
+@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q,
+ static inline unsigned int linux_version_code(void)
+ {
+ struct utsname my_utsname;
+- unsigned int p, q, r;
++ unsigned int p, q = 0, r = 0;
+
++ /* UINT_MAX as backward compatibility code should not be run */
+ if (uname(&my_utsname))
+- return 0;
++ return UINT_MAX;
+
+- p = (unsigned int)atoi(strtok(my_utsname.release, "."));
+- q = (unsigned int)atoi(strtok(NULL, "."));
+- r = (unsigned int)atoi(strtok(NULL, "."));
++ /* UINT_MAX as future versions might not start with an integer */
++ if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1)
++ return UINT_MAX;
++
+ return MAKE_VERSION(p, q, r);
+ }
diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common
new file mode 100644
index 000000000..13742bde3
--- /dev/null
+++ b/testing/nfs-utils/nfs-common
@@ -0,0 +1,319 @@
+#!/bin/bash
+
+daemon_name=nfs-common
+
+# daemon dependencies
+DAEMON_DEPENDS=('rpcbind')
+
+NEED_STATD=
+STATD_OPTS=
+NEED_IDMAPD=
+IDMAPD_OPTS=
+NEED_GSSD=
+GSSD_OPTS=
+PIPEFS_MOUNTPOINT=
+PIPEFS_MOUNTOPTS=
+
+# rpc.statd daemon & binary location
+STATD_DAEMON_NAME=rpc.statd
+STATD="/usr/sbin/rpc.statd"
+
+# rpc.idmapd daemon & binary location
+IDMAPD_DAEMON_NAME=rpc.idmapd
+IDMAPD="/usr/sbin/rpc.idmapd"
+
+# rpc.gssd daemon & binary location
+GSSD_DAEMON_NAME=rpc.gssd
+GSSD="/usr/sbin/rpc.gssd"
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+# Default mountpoint and options for rpc_pipefs filesystem
+[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
+[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
+
+# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# /etc/conf.d/nfs-common settings, if any, will override our autodetection.)
+AUTO_NEED_IDMAPD=no
+AUTO_NEED_GSSD=no
+
+if [ -f /etc/fstab ]; then
+ exec 9<&0 </etc/fstab
+
+ while read DEV MTPT FSTYPE OPTS REST; do
+ if [ "$FSTYPE" = "nfs4" ]; then
+ AUTO_NEED_IDMAPD=yes
+ fi
+ case "$OPTS" in
+ sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+ AUTO_NEED_GSSD=yes
+ ;;
+ esac
+ done
+
+ exec 0<&9 9<&-
+fi
+
+# We also need idmapd if we run an NFSv4 server. It's fairly difficult
+# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
+# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
+# file. This does not mean that there are NFSv4 or other mounts active (or
+# even that nfs-kernel-server is installed), but it matches what the "start"
+# condition in nfs-kernel-server's init script does, which has a value in
+# itself.
+if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
+ AUTO_NEED_IDMAPD=yes
+fi
+
+case "$NEED_STATD" in
+ yes|no)
+ ;;
+ *)
+ NEED_STATD=yes
+ ;;
+esac
+
+case "$NEED_IDMAPD" in
+ yes|no)
+ ;;
+ *)
+ NEED_IDMAPD=$AUTO_NEED_IDMAPD
+ ;;
+esac
+
+case "$NEED_GSSD" in
+ yes|no)
+ ;;
+ *)
+ NEED_GSSD=$AUTO_NEED_GSSD
+ ;;
+esac
+
+do_modprobe() {
+ if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+ modprobe -q "$1" || true
+ fi
+}
+
+do_mount() {
+ if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
+ return 1
+ fi
+
+ if grep -vw "$1" /proc/mounts &> /dev/null ; then
+ if ! mountpoint -q "$2" ; then
+ mount -t "$1" "$1" "$2" -o "$3"
+ return
+ fi
+ fi
+ return 0
+}
+
+do_umount() {
+ if mountpoint -q "$1" ; then
+ umount "$1"
+ fi
+ return 0
+}
+
+get_pid() {
+ pidof -o %PPID "$1"
+}
+
+case "$1" in
+ start)
+ ck_depends ${DAEMON_DEPENDS[@]}
+
+ rc=0
+ if [ "$NEED_STATD" = yes ]; then
+ stat_busy "Starting $STATD_DAEMON_NAME daemon"
+ PID=$(get_pid $STATD)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
+ # RUN
+ $STATD $STATD_OPTS
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ # Run sm-notify
+ /usr/sbin/sm-notify $SMNOTIFY_OPTS
+ fi
+
+ if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
+ stat_busy "Mounting pipefs filesystem"
+ do_modprobe sunrpc
+ do_modprobe nfs
+ do_modprobe nfsd
+ do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ stat_done
+ fi
+
+ if [ "$NEED_IDMAPD" = yes ]; then
+ stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
+ PID=$(get_pid $IDMAPD)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
+ # RUN
+ $IDMAPD $IDMAPD_OPTS
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ fi
+
+ if [ "$NEED_GSSD" = yes ]; then
+ do_modprobe rpcsec_gss_krb5
+ stat_busy "Starting $GSSD_DAEMON_NAME daemon"
+ PID=$(get_pid $GSSD)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
+ # RUN
+ $GSSD $GSSD_OPTS
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ fi
+ fi
+
+ add_daemon $daemon_name
+ ;;
+
+ stop)
+ rc=0
+ if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
+
+ if [ "$NEED_GSSD" = yes ]; then
+ stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
+ PID=$(get_pid $GSSD)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+ fi
+
+ if [ "$NEED_IDMAPD" = yes ]; then
+ stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
+ PID=$(get_pid $IDMAPD)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+ fi
+ do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
+ fi
+
+ if [ "$NEED_STATD" = yes ]; then
+ stat_busy "Stopping $STATD_DAEMON_NAME daemon"
+ PID=$(get_pid $STATD)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+ fi
+
+ rm_daemon $daemon_name
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+
+ if [ "$NEED_STATD" = yes ]; then
+ stat_busy "Daemon $STATD_DAEMON_NAME running"
+ PID=$(get_pid $STATD)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ fi
+
+ if [ "$NEED_GSSD" = yes ]; then
+ stat_busy "Daemon $GSSD_DAEMON_NAME running"
+ PID=$(get_pid $GSSD)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ fi
+
+ if [ "$NEED_IDMAPD" = yes ]; then
+ stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
+ PID=$(get_pid $IDMAPD)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ fi
+ echo
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|status|restart}"
+esac
+exit 0
+
diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf
new file mode 100644
index 000000000..12466b3e5
--- /dev/null
+++ b/testing/nfs-utils/nfs-common.conf
@@ -0,0 +1,40 @@
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# See rpc.statd(8) for more details.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
+
+# Options to pass to sm-notify
+# e.g. SMNOTIFY_OPTS="-p 32764"
+SMNOTIFY_OPTS=""
+
+# Do you want to start the idmapd daemon? It is only needed for NFSv4.
+NEED_IDMAPD=""
+
+# Options to pass to rpc.idmapd.
+# See rpc.idmapd(8) for more details.
+IDMAPD_OPTS=""
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=""
+
+# Options to pass to rpc.gssd.
+# See rpc.gssd(8) for more details.
+GSSD_OPTS=""
+
+# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
+PIPEFS_MOUNTPOINT=""
+
+# Options used to mount rpc_pipefs filesystem; the default is "defaults".
+PIPEFS_MOUNTOPTS=""
diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server
new file mode 100644
index 000000000..9574cbc12
--- /dev/null
+++ b/testing/nfs-utils/nfs-server
@@ -0,0 +1,303 @@
+#!/bin/bash
+
+daemon_name=nfs-server
+
+# daemon dependencies
+DAEMON_DEPENDS=('nfs-common')
+
+NFSD_COUNT=
+NFSD_OPTS=
+NEED_SVCGSSD=
+SVCGSSD_OPTS=
+MOUNTD_OPTS=
+PROCNFSD_MOUNTPOINT=
+PROCNFSD_MOUNTOPTS=
+
+# rpc.nfsd daemon & binary location
+NFSD_PROCESS_NAME=nfsd
+NFSD_DAEMON_NAME=rpc.nfsd
+NFSD="/usr/sbin/rpc.nfsd"
+
+# rpc.svcgssd daemon & binary location
+SVCGSSD_DAEMON_NAME=rpc.svcgssd
+SVCGSSD="/usr/sbin/rpc.svcgssd"
+
+# rpc.idmapd daemon & binary location
+IDMAPD_DAEMON_NAME=rpc.idmapd
+IDMAPD="/usr/sbin/rpc.idmapd"
+
+# rpc.mountd daemon & binary location
+MOUNTD_DAEMON_NAME=rpc.mountd
+MOUNTD="/usr/sbin/rpc.mountd"
+
+# exortfs binary location
+EXPORTFS="/usr/sbin/exportfs"
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+# Default number of nfsd servers
+[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
+
+# Default mountpoint and options for nfsd filesystem
+[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
+[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
+
+case "$NEED_SVCGSSD" in
+ yes|no)
+ ;;
+ *)
+ NEED_SVCGSSD=no
+ ;;
+esac
+
+do_modprobe() {
+ if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+ modprobe -q "$1" || true
+ fi
+}
+
+do_mount() {
+ if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
+ return 1
+ fi
+
+ if grep -vw "$1" /proc/mounts &> /dev/null ; then
+ if ! mountpoint -q "$2" ; then
+ mount -t "$1" "$1" "$2" -o "$3"
+ return
+ fi
+ fi
+ return 0
+}
+
+do_umount() {
+ if mountpoint -q "$1" ; then
+ umount "$1"
+ fi
+ return 0
+}
+
+get_pid() {
+ pidof -o %PPID "$1"
+}
+
+case "$1" in
+ start)
+ ck_depends ${DAEMON_DEPENDS[@]}
+
+ rc=0
+ stat_busy "Mounting nfsd filesystem"
+ do_modprobe nfsd
+ do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ stat_done
+ fi
+
+ stat_busy "Exporting all directories"
+ $EXPORTFS -r
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ stat_done
+ fi
+
+ stat_busy "Starting $NFSD_DAEMON_NAME daemon"
+ PID=$(get_pid $NFSD_PROCESS_NAME)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
+ # RUN
+ $NFSD $NFSD_OPTS $NFSD_COUNT
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+
+ if [ "$NEED_SVCGSSD" = yes ]; then
+ do_modprobe rpcsec_gss_krb5
+ stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
+ PID=$(get_pid $SVCGSSD)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
+ # RUN
+ $SVCGSSD $SVCGSSD_OPTS
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ fi
+
+ PID=$(get_pid $IDMAPD)
+ [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
+
+ stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
+ PID=$(get_pid $MOUNTD)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
+ # RUN
+ $MOUNTD $MOUNTD_OPTS
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+
+ add_daemon $daemon_name
+ ;;
+
+ stop)
+ rc=0
+ stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
+ PID=$(get_pid $MOUNTD)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+
+ if [ "$NEED_SVCGSSD" = yes ]; then
+ stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
+ PID=$(get_pid $SVCGSSD)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+ fi
+
+ stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
+ PID=$(get_pid $NFSD_PROCESS_NAME)
+ # KILL (SIGINT)
+ [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
+ #
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ sleep 1
+ PID=$(get_pid $NFSD_PROCESS_NAME)
+ # KILL (KILL) - just to be sure
+ [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
+ #
+ rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
+ stat_done
+ fi
+
+ stat_busy "Unexporting all directories"
+ $EXPORTFS -au
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ stat_done
+ fi
+
+ # flush everything out of the kernels export table
+ if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
+ $EXPORTFS -f
+ fi
+ do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
+ rm_daemon $daemon_name
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+
+ stat_busy "Daemon $NFSD_DAEMON_NAME running"
+ PID=$(get_pid $NFSD_PROCESS_NAME)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+
+ stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
+ PID=$(get_pid $MOUNTD)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+
+ if [ "$NEED_SVCGSSD" = yes ]; then
+ stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
+ PID=$(get_pid $SVCGSSD)
+ if [ -z "$PID" ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+ fi
+ echo
+ ;;
+
+ reload)
+ rc=0
+ stat_busy "Re-exporting all directories"
+ $EXPORTFS -r
+ rc=$(($rc+$?))
+ if [ $rc -gt 0 ]; then
+ stat_fail
+ exit $rc
+ else
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|status|reload|restart}"
+esac
+exit 0
diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf
new file mode 100644
index 000000000..4054d6b88
--- /dev/null
+++ b/testing/nfs-utils/nfs-server.conf
@@ -0,0 +1,29 @@
+# Parameters to be passed to nfs-server init script.
+#
+
+# Options to pass to rpc.nfsd.
+# See rpc.nfsd(8) for more details.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# 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 2"
+
+# 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".
+NEED_SVCGSSD=""
+
+# Options to pass to rpc.svcgssd.
+# See rpc.svcgssd(8) for more details.
+SVCGSSD_OPTS=""
diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
new file mode 100644
index 000000000..4a5a138e7
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
@@ -0,0 +1,138 @@
+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/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
new file mode 100644
index 000000000..c9e60afc7
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
@@ -0,0 +1,39 @@
+ripped from Debian
+
+--- nfs-utils-1.1.4/utils/mount/fstab.c
++++ nfs-utils-1.1.4/utils/mount/fstab.c
+@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
+ return var_mtab_does_not_exist;
+ }
+
+-static int
++int
+ mtab_is_a_symlink(void) {
+ get_mtab_info();
+ return var_mtab_is_a_symlink;
+--- nfs-utils-1.1.4/utils/mount/fstab.h
++++ nfs-utils-1.1.4/utils/mount/fstab.h
+@@ -7,6 +7,7 @@
+ #define _PATH_FSTAB "/etc/fstab"
+ #endif
+
++int mtab_is_a_symlink(void);
+ int mtab_is_writable(void);
+ int mtab_does_not_exist(void);
+ void reset_mtab_info(void);
+--- nfs-utils-1.1.4/utils/mount/mount.c
++++ nfs-utils-1.1.4/utils/mount/mount.c
+@@ -230,6 +230,13 @@ create_mtab (void) {
+ int flags;
+ mntFILE *mfp;
+
++ /* Avoid writing if the mtab is a symlink to /proc/mounts, since
++ that would create a file /proc/mounts in case the proc filesystem
++ is not mounted, and the fchmod below would also fail. */
++ if (mtab_is_a_symlink()) {
++ return EX_SUCCESS;
++ }
++
+ lock_mtab();
+
+ mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
new file mode 100644
index 000000000..ea50a21d8
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
@@ -0,0 +1,15 @@
+ripped from Debian
+
+--- nfs-utils-1.1.2/utils/mount/mount.c
++++ nfs-utils-1.1.2/utils/mount/mount.c
+@@ -381,10 +381,6 @@
+ mount_error(NULL, mount_point, ENOTDIR);
+ return 1;
+ }
+- if (access(mount_point, X_OK) < 0) {
+- mount_error(NULL, mount_point, errno);
+- return 1;
+- }
+
+ return 0;
+ }
diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
new file mode 100644
index 000000000..7f6c7a751
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
@@ -0,0 +1,69 @@
+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/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
new file mode 100644
index 000000000..917136a8c
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
@@ -0,0 +1,57 @@
+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/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install
new file mode 100644
index 000000000..7dcdf9575
--- /dev/null
+++ b/testing/nfs-utils/nfs-utils.install
@@ -0,0 +1,32 @@
+## arg 1: the new package version
+post_install() {
+cat << 'EOM'
+ ==> PLEASE NOTE:
+ ==> Extended configuration options for NFS (clients & server) are available in
+ ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
+ ==>
+ ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
+ ==> for further information on NFS; for NFSv4, refer to
+ ==> http://wiki.archlinux.org/index.php/NFSv4
+EOM
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
+cat << 'EOM'
+ ==> IMPORTANT NFS UTILS CHANGES:
+ ==> This is a rather important upgrade, you are going to have to change config files.
+ ==> /etc/rc.conf daemons changes:
+ ==> Change portmap to rpcbind
+ ==> Change nfslock to nfs-common
+ ==> Change nfsd to nfs-server
+ ==>
+ ==> Extended configuration options for NFS (clients & server) are available in:
+ ==> /etc/conf.d/nfs-common
+ ==> /etc/conf.d/nfs-server
+ ==> Please change them to your needs.
+EOM
+ fi
+}
diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch
new file mode 100644
index 000000000..38c60a784
--- /dev/null
+++ b/testing/nfs-utils/start-statd.patch
@@ -0,0 +1,22 @@
+--- 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/sh
++
++# Original script provided by the NFS project
++# Modified for Arch Linux by Tom Killian
++
+ # 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
+ # site.
+-PATH=/sbin:/usr/sbin
+-exec rpc.statd --no-notify
++
++# source application-specific settings
++[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
++
++exec /usr/sbin/rpc.statd $STATD_OPTS
+
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index 24d8d5ffe..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 132558 2011-07-24 23:50:57Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.26
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
- slapd slapd.default ntlm.patch)
-md5sums=('f36f3086031dd56ae94f722ffae8df5e'
- '40fdbdd6c343019cbadf4eb26c6189f2'
- '6be69f6b7e522cb64cce8703da81ed32'
- '4258ddbef923d1f29f2843bc050f8c56')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -Np1 -i "${srcdir}"/ntlm.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 \
- --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' 'libfetch' '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}" 'libtool' '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 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21. Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- LDAPControl **ctrls,
- LDAPDerefRes **drp ));
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 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 ldif.c fetch.c
-
- OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 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 ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 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 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 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 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 ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-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/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/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/testing/openldap/slapd.default b/testing/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/testing/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/testing/pywebkitgtk/PKGBUILD b/testing/pywebkitgtk/PKGBUILD
deleted file mode 100644
index df78ea739..000000000
--- a/testing/pywebkitgtk/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 132031 2011-07-19 09:51:13Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: kasa <biuta.jr@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pywebkitgtk
-pkgver=1.1.8
-pkgrel=1
-pkgdesc="Python bindings to the WebKit GTK+ port"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pywebkitgtk/"
-license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
-source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('158335385354ba38090c9324b37bf225')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/slv2/PKGBUILD b/testing/slv2/PKGBUILD
deleted file mode 100644
index 3005cd313..000000000
--- a/testing/slv2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 131701 2011-07-13 15:39:04Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Leslie P. Polzer <polzer@stardawn.org>
-
-pkgname=slv2
-pkgver=0.6.6
-pkgrel=6
-pkgdesc="Library for LV2 hosts"
-arch=('i686' 'x86_64')
-url="http://drobilla.net/software/slv2"
-license=('GPL')
-depends=('redland>=1.0.13' 'lv2core' 'jack')
-makedepends=('python2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- python2 waf configure --prefix=/usr
- python2 waf build $MAKEFLAGS
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- python2 waf install --destdir="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/slv2/slv2.changelog b/testing/slv2/slv2.changelog
deleted file mode 100644
index f394a5067..000000000
--- a/testing/slv2/slv2.changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.6.6-3:
- raptor rebuild
-
-24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * PKGBUILD :
- Get rid of sed and use python2 directly for waf.
- waf fix for python transition already included previously (unlogged).
- Release only (no need binary update; no runtime python requirement).
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.6.6-2 :
- Brought into extra from community for ardour
- - adds "LV2" plug-ins support
-
- * PKGBUILD :
- Minor cosmetic ammendments.
-
- * slv2.changelog :
- Added this changelog.
diff --git a/testing/slv2/slv2.install b/testing/slv2/slv2.install
deleted file mode 100644
index c980ddfab..000000000
--- a/testing/slv2/slv2.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- echo "Updating Shared Library Links"
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/texlive-bin/09-texlive-fonts.conf b/testing/texlive-bin/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/testing/texlive-bin/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
- <dir>/usr/share/texmf-dist/fonts/opentype</dir>
- <dir>/usr/share/texmf-dist/fonts/truetype</dir>
- <dir>/usr/local/share/texmf/fonts/opentype</dir>
- <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/testing/texlive-bin/PKGBUILD b/testing/texlive-bin/PKGBUILD
deleted file mode 100644
index 97d287f09..000000000
--- a/testing/texlive-bin/PKGBUILD
+++ /dev/null
@@ -1,335 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: francois <francois.archlinux.org>
-
-pkgname=texlive-bin
-pkgver=2011.1
-_luatex_ver=0.70.1
-pkgrel=1
-pkgdesc="TeX Live binaries"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall')
-optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('pdfjam')
-options=('!libtool')
-url='http://tug.org/texlive/'
-install="texlive.install"
-source=('texmf.cnf'
- 'fix-fontforge-encoding.patch'
- '09-texlive-fonts.conf'
- 'archlinux-build.patch'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
- "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
-)
-backup=(etc/texmf/web2c/texmf.cnf \
- etc/texmf/chktex/chktexrc \
- etc/texmf/web2c/mktex.cnf \
- etc/texmf/web2c/updmap.cfg \
- etc/texmf/web2c/fmtutil.cnf \
- etc/texmf/tex/generic/config/language.dat \
- etc/texmf/tex/generic/config/language.def \
- etc/texmf/tex/generic/config/pdftexconfig.tex \
- etc/texmf/ttf2pk/ttf2pk.cfg \
- etc/texmf/dvips/config/config.ps \
- etc/texmf/dvipdfmx/dvipdfmx.cfg \
- etc/texmf/dvipdfm/config/config \
- etc/texmf/xdvi/XDvi)
-
-md5sums=('ff30d6813babd2e41c414365eea9c147'
- 'bfb9716aa00c86c08cd31e5b32edeb98'
- '393a4bf67adc7ca5df2b386759d1a637'
- '94ef5571a54262790ab64d6d044dd10c'
- '58e8ab64188eaf15897b7acf472dca9f'
- '9f7ae1aa24afd9e34289ac10a8f9e87b'
- 'c9348d4381170204b1a1b0440d8b6918')
-
-build() {
- if [ "${CARCH}" = "x86_64" ]; then
- export CFLAGS="${CFLAGS} -fPIC"
- export CXXFLAGS="${CXXFLAGS} -fPIC"
- fi
-
- cd $srcdir
- # Building LuaTeX
- cd luatex-beta-${_luatex_ver}
- patch -p0 -i ../fix-fontforge-encoding.patch
- (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
- mkdir build
- cd build
- ../source/configure --prefix=/usr -C \
- --disable-native-texlive-build \
- --with-banner-add="/Arch Linux" \
- --enable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-dump-share \
- --disable-ptex \
- --enable-luatex \
- --without-system-ptexenc \
- --with-system-graphite \
- --without-system-icu \
- --without-system-kpathsea \
- --with-system-freetype2 \
- --with-system-poppler \
- --with-freetype2-libdir=/usr/lib \
- --with-freetype2-include=/usr/include/freetype2 \
- --with-system-gd \
- --with-system-libpng \
- --without-system-teckit \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-t1lib \
- --disable-shared \
- --disable-largefile \
- --disable-ipc \
- --without-mf-x-toolkit \
- --without-x
- make
- make -C libs/obsdcompat
- make -C texk/kpathsea
- make -C texk/web2c luatex
-
- cd "$srcdir"
- # this patch removes spurious error message with locale "xx_YY.utf8"
- patch -p0 -i fix-fontforge-encoding.patch
- #############################################################
- ### configure
- cd source
- patch -Np1 -i ${srcdir}/archlinux-build.patch
- for _dir in texk/tetex texk/texlive texk/tex4htk \
- utils/ps2eps utils/chktex utils/psutils utils/xindy; do
- (cd ${_dir} && automake) || true
- done
- ## prevent compiling Xdvi with libXp
- sed -i~ 's|-lXp ||' texk/xdvik/configure
- test ! -d Work && mkdir Work
- cd Work
- echo "--> Initial configuration..."
- # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree
- ../configure --prefix=/usr -C \
- --datarootdir=/usr/share \
- --datadir=/usr/share \
- --mandir=/usr/share/man \
- --disable-native-texlive-build \
- --with-banner-add="/Arch Linux" \
- --disable-multiplatform \
- --disable-dialog \
- --disable-psutils \
- --disable-t1utils \
- --disable-bibtexu \
- --disable-xz \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-pnglib \
- --with-system-ncurses \
- --with-system-t1lib \
- --with-system-gd \
- --with-system-poppler \
- --with-system-xpdf \
- --with-system-freetype2 \
- --with-system-graphite \
- --with-freetype2-libdir=/usr/lib \
- --with-freetype2-include=/usr/include/freetype2 \
- --with-xdvi-x-toolkit=xaw \
- --disable-dump-share \
- --disable-aleph \
- --disable-luatex \
- --with-clisp-runtime=default \
- --enable-xindy --disable-xindy-rules --disable-xindy-docs
- #############################################################
- ### make
- echo "-------------------------------------------------------"
- echo "--> Building the whole beast ..."
- echo "-------------------------------------------------------"
- make
-}
-
-package() {
- cd $srcdir
- #############################################################
- ### install texmf tree
- echo "-------------------------------------------------------"
- echo "--> installing the texmf tree"
- echo "-------------------------------------------------------"
- install -m755 -d $pkgdir/usr/share
- cp -r texmf $pkgdir/usr/share/
- install -d -m755 $pkgdir/etc/texmf/web2c
- install -d -m755 $pkgdir/etc/texmf/chktex
- install -d -m755 $pkgdir/etc/texmf/dvips/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfmx
- install -d -m755 $pkgdir/etc/texmf/tex/generic/config
- install -d -m755 $pkgdir/etc/texmf/ttf2pk
- install -d -m755 $pkgdir/etc/texmf/xdvi
- install -d -m755 $pkgdir/etc/fonts/conf.avail
- install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
- # replace upstream texmf.cnf with ours
- rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
- install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
- # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
- # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
- ln -s /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
- # fix location of TEXMFCACHE for luatools
- sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua
- ## remove aleph from fmtutil.cnf
- sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
- # move man files to /usr/share/man
- for i in 1 5; do
- install -d -m755 $pkgdir/usr/share/man/man$i
- mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
- done
- # move info files to /usr/share/info
- install -d -m755 $pkgdir/usr/share/info
- mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
- rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
- # copy config files to $TEXMFCONFIG tree
- cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
- $pkgdir/etc/texmf/chktex/
- cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
- $pkgdir/etc/texmf/dvips/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
- $pkgdir/etc/texmf/dvipdfm/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $pkgdir/etc/texmf/dvipdfmx/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
- $pkgdir/etc/texmf/ttf2pk/
- cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
- $pkgdir/etc/texmf/xdvi/
- # remove TL specific warnings in the language.{dat,def} files:
- sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.*
- # clean updmap.cfg
- sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
- sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
-
- #############################################################
- ### install
- cd source
- # fixes for xindy
- find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-
- echo "-------------------------------------------------------"
- echo "--> Proceeding with make install ..."
- echo "-------------------------------------------------------"
- cd Work
- make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install
- rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
-
- ## install luatex binary
- install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/
- cd $pkgdir/usr/bin
- /bin/ln -s luatex texlua
- /bin/ln -s luatex texluac
-
- ## install Perl libraries
- mkdir -p $pkgdir/usr/share/tlpkg/TeXLive
- install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm $pkgdir/usr/share/tlpkg/TeXLive
-
- # create symlinks for formats
- echo "--> Create symlinks for TeX formats ..."
- PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
- #############################################################
- # remove dangling symlinks
- _bibtexextra_scripts="bibexport"
- _core_scripts="
-afm2afm
-arlatex
-autoinst
-bundledoc
-cmap2enc
-de-macro
-dviasm
-epstopdf
-findhyph
-font2afm
-fragmaster
-installfont-tl
-latex2man
-latexdiff
-latexdiff-vc
-latexmk
-latexrevise
-listings-ext.sh
-mkjobtexmf
-mkluatexfontdb
-mkt1font
-mptopdf
-ot2kpx
-pdf180
-pdf270
-pdf90
-pdfatfi
-pdfbook
-pdfcrop
-pdfflip
-pdfjam
-pdfjam-pocketmod
-pdfjam-slides3up
-pdfjam-slides6up
-pdfjoin
-pdfnup
-pdfpun
-pfm2kpx
-pkfix
-pkfix-helper
-purifyeps
-repstopdf
-rpdfcrop
-showglyphs
-sty2dtx
-texcount
-texdef
-texdiff
-texdirflatten
-texloganalyser
-thumbpdf
-vpl2ovp
-vpl2vpl
-"
- _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
- _langextra_scripts="ebong"
- _langgreek_scripts="mkgrkindex"
- _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
-vpe"
- _music_scripts="musixtex musixflx"
- _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
- _pstricks_scripts="pst2pdf"
- _science_scripts="ulqda"
- for s in \
- ${_bibtexextra_scripts} \
- ${_core_scripts} \
- ${_htmlxml_scripts} \
- ${_langextra_scripts} \
- ${_langgreek_scripts} \
- ${_latexextra_scripts} \
- ${_music_scripts} \
- ${_pictures_scripts} \
- ${_pstricks_scripts} \
- ${_science_scripts} \
- tlmgr; do
- rm -f $pkgdir/usr/bin/$s
- done
- ###################################################################
-}
-
diff --git a/testing/texlive-bin/archlinux-build.patch b/testing/texlive-bin/archlinux-build.patch
deleted file mode 100644
index accb97a7a..000000000
--- a/testing/texlive-bin/archlinux-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am
---- source.old/texk/am/script_links.am 2011-05-02 13:54:33.000000000 +0200
-+++ source/texk/am/script_links.am 2011-06-05 11:22:53.118216353 +0200
-@@ -51,8 +51,8 @@
- # We support both multiplatform and non-multiplatform builds.
- install-links:
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- exit 1;; \
- esac
-diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am
---- source.old/texk/tetex/Makefile.am 2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/tetex/Makefile.am 2011-06-05 10:28:40.287025375 +0200
-@@ -35,7 +35,7 @@
-
- include $(srcdir)/../am/script_links.am
-
--texmfdir = ${prefix}/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
-
- if !WIN32
-diff -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am
---- source.old/texk/texlive/linked_scripts/Makefile.am 2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/texlive/linked_scripts/Makefile.am 2011-06-05 09:41:50.997250443 +0200
-@@ -165,8 +165,8 @@
- done
- else !WIN32
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
-+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
- exit 1;; \
- esac
diff --git a/testing/texlive-bin/fix-fontforge-encoding.patch b/testing/texlive-bin/fix-fontforge-encoding.patch
deleted file mode 100644
index 8104b3289..000000000
--- a/testing/texlive-bin/fix-fontforge-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200
-+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200
-@@ -495,6 +495,9 @@
- { "Big5HKSCS", e_big5hkscs },
- { "Big5-HKSCS", e_big5hkscs },
- { "UTF-8", e_utf8 },
-+ { "utf-8", e_utf8 },
-+ { "UTF8", e_utf8 },
-+ { "utf8", e_utf8 },
- { "ISO-10646/UTF-8", e_utf8 },
- { "ISO_10646/UTF-8", e_utf8 },
- { "UCS2", e_unicode },
diff --git a/testing/texlive-bin/texlive.install b/testing/texlive-bin/texlive.install
deleted file mode 100644
index 9307c536b..000000000
--- a/testing/texlive-bin/texlive.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- echo ">>> texlive: updating the filename database..."
- usr/bin/mktexlsr
- echo -n "creating all formats..."
- usr/bin/fmtutil-sys --all 1>/dev/null
- echo " done."
- echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-}
-
-post_upgrade() {
- echo ">>> texlive: updating the filename database..."
- usr/bin/mktexlsr
- echo -n "recreating all formats..."
- usr/bin/fmtutil-sys --all 1>/dev/null
- echo " done."
- echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-}
-
diff --git a/testing/texlive-bin/texmf.cnf b/testing/texlive-bin/texmf.cnf
deleted file mode 100644
index 423d93e09..000000000
--- a/testing/texlive-bin/texmf.cnf
+++ /dev/null
@@ -1,676 +0,0 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
-% Public domain.
-%
-% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
-% updated. Instead, put your changes -- and only your changes, not an
-% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if
-% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
-%
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM. This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-% expanded into the compile-time default. Probably not what you want.
-%
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex. We make extensive
-% use of this.
-
-
-% Part 1: Search paths and directories.
-
-% This is the parent directory of our several trees, i.e.,
-% /usr/local/texlive/YYYY in the original TeX Live distribution.
-%
-% All trees must be organized according to the TeX Directory Structure
-% (http://tug.org/tds), or files may not be found.
-%
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-TEXMFROOT = $SELFAUTODIR/share
-
-% The tree containing runtime files related to the specific
-% distribution and version.
-TEXMFMAIN = $TEXMFROOT/texmf
-
-% The main tree of packages, distribution-agnostic:
-TEXMFDIST = $TEXMFROOT/texmf-dist
-
-% Local additions to the distribution trees.
-TEXMFLOCAL = /usr/local/share/texmf
-
-% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where *-sys store configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% Per-user texmf tree(s) -- organized per the TDS, as usual. To define
-% more than one per-user tree, set this to a list of directories in
-% braces, as described above. (This used to be HOMETEXMF.) ~ expands
-% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% List all the texmf trees.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-%
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
-% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as configuration files. Overriding them would
-% be more likely to cause trouble than help. On the other hand, the
-% bulk of packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those -- although it is generally
-% a source of confusion to have different versions of a package
-% installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files. There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees. These are the trees that are shared by all users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-
-% Where generated fonts may be written. This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats. For example
-% TEXMFVAR = /var/lib/texmf
-% is used in many distros. In this case, set VARTEXFONTS like this
-%VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files. The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc. We specify paths for all known
-% formats, past or present. Not all of them are built these days.
-
-% Plain TeX. Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/. In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-
-% ConTeXt.
-TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
-
-% jadetex.
-TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/. But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi. Must come before the generic settings.
-PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files. This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs. Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files. bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX). An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-
-% Opentype outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS = .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~. These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for fontconfig library, used by Windows versions of
-% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this.
-FONTCONFIG_FILE=fonts.conf
-FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs. If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% For security, do not look in . for dvipdfmx.cfg, since the D option
-% would allow command execution.
-DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-
-% Find scripts that are distributed/installed in the texmf tree.
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-%
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one under texmf/web2c.
-%
-% For security reasons, it is better not to include . in this path.
-%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-% Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first. If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried. The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension. A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases. E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}. When enabled fully (set to
-% t), obviously insecure. When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed. Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-%
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p. They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs. All to the best of our knowledge. They also have practical use
-% for being called from TeX.
-%
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-% and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-% without Unix convert it hardly seems worth it, and Windows convert
-% is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-shell_escape.initex = f
-
-% This is used by the Windows script wrapper for restricting searching
-% for the purportedly safe shell_escape_commands above to system
-% directories.
-TEXMF_RESTRICTED_SCRIPTS = \
- {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any) : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid) : as `r' and disallow going to parent directories, and
-% restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-%TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT. Set to the
-% empty string or 0 to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible. The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-parse_first_line.initex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default? These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option. Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
-
-% Used by makempx to run TeX. We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option. %d is replaced by the line number and %s by
-% the current filename. The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d "%s"
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*. (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0 % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 200000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences. These values apply to TeX.
-pool_size = 3250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size. TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line. As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much. The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767.
- % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500 % simultaneous semantic levels (e.g., groups)
-max_in_open = 15 % simultaneous input files and error insertions,
- % also applies to MetaPost
-param_size = 10000 % simultaneous macro parameters, also applies to MP
-save_size = 50000 % for saving values outside current group
-stack_size = 5000 % simultaneous input sources
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much. Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384 % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size = 250
-glob_str_size = 5000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index 59b827015..b5d4c9222 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131208 2011-07-11 21:32:31Z tomegun $
+# $Id: PKGBUILD 133994 2011-07-31 12:10:23Z tomegun $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -6,7 +6,7 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
-pkgver=172
+pkgver=173
pkgrel=2
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -16,16 +16,17 @@ groups=('base')
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
- static-node-permission.patch
81-arch.rules)
build() {
cd $srcdir/$pkgbase-$pkgver
- # permissions on static /dev/fuse node (will be in udev-173)
- patch -Np1 -i ../static-node-permission.patch
- ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
- --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\
- --disable-rule-generator
+ ./configure --sysconfdir=/etc\
+ --with-rootlibdir=/lib\
+ --libexecdir=/lib/udev\
+ --sbindir=/sbin\
+ --with-systemdsystemunitdir=/lib/systemd/system\
+ --disable-rule-generator\
+ --enable-udev_acl
make
}
@@ -92,6 +93,5 @@ package_udev-compat() {
# /dev/ppp
mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
}
-md5sums=('bd122d04cf758441f498aad0169a454f'
- '07e5b965d7e90988ea2f7ffb19a08ef7'
+md5sums=('91a88a359b60bbd074b024883cc0dbde'
'ec529eb1ddaabb70c61b38f80bb8462a')
diff --git a/testing/udev/static-node-permission.patch b/testing/udev/static-node-permission.patch
deleted file mode 100644
index 3d9a8722c..000000000
--- a/testing/udev/static-node-permission.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 36acdbcc776822624103eff7c80a9468317918ac Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Mon, 11 Jul 2011 22:56:37 +0200
-Subject: [PATCH] udevd: fix (recently) broken static node permission setting
-
-Many thanks to Tom Gundersen for identifying the issue.
----
- udev/udev-rules.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/udev/udev-rules.c b/udev/udev-rules.c
-index d16c1f9..7db0767 100644
---- a/udev/udev-rules.c
-+++ b/udev/udev-rules.c
-@@ -2721,7 +2721,7 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
- struct stat stats;
-
- /* we assure, that the permissions tokens are sorted before the static token */
-- if (uid == 0 && gid == 0)
-+ if (mode == 0 && uid == 0 && gid == 0)
- goto next;
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
- &rules->buf[cur->key.value_off], NULL);
---
-1.7.6
-
diff --git a/testing/udev/udev.install b/testing/udev/udev.install
index c3970fedd..272ab60c0 100644
--- a/testing/udev/udev.install
+++ b/testing/udev/udev.install
@@ -34,13 +34,15 @@ post_upgrade() {
fi
echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
echo " --"
- echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to /lib/modprobe.d"
- echo "Any customizations shoud be done to the file in /etc, as it takes precedence."
+ echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+ echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+ echo "takes precedence."
echo " --"
echo "kbd and rtc devices are no longer world readable."
echo " --"
- echo "rtc is no longer in the audio group and fb devices are no longer in the video group"
- echo "(permissions and ownership of fb devices are controlled by X)."
+ echo "rtc is no longer in the audio group and fb devices are no longer in"
+ echo "the video group, as permissions and ownership of fb devices are controlled"
+ echo "by X."
echo "---------------"
fi
}
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
index b4e5d96df..1f5a83097 100644
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ b/testing/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131016 2011-07-09 14:00:30Z ibiru $
+# $Id: PKGBUILD 132822 2011-07-26 12:31:08Z ibiru $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: buddabrod <buddabrod@gmail.com>
pkgname=xf86-video-nouveau
-_gitdate=20110709
+_gitdate=20110726
pkgver=0.0.16_git${_gitdate} # see configure.ac
pkgrel=1
pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
@@ -17,7 +17,7 @@ conflicts=('xorg-server<1.10.0')
options=('!libtool')
install=${pkgname}.install
source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('0b2ae81e397d14c8ab1d2338d194c705')
+md5sums=('8af188f6c2c90dfca3427809cd8fb76f')
# source PKGBUILD && mksource
mksource() {
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index 92d899d97..985df1189 100644
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: Richard Murri <admin@richardmurri.com>
pkgname=notmuch
-pkgver=0.6.1
+pkgver=0.7
pkgrel=1
pkgdesc="Notmuch is not much of an email program"
arch=(i686 x86_64 mips64el)
@@ -50,4 +50,4 @@ package(){
env LD_LIBRARY_PATH="." python2 setup.py build
env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir
}
-md5sums=('a2d5123d68a0f770e5afe3c2af9f35a3')
+md5sums=('475197e505255b9603eedb53a68aa32d')