summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Schieli <cschieli@gmail.com>2010-06-01 12:37:47 +0000
committerCedric Schieli <cschieli@gmail.com>2010-06-01 12:37:47 +0000
commit10b8b99e48384b4470cac1330080c12d2ade01de (patch)
tree7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5
parent9252f1cfd78299b137400ed8169a79f7f833daac (diff)
parentc6c0b6f9dbde1244e7b31f74c703178a867e873f (diff)
downloadaports-to-upstream.tar.bz2
aports-to-upstream.tar.xz
Merge remote branch 'upstream/master' into to-upstreamto-upstream
-rw-r--r--main/a2ps/APKBUILD2
-rw-r--r--main/a52dec/APKBUILD2
-rw-r--r--main/abiword/APKBUILD54
-rw-r--r--main/abuild/APKBUILD9
-rw-r--r--main/acct/APKBUILD2
-rw-r--r--main/acf-weblog/APKBUILD4
-rw-r--r--main/alpine-base/APKBUILD4
-rw-r--r--main/alpine-baselayout/APKBUILD7
-rw-r--r--main/alpine-conf/APKBUILD8
-rw-r--r--main/alpine-sdk/APKBUILD1
-rw-r--r--main/alsa-lib/APKBUILD7
-rw-r--r--main/amavisd-new/APKBUILD2
-rw-r--r--main/antiword/APKBUILD2
-rw-r--r--main/apcupsd/APKBUILD2
-rw-r--r--main/apg/APKBUILD2
-rw-r--r--main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch27
-rw-r--r--main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch42
-rw-r--r--main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch221
-rw-r--r--main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch27
-rw-r--r--main/apk-tools/0005-cache-display-more-than-one-error.patch55
-rw-r--r--main/apk-tools/APKBUILD19
-rw-r--r--main/apr-util/APKBUILD2
-rw-r--r--main/apr/APKBUILD2
-rw-r--r--main/arpon/APKBUILD2
-rw-r--r--main/arpwatch/APKBUILD2
-rw-r--r--main/aspell/APKBUILD13
-rw-r--r--main/asterisk-addons/APKBUILD75
-rw-r--r--main/asterisk/APKBUILD6
-rw-r--r--main/aterm/APKBUILD2
-rw-r--r--main/atk/APKBUILD2
-rw-r--r--main/atop/APKBUILD8
-rw-r--r--main/attr/APKBUILD2
-rw-r--r--main/aumix/APKBUILD2
-rw-r--r--main/b43-fwcutter/APKBUILD11
-rw-r--r--main/babl/APKBUILD23
-rw-r--r--main/bash/APKBUILD6
-rw-r--r--main/bbsuid/APKBUILD4
-rw-r--r--main/bc/APKBUILD2
-rw-r--r--main/bdftopcf/APKBUILD2
-rw-r--r--main/beecrypt/APKBUILD21
-rw-r--r--main/beep/APKBUILD4
-rw-r--r--main/bind/APKBUILD2
-rw-r--r--main/binutils/APKBUILD1
-rw-r--r--main/bison/APKBUILD2
-rw-r--r--main/boost/APKBUILD147
-rw-r--r--main/boost/boost-1.41.0-parameter-needs-python.patch106
-rw-r--r--main/boost/boost-uclibc-thread.patch11
-rw-r--r--main/boost/random-Jamfile15
-rw-r--r--main/bridge-utils/APKBUILD6
-rw-r--r--main/build-base/APKBUILD1
-rw-r--r--main/busybox-initscripts/APKBUILD6
-rw-r--r--main/busybox-initscripts/mdev.conf5
-rw-r--r--main/busybox-initscripts/usbdev8
-rw-r--r--main/busybox/APKBUILD46
-rw-r--r--main/bwm-ng/APKBUILD2
-rw-r--r--main/bzip2/APKBUILD4
-rw-r--r--main/c-ares/APKBUILD2
-rw-r--r--main/cabextract/APKBUILD2
-rw-r--r--main/cairo/APKBUILD2
-rw-r--r--main/ccache/APKBUILD4
-rw-r--r--main/cciss_vol_status/APKBUILD2
-rw-r--r--main/cdrkit/APKBUILD2
-rw-r--r--main/cgit/APKBUILD9
-rw-r--r--main/chrony/APKBUILD2
-rw-r--r--main/cksfv/APKBUILD2
-rw-r--r--main/clamav/APKBUILD69
-rw-r--r--main/clamsmtp/APKBUILD2
-rw-r--r--main/claws-mail/APKBUILD6
-rw-r--r--main/cmake/APKBUILD2
-rw-r--r--main/confuse/APKBUILD6
-rw-r--r--main/conntrack-tools/APKBUILD2
-rw-r--r--main/coreutils/APKBUILD6
-rw-r--r--main/cpufreqd/APKBUILD12
-rw-r--r--main/cpufrequtils/APKBUILD2
-rw-r--r--main/cracklib/APKBUILD4
-rw-r--r--main/cramfs/APKBUILD9
-rw-r--r--main/ctags/APKBUILD4
-rw-r--r--main/cups/APKBUILD6
-rw-r--r--main/curl/APKBUILD15
-rw-r--r--main/cutter/APKBUILD4
-rw-r--r--main/cvs/APKBUILD4
-rw-r--r--main/cyrus-sasl/APKBUILD2
-rw-r--r--main/dahdi-tools/APKBUILD2
-rw-r--r--main/dansguardian/APKBUILD2
-rw-r--r--main/db/APKBUILD2
-rw-r--r--main/dbus-glib/APKBUILD8
-rw-r--r--main/dbus/APKBUILD4
-rw-r--r--main/dbus/dbus.post-install3
-rw-r--r--main/debootstrap/APKBUILD2
-rw-r--r--main/desktop-file-utils/APKBUILD2
-rw-r--r--main/dhcp/APKBUILD2
-rw-r--r--main/dhcpcd-dbus/APKBUILD2
-rw-r--r--main/dhcpcd-ui/APKBUILD2
-rw-r--r--main/dhcpcd/APKBUILD2
-rw-r--r--main/dialog/APKBUILD9
-rw-r--r--main/diffutils/APKBUILD4
-rw-r--r--main/dircproxy/APKBUILD2
-rw-r--r--main/distcc/APKBUILD11
-rw-r--r--main/djbdns/APKBUILD6
-rwxr-xr-xmain/djbdns/dnscache.monthly4
-rw-r--r--main/dnsmasq/APKBUILD2
-rw-r--r--main/dosfstools/APKBUILD2
-rw-r--r--main/dovecot/APKBUILD2
-rw-r--r--main/dpkg/APKBUILD2
-rw-r--r--main/dropbear/APKBUILD2
-rw-r--r--main/dtach/APKBUILD4
-rw-r--r--main/e2fsprogs/APKBUILD4
-rw-r--r--main/eggdrop/APKBUILD2
-rw-r--r--main/email/APKBUILD4
-rw-r--r--main/enchant/APKBUILD13
-rw-r--r--main/epdfview/APKBUILD18
-rw-r--r--main/epris/APKBUILD2
-rw-r--r--main/espeak/APKBUILD2
-rw-r--r--main/ethtool/APKBUILD4
-rw-r--r--main/exo/APKBUILD6
-rw-r--r--main/expat/APKBUILD2
-rw-r--r--main/ez-ipupdate/APKBUILD2
-rw-r--r--main/faac/APKBUILD12
-rw-r--r--main/faad2/APKBUILD2
-rw-r--r--main/fakeroot/APKBUILD2
-rw-r--r--main/fcgi/APKBUILD4
-rw-r--r--main/feh/APKBUILD4
-rw-r--r--main/fetchmail/APKBUILD6
-rw-r--r--main/ffmpeg/APKBUILD2
-rw-r--r--main/file/APKBUILD2
-rw-r--r--main/findutils/APKBUILD2
-rw-r--r--main/flac/APKBUILD10
-rw-r--r--main/flex/APKBUILD2
-rw-r--r--main/fluxbox/APKBUILD2
-rw-r--r--main/font-util/APKBUILD2
-rw-r--r--main/fontconfig/APKBUILD2
-rw-r--r--main/fping/APKBUILD4
-rw-r--r--main/fprobe/APKBUILD2
-rw-r--r--main/freeswitch/APKBUILD (renamed from testing/freeswitch/APKBUILD)45
-rw-r--r--main/freeswitch/freeswitch.confd (renamed from testing/freeswitch/freeswitch.confd)0
-rwxr-xr-xmain/freeswitch/freeswitch.initd58
-rwxr-xr-xmain/freeswitch/freeswitch.post-install5
-rwxr-xr-xmain/freeswitch/freeswitch.pre-install5
-rw-r--r--main/freeswitch/modules.conf (renamed from testing/freeswitch/modules.conf)0
-rw-r--r--main/freetds/APKBUILD2
-rw-r--r--main/freetype/APKBUILD2
-rw-r--r--main/fribidi/APKBUILD2
-rw-r--r--main/galculator/APKBUILD2
-rw-r--r--main/gamin/APKBUILD2
-rw-r--r--main/gawk/APKBUILD8
-rw-r--r--main/gcc/APKBUILD16
-rw-r--r--main/gcc/gcc-dynamic-linker.patch425
-rw-r--r--main/gd/APKBUILD2
-rw-r--r--main/gdb/APKBUILD2
-rw-r--r--main/gdbm/APKBUILD4
-rw-r--r--main/geany/APKBUILD2
-rw-r--r--main/gegl/APKBUILD36
-rw-r--r--main/gegl/gegl-uclibc.patch22
-rw-r--r--main/gettext/APKBUILD4
-rw-r--r--main/ghostscript/APKBUILD2
-rw-r--r--main/giblib/APKBUILD2
-rw-r--r--main/giflib/APKBUILD2
-rw-r--r--main/gimp/APKBUILD46
-rw-r--r--main/gimp/gtk-2.19-statusbar.patch67
-rw-r--r--main/gimp/libpng-1.4.patch26
-rw-r--r--main/git/APKBUILD20
-rw-r--r--main/git/git-do-not-dump-core-when-iconv-fails.patch43
-rw-r--r--main/glib/APKBUILD8
-rw-r--r--main/gmp/APKBUILD2
-rw-r--r--main/gmp5/APKBUILD47
-rw-r--r--main/gmp5/gmp-4.1.4-noexecstack.patch20
-rw-r--r--main/gnats/APKBUILD4
-rw-r--r--main/gnupg/APKBUILD12
-rw-r--r--main/gnutls/APKBUILD2
-rw-r--r--main/gobject-introspection/APKBUILD9
-rw-r--r--main/goffice/APKBUILD29
-rw-r--r--main/gperf/APKBUILD11
-rw-r--r--main/gpicview/APKBUILD2
-rw-r--r--main/grep/APKBUILD2
-rw-r--r--main/groff/APKBUILD13
-rw-r--r--main/gross/APKBUILD2
-rw-r--r--main/gst-ffmpeg/APKBUILD (renamed from main/gst-plugins-ffmpeg/APKBUILD)27
-rw-r--r--main/gst-plugins-bad/APKBUILD13
-rw-r--r--main/gst-plugins-base/APKBUILD6
-rw-r--r--main/gst-plugins-good/APKBUILD7
-rw-r--r--main/gst-plugins-ugly/APKBUILD9
-rw-r--r--main/gstreamer/APKBUILD4
-rw-r--r--main/gtk+/APKBUILD8
-rw-r--r--main/gtk-doc/APKBUILD6
-rw-r--r--main/gtk-vnc/APKBUILD2
-rw-r--r--main/gtk-xfce-engine/APKBUILD2
-rw-r--r--main/guile/APKBUILD11
-rw-r--r--main/gzip/APKBUILD2
-rw-r--r--main/haserl/APKBUILD9
-rw-r--r--main/heimdal/APKBUILD2
-rw-r--r--main/hostapd/APKBUILD2
-rw-r--r--main/htop/APKBUILD2
-rw-r--r--main/hunspell/APKBUILD16
-rw-r--r--main/hylafax/APKBUILD2
-rw-r--r--main/hypermail/APKBUILD2
-rw-r--r--main/iaxmodem/APKBUILD2
-rw-r--r--main/iceauth/APKBUILD2
-rw-r--r--main/icu/APKBUILD7
-rw-r--r--main/iftop/APKBUILD2
-rw-r--r--main/igmpproxy/APKBUILD2
-rw-r--r--main/imagemagick/APKBUILD4
-rw-r--r--main/imap/APKBUILD2
-rw-r--r--main/imlib2/APKBUILD15
-rw-r--r--main/imlib2/bufferoverflow.patch13
-rw-r--r--main/imlib2/libpng14.patch12
-rw-r--r--main/iperf/APKBUILD2
-rw-r--r--main/iproute2/APKBUILD8
-rw-r--r--main/ipsec-tools/APKBUILD2
-rw-r--r--main/iptables/APKBUILD2
-rw-r--r--main/iptraf/APKBUILD2
-rw-r--r--main/iputils/APKBUILD2
-rw-r--r--main/ircii/APKBUILD2
-rw-r--r--main/irssi/APKBUILD20
-rw-r--r--main/iscsitarget/APKBUILD2
-rw-r--r--main/jasper/APKBUILD2
-rw-r--r--main/jpeg/APKBUILD2
-rw-r--r--main/kamailio/APKBUILD6
-rw-r--r--main/ksymoops/APKBUILD4
-rw-r--r--main/lame/APKBUILD2
-rw-r--r--main/less/APKBUILD9
-rw-r--r--main/lftp/APKBUILD12
-rw-r--r--main/lha/APKBUILD4
-rw-r--r--main/libao/APKBUILD12
-rw-r--r--main/libart-lgpl/APKBUILD2
-rw-r--r--main/libassuan/APKBUILD13
-rw-r--r--main/libc0.9.32/0001-ldd-segfault-fix.patch (renamed from main/uclibc/0001-ldd-segfault-fix.patch)0
-rw-r--r--main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch125
-rw-r--r--main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch69
-rw-r--r--main/libc0.9.32/APKBUILD106
-rw-r--r--main/libc0.9.32/compat-stack-guard.patch51
-rw-r--r--main/libc0.9.32/uclibc-libm-pic.patch67
-rw-r--r--main/libc0.9.32/uclibc-resolv-tls.patch15
l---------main/libc0.9.32/uclibcconfig.i4861
-rw-r--r--main/libc0.9.32/uclibcconfig.x86 (renamed from main/uclibc/uclibcconfig.x86)31
-rw-r--r--main/libcap/APKBUILD2
-rw-r--r--main/libconfig/APKBUILD2
-rw-r--r--main/libcroco/APKBUILD2
-rw-r--r--main/libdnet/APKBUILD5
-rw-r--r--main/libdrm/APKBUILD2
-rw-r--r--main/libetpan/APKBUILD8
-rw-r--r--main/libevent/APKBUILD2
-rw-r--r--main/libexif/APKBUILD2
-rw-r--r--main/libffi/APKBUILD2
-rw-r--r--main/libfontenc/APKBUILD2
-rw-r--r--main/libgcrypt/APKBUILD2
-rw-r--r--main/libglade/APKBUILD2
-rw-r--r--main/libgpg-error/APKBUILD4
-rw-r--r--main/libgsf/APKBUILD8
-rw-r--r--main/libice/APKBUILD2
-rw-r--r--main/libiconv/APKBUILD4
-rw-r--r--main/libid3tag/APKBUILD2
-rw-r--r--main/libidn/APKBUILD2
-rw-r--r--main/libksba/APKBUILD9
-rw-r--r--main/libmad/APKBUILD2
-rw-r--r--main/libmcrypt/APKBUILD4
-rw-r--r--main/libmpdclient/APKBUILD2
-rw-r--r--main/libmpeg2/APKBUILD2
-rw-r--r--main/libnet/APKBUILD2
-rw-r--r--main/libnetfilter_conntrack/APKBUILD2
-rw-r--r--main/libnfnetlink/APKBUILD4
-rw-r--r--main/libnl/APKBUILD2
-rw-r--r--main/libnotify/APKBUILD2
-rw-r--r--main/libogg/APKBUILD9
-rw-r--r--main/liboil/APKBUILD2
-rw-r--r--main/libpaper/APKBUILD2
-rw-r--r--main/libpcap/APKBUILD30
-rw-r--r--main/libpcap/libpcap-1.0.0-LDFLAGS.patch13
-rw-r--r--main/libpcap/libpcap-any.patch157
-rw-r--r--main/libpciaccess/APKBUILD2
-rw-r--r--main/libpng/APKBUILD2
-rw-r--r--main/libpri/APKBUILD2
-rw-r--r--main/libpthread-stubs/APKBUILD2
-rw-r--r--main/librsvg/APKBUILD4
-rw-r--r--main/libsamplerate/APKBUILD4
-rw-r--r--main/libsexy/APKBUILD2
-rw-r--r--main/libsm/APKBUILD2
-rw-r--r--main/libsndfile/APKBUILD2
-rw-r--r--main/libsoup/APKBUILD4
-rw-r--r--main/libspf2/APKBUILD2
-rw-r--r--main/libtasn1/APKBUILD4
-rw-r--r--main/libtheora/APKBUILD2
-rw-r--r--main/libtool/APKBUILD2
-rw-r--r--main/libunique/APKBUILD (renamed from testing/libunique/APKBUILD)2
-rw-r--r--main/libusb-compat/APKBUILD11
-rw-r--r--main/libusb/APKBUILD4
-rw-r--r--main/libvorbis/APKBUILD8
-rw-r--r--main/libwnck/APKBUILD2
-rw-r--r--main/libx11/APKBUILD2
-rw-r--r--main/libxau/APKBUILD2
-rw-r--r--main/libxcb/APKBUILD6
-rw-r--r--main/libxcomposite/APKBUILD2
-rw-r--r--main/libxcursor/APKBUILD2
-rw-r--r--main/libxdamage/APKBUILD2
-rw-r--r--main/libxdmcp/APKBUILD2
-rw-r--r--main/libxext/APKBUILD2
-rw-r--r--main/libxfce4menu/APKBUILD11
-rw-r--r--main/libxfce4util/APKBUILD10
-rw-r--r--main/libxfcegui4/APKBUILD8
-rw-r--r--main/libxfixes/APKBUILD2
-rw-r--r--main/libxfont/APKBUILD2
-rw-r--r--main/libxft/APKBUILD2
-rw-r--r--main/libxi/APKBUILD2
-rw-r--r--main/libxinerama/APKBUILD2
-rw-r--r--main/libxkbfile/APKBUILD2
-rw-r--r--main/libxkbui/APKBUILD2
-rw-r--r--main/libxklavier/APKBUILD2
-rw-r--r--main/libxml2/APKBUILD12
-rw-r--r--main/libxml2/zlib.patch32
-rw-r--r--main/libxmu/APKBUILD2
-rw-r--r--main/libxpm/APKBUILD2
-rw-r--r--main/libxrandr/APKBUILD2
-rw-r--r--main/libxrender/APKBUILD2
-rw-r--r--main/libxres/APKBUILD2
-rw-r--r--main/libxslt/APKBUILD2
-rw-r--r--main/libxt/APKBUILD2
-rw-r--r--main/libxtst/APKBUILD2
-rw-r--r--main/libxv/APKBUILD2
-rw-r--r--main/libxvmc/APKBUILD2
-rw-r--r--main/libxxf86dga/APKBUILD2
-rw-r--r--main/libxxf86misc/APKBUILD2
-rw-r--r--main/libxxf86vm/APKBUILD2
-rw-r--r--main/lighttpd/APKBUILD2
-rw-r--r--main/links/APKBUILD2
-rw-r--r--main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch120
-rw-r--r--main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch36
-rw-r--r--main/linux-grsec/APKBUILD25
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch)8371
-rw-r--r--main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch14
-rw-r--r--main/linux-headers/APKBUILD16
-rw-r--r--main/linux-vserver/APKBUILD14
-rw-r--r--main/lm_sensors/APKBUILD2
-rw-r--r--main/logrotate/APKBUILD2
-rw-r--r--main/lsof/APKBUILD2
-rw-r--r--main/lua-bitlib/APKBUILD2
-rw-r--r--main/lua-discount/APKBUILD2
-rw-r--r--main/lua-expat/APKBUILD2
-rw-r--r--main/lua-iconv/APKBUILD2
-rw-r--r--main/lua-md5/APKBUILD2
-rw-r--r--main/lua-openrc/APKBUILD2
-rw-r--r--main/lua-pc/APKBUILD2
-rw-r--r--main/lua-posix/APKBUILD2
-rw-r--r--main/lua-socket/APKBUILD2
-rw-r--r--main/lua-sql-mysql/APKBUILD2
-rw-r--r--main/lua-sql-postgres/APKBUILD2
-rw-r--r--main/lua-sql-sqlite3/APKBUILD2
-rw-r--r--main/lua-uuid/APKBUILD2
-rw-r--r--main/lua-zlib/APKBUILD2
-rw-r--r--main/lua/APKBUILD2
-rw-r--r--main/lvm2/APKBUILD8
-rw-r--r--main/lzo/APKBUILD4
-rw-r--r--main/m4/APKBUILD2
-rw-r--r--main/make/APKBUILD2
-rw-r--r--main/man/APKBUILD2
-rw-r--r--main/mdadm/APKBUILD2
-rw-r--r--main/mercurial/APKBUILD4
-rw-r--r--main/mesa/APKBUILD2
-rw-r--r--main/midori/APKBUILD4
-rw-r--r--main/mini_httpd/APKBUILD2
-rw-r--r--main/minicom/APKBUILD2
-rw-r--r--main/mkfontscale/APKBUILD2
-rw-r--r--main/mlmmj/APKBUILD2
-rw-r--r--main/module-init-tools/APKBUILD2
-rw-r--r--main/mousepad/APKBUILD2
-rw-r--r--main/mpc/APKBUILD2
-rw-r--r--main/mpd/APKBUILD2
-rw-r--r--main/mpfr/APKBUILD11
-rw-r--r--main/mpg123/APKBUILD2
-rw-r--r--main/mplayer/APKBUILD (renamed from testing/mplayer/APKBUILD)20
-rw-r--r--main/mplayer/liba52_gcc_bug.patch (renamed from testing/mplayer/liba52_gcc_bug.patch)0
-rw-r--r--main/mplayer/mplayer/configure.orig (renamed from testing/mplayer/mplayer/configure.orig)0
-rw-r--r--main/mplayer/mplayer/configure.rej (renamed from testing/mplayer/mplayer/configure.rej)0
-rw-r--r--main/mrxvt/APKBUILD2
-rw-r--r--main/mtools/APKBUILD2
-rw-r--r--main/mysql/APKBUILD4
-rw-r--r--main/nano/APKBUILD2
-rw-r--r--main/nasm/APKBUILD2
-rw-r--r--main/ncftp/APKBUILD28
-rw-r--r--main/ncurses/APKBUILD2
-rw-r--r--main/neon/APKBUILD10
-rw-r--r--main/net-snmp/APKBUILD38
-rw-r--r--main/net-snmp/CVE-2008-6123.patch19
-rw-r--r--main/newt/APKBUILD16
-rw-r--r--main/newt/newt-0.52.7-notcl.patch35
-rw-r--r--main/nfs-utils/APKBUILD16
-rw-r--r--main/ngircd/APKBUILD4
-rw-r--r--main/nmap/APKBUILD2
-rw-r--r--main/nrpe/APKBUILD2
-rw-r--r--main/nspr/APKBUILD64
-rw-r--r--main/nspr/nspr-4.6.1-config-1.patch11
-rw-r--r--main/nspr/nspr-4.7.0-prtime.patch26
-rw-r--r--main/nspr/nspr-4.8-config.patch47
-rw-r--r--main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch126
-rw-r--r--main/nss/APKBUILD119
-rw-r--r--main/nss/add_spi+cacert_ca_certs.patch1168
-rw-r--r--main/nss/nss-config.in145
-rw-r--r--main/nss/nss-no-rpath.patch14
-rw-r--r--main/nss/nss-nolocalsql.patch52
-rw-r--r--main/nss/nss.pc.in11
-rw-r--r--main/nss/ssl-renegotiate-transitional.patch21
-rw-r--r--main/ntfs-3g/APKBUILD4
-rw-r--r--main/oidentd/APKBUILD2
-rw-r--r--main/openldap/APKBUILD2
-rw-r--r--main/opennhrp/APKBUILD8
-rw-r--r--main/opennhrp/opennhrp-script-timeout.patch13
-rw-r--r--main/openntpd/APKBUILD2
-rw-r--r--main/openrc/APKBUILD2
-rw-r--r--main/openssh/APKBUILD4
-rw-r--r--main/openssl/APKBUILD44
-rw-r--r--main/openssl/fix-manpages.patch1329
-rw-r--r--main/openssl/openssl-0.9.8k-quote-cc.patch72
-rw-r--r--main/openvpn/APKBUILD2
-rw-r--r--main/oprofile/APKBUILD2
-rw-r--r--main/orage/APKBUILD2
-rw-r--r--main/p7zip/APKBUILD6
-rw-r--r--main/pango/APKBUILD2
-rw-r--r--main/parole/APKBUILD2
-rw-r--r--main/parted/APKBUILD2
-rw-r--r--main/patch/APKBUILD2
-rw-r--r--main/pax-utils/APKBUILD2
-rw-r--r--main/paxctl/APKBUILD2
-rw-r--r--main/pciutils/APKBUILD2
-rw-r--r--main/pcmciautils/APKBUILD2
-rw-r--r--main/pcre/APKBUILD2
-rw-r--r--main/perl-compress-raw-bzip2/APKBUILD2
-rw-r--r--main/perl-compress-raw-zlib/APKBUILD2
-rw-r--r--main/perl-convert-uulib/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD2
-rw-r--r--main/perl-crypt-openssl-rsa/APKBUILD2
-rw-r--r--main/perl-db/APKBUILD2
-rw-r--r--main/perl-db_file/APKBUILD2
-rw-r--r--main/perl-digest-sha1/APKBUILD2
-rw-r--r--main/perl-file-rsync/APKBUILD2
-rw-r--r--main/perl-html-parser/APKBUILD2
-rw-r--r--main/perl-mail-clamav/APKBUILD2
-rw-r--r--main/perl-mail-spamassassin/APKBUILD2
-rw-r--r--main/perl-net-dns/APKBUILD2
-rw-r--r--main/perl-net-ssleay/APKBUILD2
-rw-r--r--main/perl-netaddr-ip/APKBUILD2
-rw-r--r--main/perl-test-pod/APKBUILD6
-rw-r--r--main/perl-time-hires/APKBUILD2
-rw-r--r--main/perl-unix-syslog/APKBUILD2
-rw-r--r--main/perl-xml-parser/APKBUILD2
-rw-r--r--main/perl/APKBUILD2
-rw-r--r--main/pgcluster/APKBUILD2
-rw-r--r--main/pgpool/APKBUILD2
-rw-r--r--main/php-apc/APKBUILD2
-rw-r--r--main/php-fileinfo/APKBUILD2
-rw-r--r--main/php/APKBUILD24
-rw-r--r--main/php/php-install-pear-xml.patch15
-rw-r--r--main/pidgin/APKBUILD64
-rw-r--r--main/pidgin/msn_fix.patch28
-rw-r--r--main/pinentry/APKBUILD42
-rw-r--r--main/pinentry/pinentry-gtk.post-deinstall8
-rw-r--r--main/pinentry/pinentry-gtk.post-install4
-rw-r--r--main/pinentry/pinentry.post-deinstall6
-rw-r--r--main/pinentry/pinentry.post-install6
-rw-r--r--main/pingu/APKBUILD2
-rw-r--r--main/pixman/APKBUILD4
-rw-r--r--main/pjproject/APKBUILD15
-rw-r--r--main/pkgconfig/APKBUILD2
-rw-r--r--main/policyd-spf-fs/APKBUILD3
-rw-r--r--main/poppler-gtk/APKBUILD2
-rw-r--r--main/poppler/APKBUILD2
-rw-r--r--main/popt/APKBUILD10
-rw-r--r--main/portmap/APKBUILD13
-rw-r--r--main/portmap/portmap.pre-install2
-rw-r--r--main/postfix/APKBUILD10
-rw-r--r--main/postfix/postfix-2.6.1-dynamicmaps.patch5273
-rw-r--r--main/postfix/postfix-2.7.0-dynamic-maps.patch1064
-rw-r--r--main/postgresql/APKBUILD12
-rw-r--r--main/postgresql/pg-restore.confd2
-rw-r--r--main/postgresql/pg-restore.initd20
-rw-r--r--main/postgresql/postgresql.confd2
-rw-r--r--main/postgresql/postgresql.initd36
-rw-r--r--main/pound/APKBUILD11
-rw-r--r--main/pound/pound-2.5-openssl.patch290
-rw-r--r--main/ppp/APKBUILD2
-rw-r--r--main/procps/APKBUILD2
-rw-r--r--main/psqlodbc/APKBUILD (renamed from testing/psqlodbc/APKBUILD)2
-rw-r--r--main/pth/APKBUILD4
-rw-r--r--main/python/APKBUILD2
-rw-r--r--main/qemu/APKBUILD (renamed from testing/qemu/APKBUILD)52
-rw-r--r--main/qemu/kqemu.c (renamed from testing/qemu/kqemu.c)0
-rw-r--r--main/qemu/kqemu.patch (renamed from testing/qemu/kqemu.patch)0
-rw-r--r--main/qemu/qemu-0.10.3-nopl-fix.patch (renamed from testing/qemu/qemu-0.10.3-nopl-fix.patch)0
-rw-r--r--main/qemu/qemu.pre-install (renamed from testing/qemu/qemu.pre-install)0
-rw-r--r--main/quagga/APKBUILD8
-rw-r--r--main/quagga/quagga-revert-confed-check.patch97
-rw-r--r--main/rarian/APKBUILD2
-rw-r--r--main/razor/APKBUILD4
-rw-r--r--main/rdesktop/APKBUILD8
-rw-r--r--main/readline/APKBUILD2
-rw-r--r--main/remmina/APKBUILD2
-rw-r--r--main/rgb/APKBUILD2
-rw-r--r--main/ristretto/APKBUILD2
-rw-r--r--main/rrdtool/APKBUILD14
-rw-r--r--main/rsync/APKBUILD2
-rw-r--r--main/ruby/APKBUILD23
-rw-r--r--main/ruby/ruby-openssl-1.0.0.patch167
-rw-r--r--main/ruby/test.db0
-rw-r--r--main/run-parts/APKBUILD2
-rw-r--r--main/rxmtp/APKBUILD2
-rw-r--r--main/samba/APKBUILD20
-rw-r--r--main/samba/samba-uclibc-fstab.patch15
-rw-r--r--main/screen/APKBUILD2
-rw-r--r--main/scrot/APKBUILD2
-rw-r--r--main/sdl/APKBUILD2
-rw-r--r--main/sed/APKBUILD2
-rw-r--r--main/sessreg/APKBUILD2
-rw-r--r--main/setxkbmap/APKBUILD2
-rw-r--r--main/sfic/APKBUILD19
-rw-r--r--main/shared-mime-info/APKBUILD2
-rw-r--r--main/sic/APKBUILD4
-rw-r--r--main/slang/APKBUILD2
-rw-r--r--main/slim/APKBUILD2
-rw-r--r--main/snort/APKBUILD2
-rw-r--r--main/sntpc/APKBUILD2
-rw-r--r--main/sox/APKBUILD7
-rw-r--r--main/spamassassin/APKBUILD2
-rw-r--r--main/spandsp/APKBUILD2
-rw-r--r--main/sqlite/APKBUILD2
-rw-r--r--main/squashfs-tools/APKBUILD2
-rw-r--r--main/squid/APKBUILD2
-rw-r--r--main/ssmtp/APKBUILD2
-rw-r--r--main/startup-notification/APKBUILD12
-rw-r--r--main/strace/APKBUILD6
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/sudo/APKBUILD6
-rw-r--r--main/swfdec-mozilla/APKBUILD2
-rw-r--r--main/swfdec/APKBUILD2
-rw-r--r--main/swig/APKBUILD2
-rw-r--r--main/sylpheed/APKBUILD2
-rw-r--r--main/sysfsutils/APKBUILD4
-rw-r--r--main/sysklogd/APKBUILD2
-rw-r--r--main/syslinux/APKBUILD21
-rw-r--r--main/syslinux/syslinux-3.72-nopie.patch12
-rw-r--r--main/syslinux/syslinux-3.86-nopie.patch11
-rw-r--r--main/sysstat/APKBUILD2
-rw-r--r--main/taglib/APKBUILD4
-rw-r--r--main/tar/APKBUILD2
-rw-r--r--main/tcl/APKBUILD2
-rw-r--r--main/tcpdump/APKBUILD10
-rw-r--r--main/tcpproxy/APKBUILD2
-rw-r--r--main/terminal/APKBUILD4
-rw-r--r--main/texinfo/APKBUILD2
-rw-r--r--main/tftpd-hpa/APKBUILD2
-rw-r--r--main/thunar-archive-plugin/APKBUILD2
-rw-r--r--main/thunar/APKBUILD13
-rw-r--r--main/thunar/libpng-1.4.patch12
-rw-r--r--main/tiff/APKBUILD2
-rw-r--r--main/tinyproxy/APKBUILD2
-rw-r--r--main/tmux/APKBUILD2
-rw-r--r--main/transmission/APKBUILD6
-rw-r--r--main/ucarp/APKBUILD2
-rw-r--r--main/uclibc++/APKBUILD2
-rw-r--r--main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch115
-rw-r--r--main/uclibc/0001-avr32-add-varargs-handling-of-prctl-syscall.patch74
-rw-r--r--main/uclibc/0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch87
-rw-r--r--main/uclibc/0003-rpc-fix-typo-in-version-mismatch-msg.patch26
-rw-r--r--main/uclibc/0004-fix-make-install_-host-utils.patch158
-rw-r--r--main/uclibc/0005-host-utils-depend-on-headers.patch35
-rw-r--r--main/uclibc/0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch113
-rw-r--r--main/uclibc/0007-Unbreak-build-for-sparc-on-some-config-s.patch42
-rw-r--r--main/uclibc/0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch89
-rw-r--r--main/uclibc/0009-libm-enable-log2f-and-exp2f.patch70
-rw-r--r--main/uclibc/APKBUILD88
-rw-r--r--main/uclibc/pthread-new-aliasing-fix.diff147
-rw-r--r--main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch137
-rw-r--r--main/uclibc/uclibc-0.9.30.1-resolv.patch13
-rw-r--r--main/uclibc/uclibc-fork-hidden.diff115
-rw-r--r--main/uclibc/uclibc-fork-hook.diff36
-rw-r--r--main/uclibc/uclibc-i386-floating-stacks.diff23
-rw-r--r--main/uclibc/uclibc-linuxthreads-init-stdio.patch21
-rw-r--r--main/uclibc/uclibc-resolv-cname-fix.diff16
-rw-r--r--main/uiconv/APKBUILD2
-rw-r--r--main/unarj/APKBUILD4
-rw-r--r--main/unfs3/APKBUILD4
-rw-r--r--main/unixodbc/APKBUILD14
-rw-r--r--main/unrar/APKBUILD2
-rw-r--r--main/usbutils/APKBUILD2
-rw-r--r--main/util-linux-ng/APKBUILD4
-rw-r--r--main/util-vserver/APKBUILD6
-rw-r--r--main/uvncrepeater/APKBUILD2
-rw-r--r--main/v86d/APKBUILD7
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/valgrind/APKBUILD34
-rw-r--r--main/vim/APKBUILD2
-rw-r--r--main/vsftpd/APKBUILD2
-rw-r--r--main/vte/APKBUILD4
-rw-r--r--main/webkit/APKBUILD4
-rw-r--r--main/wget/APKBUILD2
-rw-r--r--main/wine/APKBUILD (renamed from testing/wine/APKBUILD)10
-rw-r--r--main/wine/dn_skipname.patch38
-rw-r--r--main/wireless-tools/APKBUILD2
-rw-r--r--main/wireshark/APKBUILD2
-rw-r--r--main/wpa_supplicant/APKBUILD2
-rw-r--r--main/wv/APKBUILD2
-rw-r--r--main/x264/APKBUILD4
-rw-r--r--main/xarchiver/APKBUILD2
-rw-r--r--main/xauth/APKBUILD2
-rw-r--r--main/xbacklight/APKBUILD2
-rw-r--r--main/xcb-util/APKBUILD2
-rw-r--r--main/xchat/APKBUILD21
-rw-r--r--main/xchat/depreciated-macros.patch57
-rw-r--r--main/xchat/xchat-gtk2.patch12
-rw-r--r--main/xcmsdb/APKBUILD2
-rw-r--r--main/xdelta3/APKBUILD2
-rw-r--r--main/xdpyinfo/APKBUILD2
-rw-r--r--main/xdriinfo/APKBUILD2
-rw-r--r--main/xev/APKBUILD2
-rw-r--r--main/xf86-input-evdev/APKBUILD4
-rw-r--r--main/xf86-input-keyboard/APKBUILD2
-rw-r--r--main/xf86-input-mouse/APKBUILD2
-rw-r--r--main/xf86-input-synaptics/APKBUILD2
-rw-r--r--main/xf86-video-apm/APKBUILD2
-rw-r--r--main/xf86-video-ark/APKBUILD2
-rw-r--r--main/xf86-video-ast/APKBUILD2
-rw-r--r--main/xf86-video-ati/APKBUILD4
-rw-r--r--main/xf86-video-chips/APKBUILD2
-rw-r--r--main/xf86-video-cirrus/APKBUILD2
-rw-r--r--main/xf86-video-dummy/APKBUILD2
-rw-r--r--main/xf86-video-fbdev/APKBUILD2
-rw-r--r--main/xf86-video-geode/APKBUILD2
-rw-r--r--main/xf86-video-glint/APKBUILD2
-rw-r--r--main/xf86-video-i128/APKBUILD2
-rw-r--r--main/xf86-video-i740/APKBUILD2
-rw-r--r--main/xf86-video-intel/APKBUILD2
-rw-r--r--main/xf86-video-mach64/APKBUILD2
-rw-r--r--main/xf86-video-newport/APKBUILD2
-rw-r--r--main/xf86-video-nv/APKBUILD2
-rw-r--r--main/xf86-video-openchrome/APKBUILD2
-rw-r--r--main/xf86-video-r128/APKBUILD2
-rw-r--r--main/xf86-video-radeonhd/APKBUILD2
-rw-r--r--main/xf86-video-rendition/APKBUILD2
-rw-r--r--main/xf86-video-s3/APKBUILD2
-rw-r--r--main/xf86-video-s3virge/APKBUILD2
-rw-r--r--main/xf86-video-savage/APKBUILD2
-rw-r--r--main/xf86-video-siliconmotion/APKBUILD6
-rw-r--r--main/xf86-video-sis/APKBUILD2
-rw-r--r--main/xf86-video-sunffb/APKBUILD2
-rw-r--r--main/xf86-video-sunleo/APKBUILD2
-rw-r--r--main/xf86-video-tdfx/APKBUILD2
-rw-r--r--main/xf86-video-tseng/APKBUILD2
-rw-r--r--main/xf86-video-v4l/APKBUILD2
-rw-r--r--main/xf86-video-vesa/APKBUILD2
-rw-r--r--main/xf86-video-vmware/APKBUILD2
-rw-r--r--main/xfce-utils/APKBUILD15
-rw-r--r--main/xfce4-appfinder/APKBUILD17
-rw-r--r--main/xfce4-battery-plugin/APKBUILD2
-rw-r--r--main/xfce4-cpufreq-plugin/APKBUILD2
-rw-r--r--main/xfce4-mixer/APKBUILD2
-rw-r--r--main/xfce4-notes-plugin/APKBUILD36
-rw-r--r--main/xfce4-notifyd/APKBUILD2
-rw-r--r--main/xfce4-panel/APKBUILD6
-rw-r--r--main/xfce4-screenshooter/APKBUILD19
-rw-r--r--main/xfce4-session/APKBUILD8
-rw-r--r--main/xfce4-settings/APKBUILD8
-rw-r--r--main/xfce4-taskmanager/APKBUILD2
-rw-r--r--main/xfce4-wavelan-plugin/APKBUILD2
-rw-r--r--main/xfce4-xkb-plugin/APKBUILD2
-rw-r--r--main/xfconf/APKBUILD9
-rw-r--r--main/xfdesktop/APKBUILD8
-rw-r--r--main/xfprint/APKBUILD2
-rw-r--r--main/xfsprogs/APKBUILD4
-rw-r--r--main/xfwm4/APKBUILD2
-rw-r--r--main/xgamma/APKBUILD2
-rw-r--r--main/xhost/APKBUILD2
-rw-r--r--main/xinit/APKBUILD2
-rw-r--r--main/xkbcomp/APKBUILD2
-rw-r--r--main/xmodmap/APKBUILD2
-rw-r--r--main/xorg-server/APKBUILD13
-rw-r--r--main/xrandr/APKBUILD2
-rw-r--r--main/xrdb/APKBUILD2
-rw-r--r--main/xrefresh/APKBUILD2
-rw-r--r--main/xset/APKBUILD2
-rw-r--r--main/xsetmode/APKBUILD2
-rw-r--r--main/xsetroot/APKBUILD2
-rw-r--r--main/xtables-addons/APKBUILD2
-rw-r--r--main/xvidcore/APKBUILD2
-rw-r--r--main/xvinfo/APKBUILD2
-rw-r--r--main/yasm/APKBUILD4
-rw-r--r--main/zip/APKBUILD4
-rw-r--r--main/zlib/APKBUILD16
-rw-r--r--main/zlib/gzflush.patch12
-rw-r--r--main/zlib/zlib-1.2.5-lfs-decls.patch13
-rw-r--r--main/zonenotify/APKBUILD4
-rw-r--r--main/zsnes/APKBUILD2
-rw-r--r--testing/alsa-utils/APKBUILD4
-rw-r--r--testing/asterisk-audio-konf/0001-create-install-dir.patch24
-rw-r--r--testing/asterisk-audio-konf/APKBUILD66
-rw-r--r--testing/atomic-ops/APKBUILD19
-rw-r--r--testing/bacula-client/APKBUILD2
-rw-r--r--testing/bacula/APKBUILD2
-rw-r--r--testing/bluez-firmware/APKBUILD22
-rw-r--r--testing/bluez-hcidump/APKBUILD25
-rw-r--r--testing/bluez/APKBUILD77
-rw-r--r--testing/bluez/bluetooth-conf.d7
-rw-r--r--testing/bluez/bluetooth-init.d31
-rw-r--r--testing/bluez/bluetooth.confd7
-rw-r--r--testing/bluez/bluetooth.initd32
-rw-r--r--testing/cdparanoia/APKBUILD7
-rw-r--r--testing/cherokee/APKBUILD2
-rw-r--r--testing/collectd/APKBUILD4
-rw-r--r--testing/coova-chilli/APKBUILD6
-rw-r--r--testing/cryptsetup/APKBUILD7
-rw-r--r--testing/daemontools/APKBUILD2
-rw-r--r--testing/dspam/APKBUILD2
-rw-r--r--testing/ebtables/APKBUILD2
-rw-r--r--testing/freeradius/APKBUILD2
-rwxr-xr-xtesting/freeswitch/freeswitch.initd33
-rwxr-xr-xtesting/freeswitch/freeswitch.post-deinstall4
-rwxr-xr-xtesting/freeswitch/freeswitch.post-install5
-rwxr-xr-xtesting/freeswitch/freeswitch.pre-install4
-rw-r--r--testing/fuse/APKBUILD2
-rw-r--r--testing/gdl/APKBUILD26
-rw-r--r--testing/geh/APKBUILD44
-rw-r--r--testing/gnumeric/APKBUILD30
-rw-r--r--testing/gtksourceview/APKBUILD8
-rw-r--r--testing/gtkspell/APKBUILD24
-rw-r--r--testing/hardinfo/APKBUILD13
-rw-r--r--testing/hardinfo/hardinfo-alpine.patch10
-rw-r--r--testing/hdparm/APKBUILD2
-rw-r--r--testing/hping3/APKBUILD2
-rw-r--r--testing/icecast/APKBUILD2
-rw-r--r--testing/iproute2/APKBUILD2
-rw-r--r--testing/ircii/APKBUILD2
-rw-r--r--testing/ircservices/APKBUILD2
-rw-r--r--testing/iscsi-scst-grsec/APKBUILD60
-rw-r--r--testing/iscsi-scst-grsec/config.c.patch12
-rw-r--r--testing/iscsi-scst-svn/APKBUILD40
-rw-r--r--testing/iscsi-scst-svn/iscsi-scst.initd23
-rw-r--r--testing/iscsi-scst/APKBUILD39
-rw-r--r--testing/iscsi-scst/iscsi-scst.initd23
-rw-r--r--testing/kamailio/APKBUILD23
-rw-r--r--testing/kamailio/kamailio-3-backslash.patch36
-rw-r--r--testing/kamailio/kamailio-backslash.patch15
-rw-r--r--testing/libelf/APKBUILD26
-rw-r--r--testing/libgssglue/APKBUILD2
-rw-r--r--testing/libical/APKBUILD26
-rw-r--r--testing/libtirpc/APKBUILD4
-rw-r--r--testing/libwmf/APKBUILD2
-rw-r--r--testing/linux-scst/APKBUILD122
-rw-r--r--testing/linux-scst/arp.patch14
-rw-r--r--testing/linux-scst/kernelconfig.x864674
-rw-r--r--testing/linux-scst/put_page_callback-2.6.34.patch390
-rw-r--r--testing/linux-scst/scst_exec_req_fifo-2.6.34.patch529
-rw-r--r--testing/live-media/APKBUILD2
-rw-r--r--testing/ltrace/APKBUILD25
-rw-r--r--testing/lua-crypto/APKBUILD2
-rw-r--r--testing/lua-curl/APKBUILD2
-rw-r--r--testing/lua-filesystem/APKBUILD2
-rw-r--r--testing/lua-nixio/APKBUILD2
-rw-r--r--testing/lua-rexlib/APKBUILD2
-rw-r--r--testing/madplay/APKBUILD28
-rw-r--r--testing/madwimax/APKBUILD2
-rw-r--r--testing/mediaproxy/APKBUILD8
-rw-r--r--testing/mp3info/APKBUILD6
-rw-r--r--testing/mtx/APKBUILD2
-rw-r--r--testing/nagios/APKBUILD10
-rw-r--r--testing/needbump57
-rw-r--r--testing/obexd/APKBUILD25
-rw-r--r--testing/open-iscsi/APKBUILD10
-rw-r--r--testing/open-iscsi/iscsid.initd (renamed from testing/open-iscsi/iscsid-2.0.871-r1.init.d)5
-rw-r--r--testing/openobex/APKBUILD34
-rw-r--r--testing/opensips-cp/APKBUILD6
-rw-r--r--testing/opensips/APKBUILD11
-rw-r--r--testing/openxcap/APKBUILD39
-rw-r--r--testing/openxcap/config.ini118
-rw-r--r--testing/openxcap/openxcap.initd23
-rwxr-xr-xtesting/openxcap/openxcap.post-install5
-rwxr-xr-xtesting/openxcap/openxcap.pre-install5
-rw-r--r--testing/osmo/APKBUILD30
-rw-r--r--testing/osmo/osmo-0.2.10-build-mo.patch20
-rw-r--r--testing/pekwm/APKBUILD36
-rw-r--r--testing/perl-carp-clan/APKBUILD36
-rw-r--r--testing/perl-date-format/APKBUILD36
-rw-r--r--testing/perl-date-manip/APKBUILD34
-rw-r--r--testing/perl-devel-symdump/APKBUILD36
-rw-r--r--testing/perl-file-tail/APKBUILD36
-rw-r--r--testing/perl-pod-coverage/APKBUILD36
-rw-r--r--testing/perl-sub-uplevel/APKBUILD35
-rw-r--r--testing/perl-test-exception/APKBUILD35
-rw-r--r--testing/perl-test-inter/APKBUILD36
-rw-r--r--testing/perl-test-pod-coverage/APKBUILD36
-rw-r--r--testing/perl-yaml-syck/APKBUILD36
-rw-r--r--testing/pmacct/APKBUILD2
-rw-r--r--testing/pptpclient/APKBUILD2
-rw-r--r--testing/privoxy/APKBUILD55
-rw-r--r--testing/privoxy/privoxy-3.0.16-gentoo.patch108
-rw-r--r--testing/privoxy/privoxy.initd32
-rw-r--r--testing/privoxy/privoxy.logrotate9
-rw-r--r--testing/privoxy/privoxy.pre-install6
-rw-r--r--testing/prosody/APKBUILD2
-rw-r--r--testing/py-application/APKBUILD (renamed from testing/python-application/APKBUILD)9
-rw-r--r--testing/py-buildutils/APKBUILD (renamed from testing/python26-buildutils/APKBUILD)6
-rw-r--r--testing/py-cjson/APKBUILD (renamed from testing/python-cjson/APKBUILD)11
-rw-r--r--testing/py-crypto/APKBUILD (renamed from testing/pycrypto/APKBUILD)18
-rw-r--r--testing/py-gnutls/APKBUILD (renamed from testing/python-gnutls/APKBUILD)11
-rw-r--r--testing/py-imaging/APKBUILD21
-rw-r--r--testing/py-lxml/APKBUILD26
-rw-r--r--testing/py-mysqldb/APKBUILD23
-rw-r--r--testing/py-setuptools/APKBUILD (renamed from testing/python26-setuptools/APKBUILD)4
-rw-r--r--testing/py-twisted-web2/APKBUILD20
-rw-r--r--testing/py-twisted/APKBUILD (renamed from testing/twisted/APKBUILD)20
-rw-r--r--testing/py-zope-interface/APKBUILD (renamed from testing/zope-interface/APKBUILD)17
-rw-r--r--testing/rrdbot/APKBUILD2
-rw-r--r--testing/rrdcollect/APKBUILD8
-rw-r--r--testing/rtapd/APKBUILD2
-rw-r--r--testing/rtnppd/APKBUILD2
-rw-r--r--testing/scst-grsec/APKBUILD62
-rw-r--r--testing/scst-grsec/scst-kernel-2.6.32.patch17
-rw-r--r--testing/scst-svn-scst/APKBUILD82
-rw-r--r--testing/scstadmin-svn/APKBUILD30
-rw-r--r--testing/sems/0001-makefile-fail-on-errors.patch170
-rw-r--r--testing/sems/0002-include-headers.patch116
-rw-r--r--testing/sems/APKBUILD13
-rw-r--r--testing/sircbot/APKBUILD2
-rw-r--r--testing/sisctrl/APKBUILD2
-rw-r--r--testing/smartmontools/APKBUILD2
-rw-r--r--testing/spandsp/APKBUILD17
-rw-r--r--testing/swatch/APKBUILD58
-rw-r--r--testing/swatch/swatch.confd8
-rwxr-xr-xtesting/swatch/swatch.initd50
-rw-r--r--testing/swatch/swatchrc103
-rw-r--r--testing/swish-e/APKBUILD2
-rw-r--r--testing/thunar-media-tags-plugin/APKBUILD36
-rw-r--r--testing/ucspi-tcp/APKBUILD2
-rw-r--r--testing/udev/APKBUILD4
-rw-r--r--testing/ulogd/APKBUILD6
-rw-r--r--testing/umix/APKBUILD2
-rw-r--r--testing/valide/APKBUILD38
-rw-r--r--testing/wine/libpng14.patch76
-rw-r--r--testing/xf86-video-openchrome-svn/APKBUILD33
-rw-r--r--testing/xmlrpc-c/APKBUILD42
-rw-r--r--unstable/vlc/APKBUILD (renamed from testing/vlc/APKBUILD)0
-rw-r--r--unstable/vlc/uclibc.patch (renamed from testing/vlc/uclibc.patch)0
-rw-r--r--unstable/wzdftpd-svn/APKBUILD (renamed from testing/wzdftpd/APKBUILD)0
-rw-r--r--unstable/wzdftpd-svn/wzdftpd-svn.initd (renamed from testing/wzdftpd/wzdftpd-svn.initd)0
838 files changed, 21533 insertions, 13000 deletions
diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD
index 18409a28..369a94db 100644
--- a/main/a2ps/APKBUILD
+++ b/main/a2ps/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=a2ps
pkgver=4.14
-pkgrel=0
+pkgrel=1
pkgdesc="a2ps is an Any to PostScript filter"
url="http://www.gnu.org/software/a2ps/"
license="GPL3"
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
index 8d3b868d..bbb41d5f 100644
--- a/main/a52dec/APKBUILD
+++ b/main/a52dec/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=a52dec
pkgver=0.7.4
-pkgrel=0
+pkgrel=1
pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
url="http://liba52.sourceforge.net/"
license="GPL2"
diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD
index 8007da2a..c134f199 100644
--- a/main/abiword/APKBUILD
+++ b/main/abiword/APKBUILD
@@ -1,24 +1,68 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abiword
-pkgver=2.8.3
-pkgrel=0
+pkgver=2.8.4
+pkgrel=2
pkgdesc="A fully-featured word processor"
url="http://www.abisource.com"
license="GPL"
makedepends="pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev
- popt-dev jpeg-dev librsvg-dev bzip2-dev"
-subpackages="$pkgname-dev"
+ popt-dev jpeg-dev librsvg-dev bzip2-dev goffice-dev"
+
+# openxml plugin
+makedepends="$makedepends boost-dev"
+
+# collab plugin
+makedepends="$makedepends gnutls-dev libsoup-dev dbus-glib-dev"
+
+
+subpackages="$pkgname-dev $pkgname-doc $pkgname-plugins"
+
+_plugins="applix babelfish bmp clarisworks collab docbook eml freetranslation
+ garble gdict gimp google hancom hrtext iscii kword loadbindings mht
+ mif mswrite openwriter openxml opml paint passepartout pdb pdf
+ presentation s5 sdw t602 urldict wikipedia wml xslfo"
+
+for _i in $_plugins; do
+ subpackages="$subpackages $pkgname-plugin-$_i:$_i"
+done
+
source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz"
build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
+ --enable-shared \
+ --disable-static \
+ --enable-plugins \
|| return 1
make || return 1
}
+# ="opendocument goffice latex" \
package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums="8984b09663e1514ca0e361b0627ea285 abiword-2.8.3.tar.gz"
+
+_do_plugin() {
+ local plugin="$1"
+ pkgdesc="Abiword $1 plugin"
+ local dir="usr/lib/abiword-${pkgver%.*}/plugins"
+ mkdir -p "$subpkgdir"/$dir
+ mv "$pkgdir"/$dir/$plugin.so "$subpkgdir"/$dir/
+}
+
+for _i in $_plugins; do
+ eval "$_i() { _do_plugin $_i; }"
+done
+
+plugins() {
+ pkgdesc="Abiword plugins, all of them"
+ depends=
+ for _i in $_plugins; do
+ depends="$depends $pkgname-plugin-$_i"
+ done
+ mkdir -p "$subpkgdir"
+}
+
+md5sums="f782ecb8e07d07ec179f7a143353cc29 abiword-2.8.4.tar.gz"
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index ed4d017c..989c7beb 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=2.1
+pkgver=2.3
pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
@@ -12,10 +12,13 @@ license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
-
make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make install DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2"
+md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2"
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index c4a68c67..02072139 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acct
pkgver=6.5.3
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Accounting Utilities"
url="http://www.gnu.org/software/acct/"
license="GPL"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index ec2f111c..b0b3da27 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-weblog
-pkgver=0.5.4
+pkgver=0.5.5
pkgrel=0
pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
url="http://git.alpinelinux.org/cgit/acf-weblog"
@@ -17,4 +17,4 @@ build() {
make DESTDIR="$pkgdir" install
}
-md5sums="8926a8178bf646363678bc9feacbc310 acf-weblog-0.5.4.tar.bz2"
+md5sums="c48ef4d8d9136f16de68129404ffb3ee acf-weblog-0.5.5.tar.bz2"
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index b4eeefa3..36e96a1f 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-base
pkgver=2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Meta package for minimal alpine base"
url="http://alpinelinux.org"
license="GPL"
depends="alpine-baselayout alpine-conf apk-tools busybox busybox-initscripts
- openrc"
+ openrc uclibc-utils"
makedepends=
install=
subpackages=
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 46a325b9..ba6c321f 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=2.0_rc1
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine base dir structure and init scripts"
url=http://git.alpinelinux.org/cgit/alpine-baselayout
depends=
@@ -11,7 +11,12 @@ license=GPL-2
build() {
cd "$srcdir"/$pkgname-$pkgver
+ rm -f src/mkmntdirs
make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make install PREFIX= DESTDIR="$pkgdir" || return 1
}
md5sums="76d61057c9e21d8e3ef85933a20b814d alpine-baselayout-2.0_rc1.tar.bz2"
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 1f4bbf3f..64333a38 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=2.3
+pkgver=2.4
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
@@ -9,6 +9,10 @@ source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.b
license="GPL-2"
_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+}
+
build() {
cd "$_builddir"
make || return 1
@@ -21,4 +25,4 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2"
+md5sums="4c8db8948a21b0435f577d1e0f8d7c8e alpine-conf-2.4.tar.bz2"
diff --git a/main/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD
index 587f1785..1b6d79cb 100644
--- a/main/alpine-sdk/APKBUILD
+++ b/main/alpine-sdk/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-sdk
pkgver=0.3
+pkgrel=0
url=http://dev.alpinelinux.org/cgit
pkgdesc="Alpine Software Development Kit meta package"
depends="abuild build-base git cramfs cdrkit acct mkinitfs mtools"
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index eda8c612..1b4503c9 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.0.22
-pkgrel=0
+pkgver=1.0.23
+pkgrel=1
pkgdesc="An alternative implementation of Linux sound support"
url="http://www.alsa-project.org"
license="GPL"
@@ -19,6 +19,7 @@ build() {
--enable-seq \
--enable-aload \
--disable-dependency-tracking \
+ --without-versioned \
|| return 1
make || return 1
}
@@ -27,4 +28,4 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make -j1 DESTDIR="$pkgdir" install
}
-md5sums="b28a12348905fb6915bc41f0edb2ecce alsa-lib-1.0.22.tar.bz2"
+md5sums="f48b50421d8a69d2d806d9c47e534f0d alsa-lib-1.0.23.tar.bz2"
diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index 69292171..ad9ef36e 100644
--- a/main/amavisd-new/APKBUILD
+++ b/main/amavisd-new/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="High-performance interface between mailer (MTA) and content checkers"
url="http://www.ijs.si/software/amavisd"
license="GPL-2"
-depends="uclibc sed file perl perl-archive-zip perl-convert-tnef
+depends="sed file perl perl-archive-zip perl-convert-tnef
perl-convert-uulib perl-mime-tools perl-mail-tools perl-net-server
perl-io-stringy perl-unix-syslog perl-db perl-mail-dkim"
makedepends=""
diff --git a/main/antiword/APKBUILD b/main/antiword/APKBUILD
index a6134c9f..d7b80c77 100644
--- a/main/antiword/APKBUILD
+++ b/main/antiword/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=antiword
pkgver=0.37
-pkgrel=0
+pkgrel=1
pkgdesc="free MS Word reader"
url="http://www.winfield.demon.nl"
license="GPL"
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index c9b29fa2..4193348f 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apcupsd
pkgver=3.14.8
-pkgrel=1
+pkgrel=2
pkgdesc="A Daemon to control APC UPSes"
subpackages="$pkgname-doc"
url="http://www.apcupsd.org"
diff --git a/main/apg/APKBUILD b/main/apg/APKBUILD
index 98d41665..8912b5f3 100644
--- a/main/apg/APKBUILD
+++ b/main/apg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apg
pkgver=2.2.3
-pkgrel=0
+pkgrel=1
pkgdesc="Automated Password Generator."
url="http://www.adel.nursat.kz/apg/index.shtml"
license="custom"
diff --git a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch
new file mode 100644
index 00000000..4df956bf
--- /dev/null
+++ b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch
@@ -0,0 +1,27 @@
+From 87420aaf295f58847332ba3aa89691a0259baace Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Wed, 5 May 2010 08:56:06 +0300
+Subject: [PATCH 1/5] info: fix querying of removed, but referenced packages
+
+Check that package name has packages associated with it before
+dereferencing the pointer. Fixes #345.
+---
+ src/info.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/info.c b/src/info.c
+index 7ca486c..d944fca 100644
+--- a/src/info.c
++++ b/src/info.c
+@@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db,
+
+ for (i = 0; i < argc; i++) {
+ name = apk_db_query_name(db, APK_BLOB_STR(argv[i]));
+- if (name == NULL) {
++ if (name == NULL || name->pkgs == NULL) {
+ apk_error("Not found: %s", argv[i]);
+ return 1;
+ }
+--
+1.7.1
+
diff --git a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
new file mode 100644
index 00000000..2e20152d
--- /dev/null
+++ b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
@@ -0,0 +1,42 @@
+From 47bac8c29c9a3c3fbebfd20e907170f24f9d677c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 11 May 2010 09:31:20 +0000
+Subject: [PATCH 2/5] upgrade: reset versioned deps in world when doing upgrade -a
+
+Doing "apk add file.apk" adds a versioned dependency to allow
+downgrading, and sticky version. Most often this is to install
+single packages from newer repository. So it would make sense
+to reset them to non-versioned if doing:
+
+ apk upgrade -a
+
+fixes #346
+---
+ src/upgrade.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/upgrade.c b/src/upgrade.c
+index f91e8cc..879e14c 100644
+--- a/src/upgrade.c
++++ b/src/upgrade.c
+@@ -41,10 +41,15 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
+ goto err;
+
+ for (i = 0; i < db->world->num; i++) {
+- r = apk_state_lock_dependency(state, &db->world->item[i]);
++ struct apk_dependency *dep = &db->world->item[i];
++ if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) {
++ dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER;
++ dep->version = NULL;
++ }
++ r = apk_state_lock_dependency(state, dep);
+ if (r != 0) {
+ apk_error("Unable to upgrade '%s'",
+- db->world->item[i].name->name);
++ dep->name->name);
+ goto err;
+ }
+ }
+--
+1.7.1
+
diff --git a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch
new file mode 100644
index 00000000..f2947c63
--- /dev/null
+++ b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch
@@ -0,0 +1,221 @@
+From d9bf4aabff801164b4c54e51b38c5f6eab2da114 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 19 May 2010 16:48:40 +0300
+Subject: [PATCH 3/5] search: add search for reverse dependencies in index
+
+So it'll be easier to rebuild affected packages. Fixes #349.
+---
+ src/search.c | 148 +++++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 91 insertions(+), 57 deletions(-)
+
+diff --git a/src/search.c b/src/search.c
+index 91c2913..e5e5d55 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -18,18 +18,14 @@
+ #include "apk_state.h"
+
+ struct search_ctx {
+- int (*action)(struct apk_database *db, int argc, char **argv);
++ int (*match)(struct apk_package *pkg, const char *str);
++ int (*print)(struct apk_package *pkg);
++ int argc;
++ char **argv;
+ };
+
+-struct search_query_ctx {
+- struct apk_database *db;
+- const char *query;
+-};
+-
+-static int search_list_print(apk_hash_item item, void *ctx)
++static int print_match(struct apk_package *pkg)
+ {
+- struct apk_package *pkg = (struct apk_package *) item;
+-
+ printf("%s", pkg->name->name);
+ if (apk_verbosity > 0)
+ printf("-%s", pkg->version);
+@@ -41,61 +37,50 @@ static int search_list_print(apk_hash_item item, void *ctx)
+ return 0;
+ }
+
+-static int search_query_print(apk_hash_item item, void *ctx)
++static int print_rdepends(struct apk_package *pkg)
+ {
+- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx;
+- struct apk_package *pkg = (struct apk_package *) item;
++ struct apk_name *name, *name0;
++ struct apk_package *pkg0;
++ struct apk_dependency *dep;
++ int i, j, k;
+
+- if (fnmatch(ictx->query, pkg->name->name, 0) != 0)
++ name = pkg->name;
++ if (name->rdepends == NULL)
+ return 0;
+- search_list_print(item, ictx->db);
+-
+- return 0;
+-}
+-
+-static int search_list(struct apk_database *db, int argc, char **argv)
+-{
+- int i;
+- struct search_query_ctx ctx;
+-
+- ctx.db = db;
+
+- if (argc == 0)
+- apk_hash_foreach(&db->available.packages, search_list_print, db);
+- else
+- for (i=0; i<argc; i++) {
+- ctx.query = argv[i];
+- apk_hash_foreach(&db->available.packages, search_query_print, &ctx);
++ printf("%s-%s:", pkg->name->name, pkg->version);
++ for (i = 0; i < name->rdepends->num; i++) {
++ name0 = name->rdepends->item[i];
++ if (name0->pkgs == NULL)
++ continue;
++ for (j = 0; j < name0->pkgs->num; j++) {
++ pkg0 = name0->pkgs->item[j];
++ if (pkg0->depends == NULL)
++ continue;
++ for (k = 0; k < pkg0->depends->num; k++) {
++ dep = &pkg0->depends->item[k];
++ if (name == dep->name &&
++ (apk_version_compare(pkg->version, dep->version)
++ & dep->result_mask)) {
++ printf(" %s-%s", pkg0->name->name, pkg0->version);
++ }
++ }
+ }
++ }
++ printf("\n");
+
+ return 0;
+ }
+
+-static int search_query_desc_print(apk_hash_item item, void *ctx)
++static int search_pkgname(struct apk_package *pkg, const char *str)
+ {
+- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx;
+- struct apk_package *pkg = (struct apk_package *) item;
+-
+- if( strstr(pkg->description, ictx->query) == NULL )
+- return 0;
+- search_list_print(item, ictx->db);
+-
+- return 0;
++ return fnmatch(str, pkg->name->name, 0) == 0;
+ }
+
+-static int search_desc(struct apk_database *db, int argc, char **argv)
++static int search_desc(struct apk_package *pkg, const char *str)
+ {
+- int i;
+- struct search_query_ctx ctx;
+-
+- ctx.db = db;
+-
+- for (i=0; i<argc; i++) {
+- ctx.query = argv[i];
+- apk_hash_foreach(&db->available.packages, search_query_desc_print, &ctx);
+- }
+-
+- return 0;
++ return strstr(pkg->name->name, str) != NULL ||
++ strstr(pkg->description, str) != NULL;
+ }
+
+ static int search_parse(void *ctx, struct apk_db_options *dbopts,
+@@ -105,7 +90,10 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts,
+
+ switch (optch) {
+ case 'd':
+- ictx->action = search_desc;
++ ictx->match = search_desc;
++ break;
++ case 'r':
++ ictx->print = print_rdepends;
+ break;
+ default:
+ return -1;
+@@ -113,23 +101,69 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts,
+ return 0;
+ }
+
++static int match_packages(apk_hash_item item, void *ctx)
++{
++ struct search_ctx *ictx = (struct search_ctx *) ctx;
++ struct apk_package *pkg = (struct apk_package *) item;
++ int i;
++
++ for (i = 0; i < ictx->argc; i++)
++ if (ictx->match(pkg, ictx->argv[i]))
++ break;
++ if (ictx->argc == 0 || i < ictx->argc)
++ ictx->print(pkg);
++
++ return 0;
++}
++
+ static int search_main(void *ctx, struct apk_database *db, int argc, char **argv)
+ {
+ struct search_ctx *ictx = (struct search_ctx *) ctx;
++ struct apk_name *name;
++ int rc = 0, i, j, slow_search;
++
++ slow_search = ictx->match != NULL || argc == 0;
++ if (!slow_search) {
++ for (i = 0; i < argc; i++)
++ if (strcspn(argv[i], "*?[") != strlen(argv[i])) {
++ slow_search = 1;
++ break;
++ }
++ }
++
++ if (ictx->match == NULL)
++ ictx->match = search_pkgname;
++ if (ictx->print == NULL)
++ ictx->print = print_match;
++ else if (argc == 0)
++ return -1;
+
+- if (ictx->action != NULL)
+- return ictx->action(db, argc, argv);
++ if (slow_search) {
++ ictx->argc = argc;
++ ictx->argv = argv;
++ rc = apk_hash_foreach(&db->available.packages,
++ match_packages, ictx);
++ } else {
++ for (i = 0; i < argc; i++) {
++ name = apk_db_query_name(db, APK_BLOB_STR(argv[i]));
++ if (name == NULL || name->pkgs == NULL)
++ continue;
++ for (j = 0; j < name->pkgs->num; j++)
++ ictx->print(name->pkgs->item[j]);
++ }
++ }
+
+- return search_list(db, argc, argv);
++ return rc;
+ }
+
+ static struct apk_option search_options[] = {
+- { 'd', "description", "Search also package descriptions" },
++ { 'd', "description", "Search also package descriptions" },
++ { 'r', "rdepends", "Print reverse dependencies of package" },
+ };
+
+ static struct apk_applet apk_search = {
+ .name = "search",
+- .help = "Search package names (and descriptions) by wildcard PATTERN.",
++ .help = "Search package by PATTERNs or by indexed dependencies.",
+ .arguments = "PATTERN",
+ .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE,
+ .context_size = sizeof(struct search_ctx),
+--
+1.7.1
+
diff --git a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch
new file mode 100644
index 00000000..818eeb1e
--- /dev/null
+++ b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch
@@ -0,0 +1,27 @@
+From fe55da70741621f7bac2cd943b64cc13e25f9427 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 26 May 2010 14:30:08 +0300
+Subject: [PATCH 4/5] package: don't leak signing key file fd
+
+openssl BIO does not close the fd unless we explicitly tell it to
+do so.
+---
+ src/package.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/package.c b/src/package.c
+index b265468..b97c412 100644
+--- a/src/package.c
++++ b/src/package.c
+@@ -441,7 +441,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx,
+ if (fd < 0)
+ return 0;
+
+- bio = BIO_new_fp(fdopen(fd, "r"), 0);
++ bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE);
+ ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL);
+ if (ctx->signature.pkey != NULL) {
+ if (fi->name[6] == 'R')
+--
+1.7.1
+
diff --git a/main/apk-tools/0005-cache-display-more-than-one-error.patch b/main/apk-tools/0005-cache-display-more-than-one-error.patch
new file mode 100644
index 00000000..6e85218b
--- /dev/null
+++ b/main/apk-tools/0005-cache-display-more-than-one-error.patch
@@ -0,0 +1,55 @@
+From d21303960544b5f11b7d69d0335f0903fb93d180 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 13 May 2010 09:26:19 +0000
+Subject: [PATCH 5/5] cache: display more than one error
+
+Display all packages that are bad in world rather than only first
+before exiting.
+---
+ src/cache.c | 15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/cache.c b/src/cache.c
+index 85d9777..49a71fa 100644
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -30,7 +30,7 @@ static int cache_download(struct apk_database *db)
+ struct apk_package *pkg;
+ struct apk_repository *repo;
+ char item[PATH_MAX], cacheitem[PATH_MAX];
+- int i, r = 0;
++ int i, r = 0, errors = 0;
+
+ if (db->world == NULL)
+ return 0;
+@@ -41,12 +41,13 @@ static int cache_download(struct apk_database *db)
+
+ for (i = 0; i < db->world->num; i++) {
+ r = apk_state_lock_dependency(state, &db->world->item[i]);
+- if (r != 0) {
+- apk_error("Unable to select version for '%s': %d",
+- db->world->item[i].name->name, r);
+- goto err;
+- }
++ errors += r;
++ if (r != 0)
++ apk_error("Unable to select version for '%s'",
++ db->world->item[i].name->name);
+ }
++ if (errors)
++ goto err;
+
+ list_for_each_entry(change, &state->change_list_head, change_list) {
+ pkg = change->newpkg;
+@@ -67,7 +68,7 @@ static int cache_download(struct apk_database *db)
+ err:
+ if (state != NULL)
+ apk_state_unref(state);
+- return r;
++ return errors;
+ }
+
+ static int cache_clean(struct apk_database *db)
+--
+1.7.1
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 7b366137..07b602df 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,26 +1,34 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0.2
-pkgrel=0
+pkgrel=6
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-info-fix-querying-of-removed-but-referenced-packages.patch
+ 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
+ 0003-search-add-search-for-reverse-dependencies-in-index.patch
+ 0004-package-don-t-leak-signing-key-file-fd.patch
+ 0005-cache-display-more-than-one-error.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
license=GPL-2
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
for i in ../*.patch; do
[ -f $i ] || continue
patch -p1 -i $i || return 1
done
+}
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
make || return 1
make static || return 1
make DESTDIR="$pkgdir" install
@@ -40,4 +48,9 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2"
+md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2
+c590e894c2580cbb092b150fca9af3cf 0001-info-fix-querying-of-removed-but-referenced-packages.patch
+5c53eaa29dd9722c25b6878cde392d05 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
+6baca299fbf00b97f78fa8fbd0e82f5b 0003-search-add-search-for-reverse-dependencies-in-index.patch
+175470e6d5b2d20fe02d6fb61f8ec6d1 0004-package-don-t-leak-signing-key-file-fd.patch
+0ab64b75b09f37b4d265df3f7b5b7e83 0005-cache-display-more-than-one-error.patch"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 4c52e523..45133a2c 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.3.9
-pkgrel=0
+pkgrel=1
pkgdesc="The Apache Portable Runtime"
url="http://apr.apache.org/"
license="APACHE"
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 98891c9a..efef9c19 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr
pkgver=1.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="The Apache Portable Runtime"
url="http://apr.apache.org/"
license="APACHE"
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index a18f88c3..5b47cd0d 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=arpon
pkgver=1.90
-pkgrel=1
+pkgrel=2
pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
url="http://arpon.sourceforge.net/"
license="GPL"
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index ff97c65b..4907a65c 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=arpwatch
pkgver=2.1a15
-pkgrel=1
+pkgrel=2
pkgdesc="Ethernet monitoring program"
url="http://www-nrg.ee.lbl.gov/"
license="GPL"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 3a3cef36..34cd720d 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -2,28 +2,29 @@
pkgname=aspell
pkgver=0.60.6
_pkgmajorver=${pkgver%.*}
-pkgrel=0
+pkgrel=2
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
license="LGPL"
subpackages="$pkgname-dev $pkgname-doc"
depends=
-makedepends="ncurses-dev uclibc++-dev perl"
+makedepends="ncurses-dev perl"
install=
source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
libmath.patch"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
- export CXX=${CXX_UC:-g++-uc}
-
./configure --prefix=/usr || return 1
# we want add -lm to linker flag for libaspell so wil build that
# separately. this is just an ugly workaround
make libaspell.la LDFLAGS="$LDFLAGS -lm" || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
ln -s $pkgname-${_pkgmajorver} "$pkgdir"/usr/lib/$pkgname || return 1
}
diff --git a/main/asterisk-addons/APKBUILD b/main/asterisk-addons/APKBUILD
new file mode 100644
index 00000000..92fb1990
--- /dev/null
+++ b/main/asterisk-addons/APKBUILD
@@ -0,0 +1,75 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=asterisk-addons
+pkgver=1.6.2.1
+pkgrel=1
+pkgdesc="Asterisk addons"
+url="http://www.asterisk.org"
+license="GPL2"
+makedepends="mysql-dev asterisk-dev autoconf automake"
+install=
+subpackages="$pkgname-mysql $pkgname-mp3 $pkgname-ooh323 $pkgname-saycountpl"
+depends="$subpackages"
+source="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-addons-1.6.2.1.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ cd "$_builddir"
+ ./bootstrap.sh
+}
+
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info
+
+ make -j1 || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make -j1 DESTDIR="$pkgdir" install
+ make -j1 DESTDIR="$pkgdir" samples
+ # we are not building the mobile module because aports does not have bluez so we delete mobile.conf
+ rm -rf "$pkgdir"/etc
+}
+
+_find_and_move() {
+ local pattern="$1"
+ cd "$pkgdir" || return 1
+ find -name "$pattern" -type f | while read f; do
+ local dest="$subpkgdir/${f%/*}"
+ mkdir -p "$dest"
+ mv "$f" "$dest"
+ done
+}
+
+mysql() {
+ pkgdesc="Asterisk mysql addons"
+ depends="asterisk"
+ _find_and_move '*mysql*'
+}
+
+mp3() {
+ pkgdesc="Asterisk mp3 addon"
+ depends="asterisk"
+ _find_and_move '*mp3*'
+}
+
+ooh323() {
+ pkgdesc="Asterisk h323 channel driver"
+ depends="asterisk"
+ _find_and_move '*ooh323*'
+}
+
+saycountpl() {
+ pkgdesc="Asterisk say count pl application"
+ depends="asterisk"
+ _find_and_move '*saycountpl*'
+ mv "$pkgdir"/var "$subpkgdir"
+}
+
+md5sums="95e33f22f53d58ac95c54d2c8b8d9d76 asterisk-addons-1.6.2.1.tar.gz"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 51180cc5..1ed4b410 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
-pkgver=1.6.2.6
+pkgver=1.6.2.7
pkgrel=1
pkgdesc="Asterisk: A Module Open Source PBX System"
url="http://www.asterisk.org/"
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz
100-uclibc-daemon.patch
101-caps-uclibc.patch
- 102-gsm-pic.patch
400-bug-227.patch
asterisk.initd
asterisk.confd
@@ -111,10 +110,9 @@ sample() {
make samples DESTDIR="$subpkgdir"
}
-md5sums="f068ef2433eebdc7f6dd635986f36d77 asterisk-1.6.2.6.tar.gz
+md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz
b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
-97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch
79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch
0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
diff --git a/main/aterm/APKBUILD b/main/aterm/APKBUILD
index e414f4a4..e8f2b3e8 100644
--- a/main/aterm/APKBUILD
+++ b/main/aterm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aterm
pkgver=1.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="An xterm replacement with transparency support"
url="http://aterm.sourceforge.net/"
license="GPL"
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
index 80333883..4dd5afd3 100644
--- a/main/atk/APKBUILD
+++ b/main/atk/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atk
pkgver=1.30.0
-pkgrel=1
+pkgrel=2
pkgdesc="A library providing a set of interfaces for accessibility"
url="http://www.gtk.org/"
license="LGPL"
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index ecbfb102..2a9eafdb 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atop
-pkgver=1.24
-pkgrel=1
+pkgver=1.25
+pkgrel=0
pkgdesc="Resource-specific view of processes"
url="http://www.atcomputing.nl/Tools/atop"
license="GPL-2"
depends=
makedepends="zlib-dev ncurses-dev"
subpackages="$pkgname-doc"
-source="http://www.atoptool.nl/packages/atop-$pkgver.tar.gz
+source="http://www.atoptool.nl/download/atop-$pkgver.tar.gz
atop-bb-compat.patch
atop.initd"
@@ -40,6 +40,6 @@ package() {
}
-md5sums="46522f7da28460e810e193ab46907af9 atop-1.24.tar.gz
+md5sums="8b67756a71ca49728b402da369c4f26e atop-1.25.tar.gz
a4119e314cdc6d50bf027add32e1902b atop-bb-compat.patch
06aba14ddeadbb1d0c3594536785213b atop.initd"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index 7046bd56..e244a5aa 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -2,7 +2,7 @@
pkgname=attr
pkgver=2.4.44
_ver=2.4.44
-pkgrel=1
+pkgrel=2
pkgdesc="Extended attribute support library for ACL support"
url="http://oss.sgi.com/projects/xfs/"
license="LGPL"
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index 1e455850..69456169 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aumix
pkgver=2.8
-pkgrel=2
+pkgrel=3
pkgdesc="A color text mode sound mixer"
url="http://www.jpj.net/~trevor/aumix.html"
license="GPL"
diff --git a/main/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 0a7f4cc6..6b92c22f 100644
--- a/main/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=b43-fwcutter
-pkgver=012
+pkgver=013
pkgrel=0
pkgdesc="Tool to extract firmware from Broadcom drivers"
url="http://linuxwireless.org/en/users/Drivers/b43"
@@ -10,15 +10,18 @@ depends=""
makedepends=""
install=
subpackages="$pkgname-doc"
-source="http://bu3sch.de/b43/fwcutter/b43-fwcutter-012.tar.bz2"
+source="http://bu3sch.de/b43/fwcutter/b43-fwcutter-$pkgver.tar.bz2"
build() {
cd "$srcdir/$pkgname-$pkgver"
-
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make PREFIX="$pkgdir"/usr install
mkdir -p "$pkgdir"/usr/share/
mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
}
-md5sums="69eadf67b459f313a8d6b37aaabef96c b43-fwcutter-012.tar.bz2"
+md5sums="3547ec6c474ac1bc2c4a5bb765b791a4 b43-fwcutter-013.tar.bz2"
diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD
new file mode 100644
index 00000000..46648b6d
--- /dev/null
+++ b/main/babl/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=babl
+pkgver=0.1.2
+pkgrel=0
+pkgdesc="Dynamic, any to any, pixel format conversion library"
+url="http://gegl.org/babl/"
+license="LGPL3"
+depends=
+makedepends=
+subpackages="$pkgname-dev"
+source="ftp://ftp.gtk.org/pub/$pkgname/0.1/$pkgname-$pkgver.tar.bz2"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr || return 1
+ make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="8eebd8d78d3173db7af5e3e60b1e03ea babl-0.1.2.tar.bz2"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 421c936c..27f2cf97 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
-pkgver=4.1.005
+pkgver=4.1.007
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver%.*}${_myver#*.}
@@ -70,4 +70,6 @@ md5sums="9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz
118d465095d4a4706eb1d34696a2666a bash41-002
120f7cf039a40d35fe375e59d6f17adc bash41-003
336ee037fc2cc1e2350b05097fbdc87c bash41-004
-9471e666797f0b03eb2175ed752a9550 bash41-005"
+9471e666797f0b03eb2175ed752a9550 bash41-005
+fb80ccd58cb1e34940f3adf4ce6e4a1e bash41-006
+192a8b161d419a1d0d211169f1d1046e bash41-007"
diff --git a/main/bbsuid/APKBUILD b/main/bbsuid/APKBUILD
index 45db1e43..4389e9a1 100644
--- a/main/bbsuid/APKBUILD
+++ b/main/bbsuid/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bbsuid
pkgver=0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Busybox SUID root application wrapper"
url="http://git.alpinelinux.org/cgit/bbsuid"
license="GPL-2"
-depends="uclibc busybox"
+depends="busybox"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
build() {
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index d5f1851f..5b990def 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bc
pkgver=1.06
-pkgrel=1
+pkgrel=2
pkgdesc="arbitrary precision numeric processing language (calculator)"
url="http://www.gnu.org/software/bc/bc.html"
license="GPL"
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 49abcee7..3a003cb2 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bdftopcf
pkgver=1.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org font utility"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/beecrypt/APKBUILD b/main/beecrypt/APKBUILD
index d56b0e82..3b12e359 100644
--- a/main/beecrypt/APKBUILD
+++ b/main/beecrypt/APKBUILD
@@ -2,36 +2,41 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=beecrypt
pkgver=4.1.2
-pkgrel=3
+pkgrel=5
pkgdesc="general-purpose cryptography library"
url="http://sourceforge.net/projects/beecrypt"
license="LGPL"
depends=
-makedepends="uclibc++-dev libtool m4"
+makedepends="libtool m4"
subpackages="$pkgname-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname-4.1.2-base64.patch
"
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export CXX=${CXX_UC:-g++-uc}
-
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+ cd "$_builddir"
for i in ../*.patch; do
msg "Applying $i..."
patch -p1 < $i || return 1
done
+}
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
- --disable-threads \
+ --enable-threads \
--enable-shared \
--without-java \
--without-python \
--with-cplusplus=no
-
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make DESTDIR="$pkgdir" install
}
md5sums="820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz
diff --git a/main/beep/APKBUILD b/main/beep/APKBUILD
index 74299820..a41389bf 100644
--- a/main/beep/APKBUILD
+++ b/main/beep/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=beep
pkgver=1.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="A terminal bell"
url="http://johnath.com/beep"
license="GPL-2"
-depends="uclibc"
+depends=""
makedepends=""
#install=
subpackages="$pkgname-doc"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 946af90e..93a30472 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -4,7 +4,7 @@ pkgname=bind
pkgver=9.7.0_p1
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
-pkgrel=0
+pkgrel=2
pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools"
url="http://www.isc.org"
license="as-is"
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 1a2fbf5d..a2c95263 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=binutils
pkgver=2.20.51.0.4
+pkgrel=1
pkgdesc="Tools necessary to build programs"
url=http://sources.redhat.com/binutils
source="http://ftp.kernel.org/pub/linux/devel/binutils/$pkgname-$pkgver.tar.bz2"
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index f24dd744..c355b0cf 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bison
pkgver=2.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU general-purpose parser generator"
license="GPL"
url="http://www.gnu.org/software/bison/bison.html"
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
new file mode 100644
index 00000000..1c40e470
--- /dev/null
+++ b/main/boost/APKBUILD
@@ -0,0 +1,147 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=boost
+pkgver=1.43.0
+
+_x=${pkgver%%.*} # strip .y.z
+_y=${pkgver%.*} # strip .z
+_y=${_y#*.} # strip x.
+_z=${pkgver##*.} # strip x.y.
+_ver=${_x}_${_y}_${_z}
+
+pkgrel=0
+pkgdesc="Free peer-reviewed portable C++ source libraries"
+url="http://www.boost.org/"
+license="custom"
+depends=
+makedepends="python-dev>=2.6 flex bison bzip2-dev zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc
+$pkgname-date_time
+$pkgname-filesystem
+$pkgname-graph
+$pkgname-iostreams
+$pkgname-math
+$pkgname-prg_exec_monitor
+$pkgname-program_options
+$pkgname-python:py
+$pkgname-random
+$pkgname-regex
+$pkgname-serialization
+$pkgname-signals
+$pkgname-system
+$pkgname-thread
+$pkgname-unit_test_framework
+$pkgname-wave
+$pkgname-wserialization
+"
+source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$_ver.tar.gz
+ boost-1.41.0-parameter-needs-python.patch
+ boost-uclibc-thread.patch
+ random-Jamfile"
+
+_builddir="$srcdir"/${pkgname}_${_ver}
+prepare() {
+ cd "$_builddir"
+ for i in "$srcdir"/*.patch; do
+ [ -r "$i" ] || continue
+ msg "Applying $i"
+ patch -p1 -i "$i" || return 1
+ done
+
+ # add support for /dev/urandom
+ mkdir -p libs/random/build
+ cp "$srcdir"/random-Jamfile libs/random/build/Jamfile.2
+ sed -i -e 's/#ifdef __linux__/#if 1/' \
+ libs/random/src/random_device.cpp \
+ || return 1
+
+ # create user-config.jam
+ cat > user-config.jam <<__EOF__
+
+using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+
+__EOF__
+}
+
+_options="--user-config=\"$_builddir/user-config.jam\"
+ --prefix=\"$pkgdir/usr\"
+ release
+ debug-symbols=off
+ threading=single,multi
+ runtime-link=shared
+ link=shared,static
+ cflags=-fno-strict-aliasing
+ -sPYTHON_ROOT=/usr
+ -sPYTHON_VERSION=2.6
+ -sTOOLS=gcc
+ --layout=tagged
+ -q
+ -j${JOBS:-2}
+"
+
+build() {
+ msg "Building bjam"
+ export BOOST_ROOT="$_builddir"
+ cd "$_builddir"/tools/jam/src
+ CC= ./build.sh cc || return 1
+ _bindir="bin.linuxx86"
+ [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+ install -m755 -d "$pkgdir"/usr/bin
+ install -m755 ${_bindir}/bjam "$pkgdir"/usr/bin/bjam || return 1
+ _bjam="$pkgdir"/usr/bin/bjam
+
+ msg "Building bcp"
+ cd "${_builddir}"/tools/bcp
+ "${_bjam}" -j${JOBS:-2} || return 1
+ install -m755 "$srcdir"/${pkgname}_${_ver}/dist/bin/bcp \
+ "$pkgdir"/usr/bin/bcp || return 1
+
+ msg "Building boost"
+ cd "$_builddir"
+ "${_bjam}" $_options
+}
+
+package() {
+ cd "$_builddir"
+ export BOOST_ROOT="$_builddir"
+ _bjam="$pkgdir"/usr/bin/bjam
+ "${_bjam}" $_options \
+ --includedir="$pkgdir"/usr/include \
+ --libdir="$pkgdir"/usr/lib \
+ install || return 1
+
+ cd "$srcdir"/${pkgname}_${_ver}/libs/python/pyste/install
+ python setup.py install --root="$pkgdir" || return 1
+ install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
+ install -m644 "$srcdir"/${pkgname}_${_ver}/LICENSE_1_0.txt \
+ "$pkgdir"/usr/share/licenses/$pkgname/ || return 1
+}
+
+_mvlib() {
+ pkgdesc="Boost $1 library"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libboost_$1* "$subpkgdir"/usr/lib/
+}
+
+date_time() { _mvlib date_time; }
+filesystem() { _mvlib filesystem; }
+graph() { _mvlib graph; }
+iostreams() { _mvlib iostreams; }
+math() { _mvlib math; }
+prg_exec_monitor() { _mvlib prg_exec_monitor; }
+program_options() { _mvlib program_options; }
+py() { _mvlib python; }
+random() { _mvlib random; }
+regex() { _mvlib regex; }
+serialization() { _mvlib serialization; }
+signals() { _mvlib signals; }
+system() { _mvlib system; }
+thread() { _mvlib thread; }
+unit_test_framework() { _mvlib unit_test_framework; }
+wave() { _mvlib wave; }
+wserialization() { _mvlib wserialization; }
+
+
+md5sums="734565ca4819bf04bd8e903e116c3fb1 boost_1_43_0.tar.gz
+83dbee9d7291a0f322fd2b8936aeace7 boost-1.41.0-parameter-needs-python.patch
+7ea3caa231764eca4522ae303939214d boost-uclibc-thread.patch
+1d43f6ee1fc426f1ddcb4aafc6b77b9b random-Jamfile"
diff --git a/main/boost/boost-1.41.0-parameter-needs-python.patch b/main/boost/boost-1.41.0-parameter-needs-python.patch
new file mode 100644
index 00000000..016995fc
--- /dev/null
+++ b/main/boost/boost-1.41.0-parameter-needs-python.patch
@@ -0,0 +1,106 @@
+--- a/boost/parameter/aux_/maybe.hpp 2008-03-22 21:45:55.000000000 +0000
++++ b/boost/parameter/aux_/maybe.hpp.new 2009-10-22 03:55:24.000000000 +0000
+@@ -2,20 +2,41 @@
+ // subject to the Boost Software License, Version 1.0. (See accompanying
+ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+-#ifndef BOOST_PARAMETER_MAYBE_060211_HPP
+-# define BOOST_PARAMETER_MAYBE_060211_HPP
++//
++// 2009.10.21 TDS remove depenency on boost::python::detail::referent_storage
++//
++#ifndef BOOST_PARAMETER_MAYBE_091021_HPP
++# define BOOST_PARAMETER_MAYBE_091021_HPP
+
+ # include <boost/mpl/if.hpp>
+ # include <boost/mpl/identity.hpp>
+ # include <boost/type_traits/is_reference.hpp>
+ # include <boost/type_traits/add_reference.hpp>
+ # include <boost/optional.hpp>
+-# include <boost/python/detail/referent_storage.hpp>
++# include <boost/aligned_storage.hpp>
+ # include <boost/type_traits/remove_cv.hpp>
+ # include <boost/type_traits/add_const.hpp>
+
+ namespace boost { namespace parameter { namespace aux {
+
++template <class T> struct referent_size;
++
++template <class T>
++struct referent_size<T&>
++{
++ BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(T));
++};
++
++// A metafunction returning a POD type which can store U, where T ==
++// U&. If T is not a reference type, returns a POD which can store T.
++template <class T>
++struct referent_storage
++{
++ typedef typename boost::aligned_storage<
++ referent_size<T>::value
++ >::type type;
++};
++
+ struct maybe_base {};
+
+ template <class T>
+@@ -33,8 +54,8 @@
+ BOOST_DEDUCED_TYPENAME remove_reference<reference>::type
+ >::type non_cv_value;
+
+- explicit maybe(T value)
+- : value(value)
++ explicit maybe(T value_)
++ : value(value_)
+ , constructed(false)
+ {}
+
+@@ -48,28 +69,28 @@
+ this->destroy();
+ }
+
+- reference construct(reference value) const
++ reference construct(reference value_) const
+ {
+- return value;
++ return value_;
+ }
+
+ template <class U>
+- reference construct2(U const& value) const
++ reference construct2(U const& value_) const
+ {
+- new (m_storage.bytes) non_cv_value(value);
++ new (m_storage.address()) non_cv_value(value_);
+ constructed = true;
+- return *(non_cv_value*)m_storage.bytes;
++ return *(non_cv_value*)m_storage.address();
+ }
+
+ template <class U>
+- reference construct(U const& value) const
++ reference construct(U const& value_) const
+ {
+- return this->construct2(value);
++ return this->construct2(value_);
+ }
+
+ void destroy()
+ {
+- ((non_cv_value*)m_storage.bytes)->~non_cv_value();
++ ((non_cv_value*)m_storage.address())->~non_cv_value();
+ }
+
+ typedef reference(maybe<T>::*safe_bool)() const;
+@@ -87,7 +108,9 @@
+ private:
+ boost::optional<T> value;
+ mutable bool constructed;
+- mutable typename boost::python::detail::referent_storage<
++
++
++ mutable typename referent_storage<
+ reference
+ >::type m_storage;
+ };
diff --git a/main/boost/boost-uclibc-thread.patch b/main/boost/boost-uclibc-thread.patch
new file mode 100644
index 00000000..e9e6b79e
--- /dev/null
+++ b/main/boost/boost-uclibc-thread.patch
@@ -0,0 +1,11 @@
+--- ./libs/thread/src/pthread/thread.cpp.orig
++++ ./libs/thread/src/pthread/thread.cpp
+@@ -380,7 +380,7 @@
+ {
+ #if defined(PTW32_VERSION) || defined(__hpux)
+ return pthread_num_processors_np();
+-#elif defined(_GNU_SOURCE)
++#elif defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+ return get_nprocs();
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+ int count;
diff --git a/main/boost/random-Jamfile b/main/boost/random-Jamfile
new file mode 100644
index 00000000..5cb6f6bc
--- /dev/null
+++ b/main/boost/random-Jamfile
@@ -0,0 +1,15 @@
+# Copyright (c) 2006 Tiziano Mueller
+#
+# Use, modification and distribution of the file is subject to the
+# Boost Software License, Version 1.0.
+# (See at http://www.boost.org/LICENSE_1_0.txt)
+
+
+project boost/random
+ : source-location ../ ;
+
+SOURCES = random_device ;
+
+lib boost_random
+ : $(SOURCES).cpp
+ : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ;
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index d76110b1..1f2b79df 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge-utils
pkgver=1.4
-pkgrel=0
+pkgrel=1
pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
url="http://linux-net.osdl.org/index.php/Bridge"
license="GPL-2"
subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
+depends=""
makedepends="autoconf"
source="http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$pkgver/bridge-utils-$pkgver.tar.gz"
#"http://download.sourceforge.net/bridge/$pkgname-$pkgver.tar.gz"
@@ -15,7 +15,7 @@ build() {
cd "$srcdir"/$pkgname-$pkgver
autoconf
# src_compile
- configure --prefix=/ \
+ ./configure --prefix=/ \
--mandir=/usr/share/man \
--libdir=/usr/lib \
--includedir=/usr/include \
diff --git a/main/build-base/APKBUILD b/main/build-base/APKBUILD
index 32c4e93b..59e1f2ee 100644
--- a/main/build-base/APKBUILD
+++ b/main/build-base/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=build-base
pkgver=0.2
+pkgrel=0
url=http://dev.alpinelinux.org/cgit
pkgdesc="Meta package for build base"
depends="binutils gcc make patch uclibc-dev g++"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index c0d01f1e..4b9402af 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
pkgver=2.0
-pkgrel=11
+pkgrel=12
pkgdesc="Init scripts for busybox daemons"
url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
license="GPL-2"
@@ -55,9 +55,9 @@ b5b23dd06cea120bd8d850b54bca0b59 syslog.initd
22adbf155ffc4595206ded6daad07812 rdate.confd
77fb31a75511247bf4e3430565a276bc syslog.confd
0bb55dde32f5e119111fa4938daaef3d watchdog.confd
-c3eb08c577384154fdf748f1db06f8db mdev.conf
+c514213ed7e56c64c44be3285d34a297 mdev.conf
ad1556961294e4aa2abca6be52138b7c dvbdev
5c8725b4cbdeda23b00f08124a0d20bf ide_links
-1acfd58dfd1cf324c90ca3a3be519510 usbdev
+c422992ca5bfdfabdbba1f1532bc1358 usbdev
30b0c85956b6701caf55309a17e537f6 usbdisk_link
826d85313ca7a4a0205d63bd58b7d01f xvd_links"
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 5a86a9cd..ce6aa4e9 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -17,7 +17,10 @@ urandom root:root 0444
hwrandom root:root 0660
# console does already exist; therefore ownership has to be changed with command
-console root:tty 0600 @chmod 600 $MDEV && mkdir -p vc && ln -sf ../$MDEV vc/0
+#console root:tty 0600 @chmod 600 $MDEV && mkdir -p vc && ln -sf ../$MDEV vc/0
+console root:tty 0600 @mkdir -pm 755 fd && cd fd && for x in 0 1 2 3 ; do ln -sf /proc/self/fd/$x $x; done
+
+
fd0 root:floppy 0660
kmem root:root 0640
mem root:root 0640
diff --git a/main/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev
index b1aff296..ea5b9155 100644
--- a/main/busybox-initscripts/usbdev
+++ b/main/busybox-initscripts/usbdev
@@ -15,13 +15,13 @@ add_zeros () {
# bus and device dirs in /sys
-local USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
+USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
USB_PATH=$(find /sys/devices -type d -name "$USB_PATH")
-local USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
+USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
# dir names in /dev
-local BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
-local USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
+BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
+USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
# try to load the proper driver for usb devices
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index bd0f178f..d379e5a8 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,19 +1,28 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.16.1
-pkgrel=0
+pkgrel=4
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license="GPL-2"
depends=
install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-static"
triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
$pkgname-1.11.1-bb.patch
flock-bb.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-ash.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-cpio.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dhcpd.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dnsd.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-hwclock.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-indexcgi.patch
+ http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-sed.patch
busyboxconfig"
_builddir="$srcdir"/$pkgname-$pkgver
+_config="$srcdir"/busyboxconfig
prepare() {
cd "$_builddir"
#patches
@@ -28,30 +37,51 @@ prepare() {
sed -i -e 's/(ip, _BB_DIR_BIN/(ip, _BB_DIR_SBIN/' \
-e 's/(vi, _BB_DIR_BIN/(vi, _BB_DIR_USR_BIN/' \
include/applets.h || return 1
-
- # we set the install prefix with sed since it might differ depending
- # on abuild version
- sed -e "s:^CONFIG_PREFIX=.*:CONFIG_PREFIX=\"$pkgdir\":" \
- ../busyboxconfig > .config
}
build() {
cd "$_builddir"
+ msg "Building static busybox"
+ sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \
+ -e "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" \
+ "$_config" > .config
+ make silentoldconfig || return 1
+ make || return 1
+ mv busybox busybox.static
+
+ # build dynamic
+ msg "Building dynamic busybox"
+ cp "$_config" .config
make silentoldconfig || return 1
make || return 1
}
package() {
cd "$_builddir"
- make install DESTDIR="$pkgdir"
mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \
- "$pkgdir"/var/cache/misc
+ "$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin
chmod 1777 "$pkgdir"/tmp
+ install -m755 busybox "$pkgdir"/bin/busybox
# we need /bin/sh to be able to execute post-install
ln -s /bin/busybox "$pkgdir"/bin/sh
}
+static() {
+ triggers=
+ mkdir -p "$subpkgdir"/bin
+ install -m755 "$_builddir"/busybox.static \
+ "$subpkgdir"/bin/busybox.static
+
+}
+
md5sums="319486ec65078d07fde26eb620fecde7 busybox-1.16.1.tar.bz2
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch
+b328c15e90c58c44f283838f224c3c97 busybox-1.16.1-ash.patch
+301feec832c938c235d370ae09f90713 busybox-1.16.1-cpio.patch
+54607ef7a80b6c3aa397788ce9166cc3 busybox-1.16.1-dhcpd.patch
+9fd18c9833253119996039429bee1992 busybox-1.16.1-dnsd.patch
+b16ad6491dcb4f053f84ae2c4064918d busybox-1.16.1-hwclock.patch
+c3bc34309334c456b6f905f0708c914f busybox-1.16.1-indexcgi.patch
+8e1ef2dc70aaaa6f1af1d5e0541de103 busybox-1.16.1-sed.patch
4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig"
diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index 34285231..f75a0730 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bwm-ng
pkgver=0.6
-pkgrel=0
+pkgrel=1
pkgdesc="A small and simple console-based live bandwidth monitor"
url="http://www.gropp.org/"
license="GPL"
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 09721bb7..1081978b 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bzip2
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="A high-quality data compression program"
url="http://sources.redhat.com/bzip2"
license="BZIP2"
-depends="uclibc"
+depends=""
install="$pkgname.post-deinstall"
source="http://www.bzip.org/$pkgver/$pkgname-$pkgver.tar.gz
$install
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 817bc3df..d0af1f04 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=c-ares
pkgver=1.7.0
-pkgrel=0
+pkgrel=1
pkgdesc="An asynchronously DNS/names resolver library"
url="http://c-ares.haxx.se/"
license="GPL"
diff --git a/main/cabextract/APKBUILD b/main/cabextract/APKBUILD
index b4788780..addf021e 100644
--- a/main/cabextract/APKBUILD
+++ b/main/cabextract/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=cabextract
pkgver=1.2
-pkgrel=0
+pkgrel=1
pkgdesc="Tool for extracting Microsoft cabinet files"
url="http://www.cabextract.org.uk/"
license="GPL"
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index efa1a4ef..11571203 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
pkgver=1.8.10
-pkgrel=0
+pkgrel=1
pkgdesc="Cairo vector graphics library"
url="http://cairographics.org/"
license="LGPL MPL"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 2143bdb7..2848bb64 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ccache
pkgver=2.4
-pkgrel=0
+pkgrel=1
pkgdesc="ccache is a compiler cache"
url="http://ccache.samba.org/"
license="GPL"
subpackages="$pkgname-doc"
-depends="uclibc"
+depends=""
makedepends=""
source="http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index 58918450..8f346b70 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa
pkgname=cciss_vol_status
pkgver=1.06
-pkgrel=0
+pkgrel=1
pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability."
url="http://cciss.sourceforge.net/"
license="GPL"
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index ce5f9830..1d17896b 100644
--- a/main/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cdrkit
pkgver=1.1.10
-pkgrel=0
+pkgrel=1
pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
url="http://cdrkit.org/"
license="GPL2"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index c33aae4a..6b30ed78 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=0.8.3.1
-pkgrel=0
+pkgrel=2
_gitver=1.6.4.3
pkgdesc="a fast webinterface for git"
url="http://hjemli.net/git/cgit"
@@ -14,14 +14,17 @@ source="
"
_makeopts="NO_ICONV=YesPlease
- NO_NSEC=YesPlease
NO_TCLTK=YesPlease
NO_SVN_TESTS=YesPlease"
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
rm -rf git
ln -s ../git-$_gitver git
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
make $_makeopts
}
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 54d94e51..b83a0e85 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
pkgver=1.23
-pkgrel=5
+pkgrel=6
pkgdesc="NTP client and server programs"
url="http://chrony.sunsite.dk/"
license="GPL-2"
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index 4cd06d3f..942c9cb8 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=cksfv
pkgver=1.3.14
-pkgrel=0
+pkgrel=1
pkgdesc="Simple File Verification"
url="http://zakalwe.fi/~shd/foss/cksfv"
license="GPL"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 0b12df40..b59af1b9 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=clamav
-pkgver=0.95.3
+pkgver=0.96
pkgrel=0
pkgusers=clamav
pkggroups=clamav
@@ -21,48 +21,61 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
clamav.logrotate
"
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+ cd "$_builddir"
patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1
+}
+
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc/clamav \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --without-iconv
+ --without-iconv \
+ --disable-llvm
+
make || return 1
+}
+
+package() {
+ cd "$_builddir"
+
make DESTDIR="$pkgdir" install
- # Change /etc/clamd.conf to be usable out of the box
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
- -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
- -e "s:.*\(User\) .*:\1 clamav:" \
- -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
- -e "s:^\#\(LogTime\).*:\1 yes:" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- "$pkgdir"/etc/clamav/clamd.conf
+ # Change /etc/clamd.conf to be usable out of the box
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+ -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+ -e "s:.*\(User\) .*:\1 clamav:" \
+ -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+ -e "s:^\#\(LogTime\).*:\1 yes:" \
+ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+ "$pkgdir"/etc/clamav/clamd.conf
- # Do the same for /etc/freshclam.conf
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
- -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
- -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
- -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
- -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- "$pkgdir"/etc/clamav/freshclam.conf
+ # Do the same for /etc/freshclam.conf
+ sed -i -e "s:^\(Example\):\# \1:" \
+ -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+ -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+ -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+ -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
+ -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+ "$pkgdir"/etc/clamav/freshclam.conf
- install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd
- install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd
+ install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd
+ install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd
install -m755 -D "$srcdir"/freshclam.initd "$pkgdir"/etc/init.d/freshclam
- install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam
- install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav
- mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
+ install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam
+ install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav
+ mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
}
-md5sums="eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz
+md5sums="28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.tar.gz
d64432c463850663c5041c3097f3e903 clamd.initd
567bc32b657dd7031b9b7beaa946203a clamd.confd
f4d1f415322905128dc27135566ad136 freshclam.initd
diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 1bad20a0..3b9906e7 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=clamsmtp
pkgver=1.10
-pkgrel=6
+pkgrel=7
pkgdesc="An SMTP Virus Filter"
url="http://memberwebs.com/stef/software/clamsmtp/"
license="as-is"
diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD
index 74644f3c..a98dac56 100644
--- a/main/claws-mail/APKBUILD
+++ b/main/claws-mail/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=claws-mail
-pkgver=3.7.5
-pkgrel=0
+pkgver=3.7.6
+pkgrel=1
pkgdesc="A GTK+ based e-mail client."
url="http://www.claws-mail.org"
license="GPL3"
@@ -46,5 +46,5 @@ package() {
install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i}
done
}
-md5sums="05a97ef3bf41ae5e6e2a3ddeb600ab44 claws-mail-3.7.5.tar.bz2
+md5sums="09c150cf13c04201c92089fc285cecd9 claws-mail-3.7.6.tar.bz2
f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch"
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index bc6331b5..bbd1b588 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
pkgver=2.8.1
-pkgrel=0
+pkgrel=1
pkgdesc="CMake is a cross-platform open-source make system"
url="http://www.cmake.org"
license="CMake"
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD
index ef5d5b07..b58927c7 100644
--- a/main/confuse/APKBUILD
+++ b/main/confuse/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=confuse
-pkgver=2.6
+pkgver=2.7
pkgrel=0
pkgdesc="C-library for parsing configuration files"
url="http://www.nongnu.org/confuse"
@@ -8,7 +8,7 @@ license="LGPL"
depends=
makedepends="flex bison pkgconfig"
subpackages="$pkgname-dev"
-source="http://bzero.se/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://savannah.nongnu.org/download/confuse/confuse-$pkgver.tar.gz"
build() {
cd "$srcdir"/$pkgname-$pkgver
@@ -26,4 +26,4 @@ package() {
make DESTDIR="$pkgdir" install
install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc
}
-md5sums="0e883d66f0f58fc33585b430c652aa30 confuse-2.6.tar.gz"
+md5sums="45932fdeeccbb9ef4228f1c1a25e9c8f confuse-2.7.tar.gz"
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 5ed2b070..343eb8f1 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conntrack-tools
pkgver=0.9.13
-pkgrel=1
+pkgrel=2
pkgdesc="Connection tracking userspace tools"
url="http://conntrack-tools.netfilter.org"
license="GPL-2"
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 46c9cc4a..7ffc0666 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=coreutils
-pkgver=8.4
-pkgrel=1
+pkgver=8.5
+pkgrel=0
pkgdesc="The basic file, shell and text manipulation utilities"
url="http://www.gnu.org/software/coreutils/"
license="GPL"
@@ -28,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-md5sums="56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz"
+md5sums="c1ffe586d001e87d66cd80c4536ee823 coreutils-8.5.tar.gz"
diff --git a/main/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 98d7f94c..e70d415e 100644
--- a/main/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cpufreqd
-pkgver=2.3.4
-pkgrel=1
+pkgver=2.4.2
+pkgrel=0
pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)"
url="http://sourceforge.net/projects/cpufreqd"
license="GPL2"
subpackages="$pkgname-dev $pkgname-doc"
-depends="cpufrequtils sysfsutils uclibc"
+depends=
makedepends="cpufrequtils-dev sysfsutils-dev g++"
install=
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
@@ -18,9 +18,13 @@ build ()
./configure --prefix=/usr \
--sysconfdir=/etc
make LIBS=-lpthread || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \
|| return 1
}
-md5sums="f4193f688305566a8422dd3989667668 cpufreqd-2.3.4.tar.bz2
+md5sums="2ca80a77849c9a69b81e27c1843c97f5 cpufreqd-2.4.2.tar.bz2
4c3298abc888ac4f688249ee542ce784 cpufreqd.initd"
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 377fe021..af8cff9d 100644
--- a/main/cpufrequtils/APKBUILD
+++ b/main/cpufrequtils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cpufrequtils
pkgver=007
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace tools for the kernel cpufreq subsystem"
url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
license="GPL"
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index e03c6a77..f7fda796 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=cracklib
pkgver=2.8.13
-pkgrel=0
+pkgrel=1
pkgdesc="A library used to enforce strong passwords"
url="http://sourceforge.net/projects/cracklib"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
install=
subpackages="$pkgname-dev"
diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD
index e40e57c2..79c53cc3 100644
--- a/main/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
@@ -1,19 +1,22 @@
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
pkgname=cramfs
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="Linux filesystem designed to be simple, small, and to compress things well"
arch=""
url="http://sourceforge.net/projects/cramfs/"
license='GPL'
-depends="uclibc zlib"
+depends=
makedepends="zlib-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
cd "$srcdir/$pkgname-$pkgver"
-
make CFLAGS="$CFLAGS" || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
install -d "$pkgdir"/sbin
install mkcramfs cramfsck "$pkgdir"/sbin
}
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index b986f9c9..7be38174 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
pkgname=ctags
pkgver=5.8
-pkgrel=0
+pkgrel=1
pkgdesc="Generator of tags for all types of C/C++ languages"
url="http://ctags.sourceforge.net/"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
install=
subpackages=""
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index b87c456f..d63b0c14 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=1.4.3
-pkgrel=0
+pkgrel=3
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client"
-makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8"
+makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8 zlib-dev"
depends="cups-client poppler-utils"
install=
pkggroups="lp lpadmin"
@@ -16,6 +16,8 @@ source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz
cupsd.initd
"
+depends_dev="openssl-dev zlib-dev"
+
build ()
{
cd "$srcdir"/$pkgname-$pkgver
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index a7bcbd03..f7d6c504 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -1,18 +1,19 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=curl
-pkgver=7.19.7
-pkgrel=0
+pkgver=7.20.1
+pkgrel=1
pkgdesc="An URL retrival utility and library"
url="http://curl.haxx.se"
license="MIT"
depends=
makedepends="zlib-dev openssl-dev"
-source="http://curl.osmirror.nl/download/curl-$pkgver.tar.bz2"
-
+source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2"
subpackages="$pkgname-doc $pkgname-dev"
+_builddir="$srcdir/$pkgname-$pkgver"
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
./configure --prefix=/usr \
--mandir=/usr/share/man \
--without-libidn \
@@ -21,8 +22,8 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
make DESTDIR="$pkgdir" install
}
-md5sums="79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2"
+md5sums="244b16b2a38c70e47130c8494b7371b9 curl-7.20.1.tar.bz2"
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index be27d880..0337b29a 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=cutter
pkgver=1.03
-pkgrel=1
+pkgrel=2
pkgdesc="A program that allows firewall administrators to abort TCP/IP connections."
url="http://www.lowth.com/cutter"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
install=
subpackages=""
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index bcfcea6f..21c4d581 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer:
pkgname=cvs
pkgver=1.11.23
-pkgrel=0
+pkgrel=1
pkgdesc="Concurrent Versions System"
url="http://www.nongnu.org/cvs/"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
install=
subpackages="$pkgname-doc"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 6346d9fa..98c75439 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.23
-pkgrel=2
+pkgrel=4
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
license="custom"
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 9a1538fa..dbb82aab 100644
--- a/main/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=dahdi-tools
pkgver=2.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
url="http://www.asterisk.org"
license="GPL"
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 607cd533..82aa4aa9 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dansguardian
pkgver=2.10.1.1
-pkgrel=5
+pkgrel=6
pkgdesc="Web content filter"
url="http://dansguardian.org"
license="GPL"
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index 926b9713..d299132b 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -2,7 +2,7 @@
pkgname=db
pkgver=4.8.26
_ver=${pkgver}
-pkgrel=0
+pkgrel=1
pkgdesc="The Berkeley DB embedded database system 4.8"
url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
license="custom"
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 46c85f20..799560fb 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus-glib
-pkgver=0.82
+pkgver=0.86
pkgrel=0
pkgdesc="GLib bindings for DBUS"
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
-depends="dbus glib libiconv expat gettext"
-makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev g++ expat-dev"
+depends=
+makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev expat-dev"
source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
depends_dev="glib-dev dbus-dev"
@@ -25,4 +25,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="aa2a4517de0e9144be3bce2cf8cdd924 dbus-glib-0.82.tar.gz"
+md5sums="cd0ab148fb0c786fc88be49d19971f50 dbus-glib-0.86.tar.gz"
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index d8471073..a1f79850 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
pkgver=1.2.24
-pkgrel=1
+pkgrel=3
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
pkggroups="messagebus"
@@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc"
depends=
makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev"
depends_dev="util-linux-ng-dev"
-install="$pkgname.pre-install"
+install="$pkgname.pre-install $pkgname.post-install"
source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname.initd
"
diff --git a/main/dbus/dbus.post-install b/main/dbus/dbus.post-install
new file mode 100644
index 00000000..305297a4
--- /dev/null
+++ b/main/dbus/dbus.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec dbus-uuidgen --ensure
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 9bd4502c..db61256b 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=debootstrap
pkgver=1.0.22
-pkgrel=0
+pkgrel=1
pkgdesc="Debian/Ubuntu bootstrap scripts"
url="http://packages.qa.debian.org/d/debootstrap.html"
license="GPL-2"
diff --git a/main/desktop-file-utils/APKBUILD b/main/desktop-file-utils/APKBUILD
index dc952e86..bdfd3917 100644
--- a/main/desktop-file-utils/APKBUILD
+++ b/main/desktop-file-utils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=desktop-file-utils
pkgver=0.16
-pkgrel=0
+pkgrel=1
pkgdesc="Command line utilities for working with desktop entries"
url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
license="GPL"
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 4ecd8dff..1c334c80 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
pkgname=dhcp
pkgver=4.1.0_p1
_realver=4.1.0p1
-pkgrel=9
+pkgrel=10
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
license="GPL"
diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index ed4415af..b7f2ffa2 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd-dbus
pkgver=0.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="DBUS binding to dhcpcd"
url="http://roy.marples.name/projects/dhcpcd-dbus"
license="BSD"
diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD
index 2732f1c7..eb6d6ebd 100644
--- a/main/dhcpcd-ui/APKBUILD
+++ b/main/dhcpcd-ui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd-ui
pkgver=0.4.3
-pkgrel=0
+pkgrel=1
pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
url="http://roy.marples.name/projects/dhcpcd-dbus"
license="BSD-2"
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index cfc7a77c..17f3bd0d 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
pkgver=5.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client"
url="http://roy.marples.name/projects/dhcpcd/"
license="BSD-2"
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index 99619e31..5c6703dc 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -3,11 +3,11 @@
pkgname=dialog
pkgver=1.1.20080819
_ver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
+pkgrel=1
pkgdesc="A script-interpreter which provides a set of curses"
url="http://invisible-island.net/dialog/dialog.html"
license="GPL"
-depends="uclibc ncurses"
+depends=
makedepends="ncurses-dev"
install=
subpackages="$pkgname-doc"
@@ -15,12 +15,15 @@ source="ftp://invisible-island.net/dialog/$pkgname.tar.gz"
build() {
cd "$srcdir/$pkgname-$_ver"
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$_ver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 004d0e91..66f74eff 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=diffutils
pkgver=2.9
-pkgrel=0
+pkgrel=1
pkgdesc="Show differences among files"
subpackages="$pkgname-doc"
url="http://www.gnu.org/software/diffutils/"
license="GPL2"
-depends="uclibc"
+depends=""
makedepends=""
install="$pkgname.post-deinstall"
source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/main/dircproxy/APKBUILD b/main/dircproxy/APKBUILD
index becb8133..88ae453f 100644
--- a/main/dircproxy/APKBUILD
+++ b/main/dircproxy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dircproxy
pkgver=1.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="IRC proxy server designed for people who use IRC from lots of different workstations or clients"
url="http://code.google.com/p/dircproxy/"
license="GPL"
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 27803991..c24efc91 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=distcc
pkgver=3.1
-pkgrel=2
+pkgrel=4
pkgdesc="A distributed C, C++, Obj C compiler"
url="http://distcc.org"
license="GPL-2"
@@ -11,7 +11,7 @@ source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2
distcc-3.1-clone.patch
distcc-hardened.patch
distccd.initd distccd.confd"
-subpackages="$pkgname-doc $pkgname-python"
+subpackages="$pkgname-doc $pkgname-pump"
build ()
{
@@ -39,9 +39,10 @@ build ()
ln -sf /usr/bin/$pkgname "$d"/cpp
}
-python() {
- pkgdesc="Python bindings to distcc"
- mkdir -p "$subpkgdir"/usr/lib
+pump() {
+ pkgdesc="pump mode for distcc a distributed compiler client and server"
+ mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/pump "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index a9895c23..c52201a9 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=djbdns
pkgver=1.05
-pkgrel=33
+pkgrel=36
pkgdesc="Excellent high-performance DNS services"
url="http://cr.yp.to/djbdns.html"
license="public-domain"
@@ -50,7 +50,7 @@ common() {
replaces="djbdns"
mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/dnsq "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/dnsqr "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
}
@@ -101,4 +101,4 @@ fe48165a920cf843ceb9a4ee50bf74c0 tinydns.initd
e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install
e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd
2b3d02e88f70603c760bf368ab3ed636 dnscache.confd
-6253f44f042fc5aa31fd182780d9853c dnscache.monthly"
+805b6989f945d727788f1908fe3fce81 dnscache.monthly"
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly
index 0bd5a853..4e53fd6f 100755
--- a/main/djbdns/dnscache.monthly
+++ b/main/djbdns/dnscache.monthly
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ -f ./etc/conf.d/dnscache ]; then
+if [ -f /etc/conf.d/dnscache ]; then
. /etc/conf.d/dnscache
fi
@@ -42,7 +42,7 @@ for ZONEFILE in $ZONES; do
done
if [ "$NEEDRESTART" ] && /etc/init.d/dnscache --quiet status; then
- /etc/init.d/dnscache restart
+ /etc/init.d/dnscache --quiet restart
fi
exit 0
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index feddb67f..a5700338 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dnsmasq
pkgver=2.52
-pkgrel=0
+pkgrel=1
pkgdesc="Small forwarding DNS server"
url="http://www.thekelleys.org.uk/dnsmasq/"
license="GPL-2"
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 07648fe9..fc11de09 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dosfstools
pkgver=3.0.9
-pkgrel=0
+pkgrel=1
pkgdesc="DOS filesystem utilities"
url="http://www.daniel-baumann.ch/software/dosfstools/"
license="GPL-2"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 44901280..6dd77003 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
pkgver=1.2.11
-pkgrel=1
+pkgrel=3
pkgdesc="IMAP and POP3 server"
url="http://www.dovecot.org/"
license="LGPL-2.1"
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 5710f9c5..5672b96e 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
pkgver=1.15.5.6
-pkgrel=0
+pkgrel=1
pkgdesc="The Debian Package Manager"
url="http://packages.debian.org/dpkg"
license="GPL"
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 53bbdc4e..65c698ef 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
pkgver=0.52
-pkgrel=2
+pkgrel=3
pkgdesc="small SSH 2 client/server designed for small memory environments"
url="http://matt.ucc.asn.au/dropbear/dropbear.html"
license='MIT'
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index 120ef4ee..46aaf735 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=dtach
pkgver=0.8
-pkgrel=0
+pkgrel=1
pkgdesc="A program that emulates the detach feature of screen"
url="http://dtach.sourceforge.net"
license='GPL'
-depends="uclibc"
+depends=""
makedepends=""
source="http://surfnet.dl.sourceforge.net/sourceforge/dtach/dtach-0.8.tar.gz"
subpackages="$pkgname-doc"
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index e0360aac..bfaaa7b4 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.41.11
+pkgver=1.41.12
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -46,4 +46,4 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-md5sums="fb507a40c2706bc38306f150d069e345 e2fsprogs-1.41.11.tar.gz"
+md5sums="1b24a21fc0c2381ef420961cbfec733f e2fsprogs-1.41.12.tar.gz"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 59c21f2e..2bf311da 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
pkgname=eggdrop
pkgver=1.6.19
-pkgrel=1
+pkgrel=2
pkgdesc="World's most popular Open Source IRC bot"
url="http://www.eggheads.org/"
license='GPL-2'
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index a1301fe0..8c81437c 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=email
pkgver=3.1.2
-pkgrel=0
+pkgrel=2
pkgdesc="A command line SMTP client that's simple"
url="http://www.cleancode.org/projects/email"
license="GPL"
-depends="uclibc openssl"
+depends="openssl"
makedepends="openssl-dev"
source="http://www.cleancode.org/downloads/email/email-3.1.2.tar.bz2"
diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD
index 8133127b..a2698dac 100644
--- a/main/enchant/APKBUILD
+++ b/main/enchant/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=enchant
-pkgver=1.5.0
-pkgrel=1
+pkgver=1.6.0
+pkgrel=0
pkgdesc="A wrapper library for generic spell checking"
url="http://www.abisource.com/enchant/"
license="LGPL"
@@ -11,11 +11,14 @@ depends_dev="glib-dev"
makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev"
source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr --disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="7dfaed14e142b4a0004b770c9568ed02 enchant-1.5.0.tar.gz"
+md5sums="de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz"
diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index fdd6e418..814ba521 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -1,27 +1,35 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=epdfview
pkgver=0.1.7
-pkgrel=1
+pkgrel=3
pkgdesc="A free lightweight PDF document viewer."
url="http://www.emma-soft.com/projects/epdfview/"
license="GPL"
#depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1
depends="desktop-file-utils hicolor-icon-theme"
-makedepends="poppler-gtk-dev"
+makedepends="poppler-gtk-dev cups-dev"
source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
$pkgname.desktop.patch
fix-scrolling.patch"
-build ()
-{
- cd ""$srcdir"/$pkgname-$pkgver"
+_builddir="$srcdir"/$pkgname-$pkgver
+package() {
+ cd "$_builddir"
patch -Np0 -i ../epdfview.desktop.patch || return 1
patch -Np0 -i ../fix-scrolling.patch || return 1
+}
+
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
|| return 1
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make -j1 DESTDIR="$pkgdir" install || return 1
for i in 24 32 48; do
install -d "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps \
diff --git a/main/epris/APKBUILD b/main/epris/APKBUILD
index eb1aaf0b..a313cf61 100644
--- a/main/epris/APKBUILD
+++ b/main/epris/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=epris
pkgver=0.2
-pkgrel=0
+pkgrel=1
pkgdesc="Small audio player using GStreamer and DBus"
url="http://code.google.com/p/epris/"
license="LGPL"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 2d55080f..c8a114d1 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=espeak
pkgver=1.43.03
-pkgrel=0
+pkgrel=1
pkgdesc="Speech synthesizer for English and other languages"
url="http://espeak.sourceforge.net/"
license="GPL-3"
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 50c92d40..4a5cd1bc 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ethtool
pkgver=6
-pkgrel=0
+pkgrel=1
pkgdesc="gkernel ethtool"
url="http://sourceforge.net/projects/gkernel/"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
source="http://easynews.dl.sf.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz"
subpackages="$pkgname-doc"
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD
index 62277d23..427aafd5 100644
--- a/main/exo/APKBUILD
+++ b/main/exo/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# TODO: hal
pkgname=exo
-pkgver=0.3.106
-pkgrel=1
+pkgver=0.3.107
+pkgrel=0
pkgdesc="Extensions to Xfce by os-cillation"
url="http://www.os-cillation.com/article.php?sid=40"
license="GPL-2 LGPL-2"
@@ -31,4 +31,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="927905f89252fa397e50d7a4fbf3c9a7 exo-0.3.106.tar.bz2"
+md5sums="3a92cca0c99ee940db4410891c9e8498 exo-0.3.107.tar.bz2"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index e49d9907..3fb6c621 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=expat
pkgver=2.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="An XML Parser library written in C"
url="http://www.libexpat.org/"
license='AS IS'
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 9da97305..2d3d4f26 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
pkgname=ez-ipupdate
pkgver=3.0.10
-pkgrel=0
+pkgrel=1
pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
url="http://ez-ipupdate.com/"
license="GPL"
diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index 3e523a4d..85a73079 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -1,22 +1,24 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=faac
pkgver=1.28
-pkgrel=0
+pkgrel=2
pkgdesc="FAAC is an AAC audio encoder."
url="http://www.audiocoding.com/"
license="GPL custom"
subpackages="$pkgname-dev $pkgname-doc"
depends=
-makedepends="autoconf automake libtool uclibc++-dev"
+makedepends="autoconf automake libtool"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
- export CXX="${UC_CXX:-g++-uc}"
./bootstrap
./configure --prefix=/usr
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -D -m644 "$srcdir"/$pkgname-$pkgver/libfaac/kiss_fft/COPYING \
"$pkgdir"/usr/share/licenses/faac/COPYING.kiss_fft
diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD
index e1453df9..11146165 100644
--- a/main/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=faad2
pkgver=2.7
-pkgrel=0
+pkgrel=1
pkgdesc="ISO AAC audio decoder"
url="http://www.audiocoding.com/"
license="custom:GPL"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 4836aed6..6c844616 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fakeroot
pkgver=1.14.4
-pkgrel=0
+pkgrel=1
pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
license='GPL'
url="http://packages.debian.org/fakeroot"
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index fc208006..d2a8bb03 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=fcgi
pkgver=2.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI"
url="http://www.fastcgi.com"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
subpackages="$pkgname-dev"
source="http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz
diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD
index aeefeb3d..af556078 100644
--- a/main/feh/APKBUILD
+++ b/main/feh/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=feh
-pkgver=1.4.2
+pkgver=1.5
pkgrel=0
pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
url="http://www.linuxbrit.co.uk/feh/"
@@ -23,4 +23,4 @@ package() {
make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-md5sums="19906a6e319e99e0d98856f64324fed8 feh-1.4.2.tar.bz2"
+md5sums="aee156f0a82582108c5a56fbe85319ae feh-1.5.tar.bz2"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 779ab8b9..b86bd2a0 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fetchmail
-pkgver=6.3.16
-pkgrel=0
+pkgver=6.3.17
+pkgrel=1
pkgdesc="A remote-mail retrieval and forwarding utility"
url="http://fetchmail.berlios.de/"
license="GPL"
@@ -41,5 +41,5 @@ fetchmailconf() {
mv usr/lib "$subpkgdir"/usr/
}
-md5sums="1a40acb371376c7d54fe468c99dfc216 fetchmail-6.3.16.tar.bz2
+md5sums="7b1d449ecddb6164e22c32854adc4a75 fetchmail-6.3.17.tar.bz2
b27fe01a7c25534d62d175c8ba22fc48 fetchmail.initd"
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index eb1e167d..840d01f6 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -2,7 +2,7 @@
pkgname=ffmpeg
_svnrev=30526
pkgver=0.5_svn$_svnrev
-pkgrel=1
+pkgrel=3
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="http://ffmpeg.mplayerhq.hu/"
license="GPL"
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 06bde75b..0602565b 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
pkgver=5.04
-pkgrel=0
+pkgrel=1
pkgdesc="File type identification utility"
url="http://www.darwinsys.com/file/"
license="custom"
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index 3fbb0bac..31146e8e 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=findutils
pkgver=4.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="GNU utilities for finding files"
url="http://www.gnu.org/software/findutils/"
license="GPL"
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index a5626e1c..03806b59 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flac
pkgver=1.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="Free Lossless Audio Codec"
url="http://flac.sourceforge.net/"
license="custom:Xiph LGPL GPL FDL"
subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc libogg"
-makedepends="libogg-dev"
+depends=
+makedepends="libogg-dev !libiconv"
source="http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
"
@@ -23,6 +23,10 @@ build () {
--disable-cpplibs \
--with-pic || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver || return 1
make DESTDIR="$pkgdir" install || return 1
install -Dm0644 COPYING.Xiph \
"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD
index d44643d7..830191ad 100644
--- a/main/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncop@alpinelinux.org>
pkgname=flex
pkgver=2.5.35
-pkgrel=2
+pkgrel=3
pkgdesc="A tool for generating text-scanning programs"
url="http://flex.sourceforge.net"
license=custom
diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD
index 4229d1bb..dce038f7 100644
--- a/main/fluxbox/APKBUILD
+++ b/main/fluxbox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fluxbox
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="A lightweight and highly-configurable window manager"
url="http://www.fluxbox.org"
license="MIT"
diff --git a/main/font-util/APKBUILD b/main/font-util/APKBUILD
index d7bbb361..fef19d79 100644
--- a/main/font-util/APKBUILD
+++ b/main/font-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-util
pkgver=1.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="X.org font utilities"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index 3ae0ffd4..f45956b9 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fontconfig
pkgver=2.8.0
-pkgrel=0
+pkgrel=1
pkgdesc="The Fontconfig package is a library for configuring and customizing font access."
url="http://fontconfig.org"
license="GPL"
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index 11b4f181..9dea9369 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -1,11 +1,11 @@
pkgname=fping
pkgver=2.4_beta2
_myver=2.4b2_to
-pkgrel=1
+pkgrel=2
pkgdesc="A utility to ping multiple hosts at once"
url="http://www.fping.com/"
license="fping"
-depends="uclibc"
+depends=""
subpackages="$pkgname-doc"
# what happened to upstream download? use gentoo distfiles meanwhile
diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD
index 824129af..f7311e98 100644
--- a/main/fprobe/APKBUILD
+++ b/main/fprobe/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=fprobe
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="libpcap-based tool that collect network traffic"
url="http://fprobe.sourceforge.net/"
license="GPL"
diff --git a/testing/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 7b1a4ea9..860ec0ff 100644
--- a/testing/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
pkgname=freeswitch
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.6
+pkgrel=6
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
license="GPL"
depends=""
makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev
autoconf automake libtool"
-install=
+install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-dev"
source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
modules.conf
@@ -16,7 +16,6 @@ source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
freeswitch.initd
freeswitch.post-install
freeswitch.pre-install
- freeswitch.post-deinstall
"
build() {
@@ -30,35 +29,33 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc/freeswitch \
--with-modinstdir=/usr/lib/freeswitch \
+ --with-rundir=/var/run/freeswitch \
--mandir=/usr/share/man \
- --infodir=/usr/share/info
+ --infodir=/usr/share/info \
- # check how/when parallel builds are fixed here:
- # http://jira.freeswitch.org/browse/FSBUILD-6
-
- # build the libs and prerequisites in parallel first
- make libs/apr/libapr-1.la \
- libs/apr-util/libaprutil-1.la \
- libs/speex/libspeex/libspeexdsp.la \
- libs/sqlite/libsqlite3.la \
- libs/pcre/libpcre.la \
- libs/srtp/libsrtp.la \
- src/include/switch_version.h
-
- # then the rest should build in parallel too
- make || return 1
+ make all || return 1
}
package(){
cd "$srcdir/$pkgname-$pkgver"
make -j1 DESTDIR="$pkgdir" install
+ # we need to do some moving/cleanup to allow some... kind of FHS
+ mkdir -p "$pkgdir"/var/run/freeswitch
+ mkdir -p "$pkgdir"/var/lib/freeswitch
+ mkdir -p "$pkgdir"/var/log
+ mkdir -p "$pkgdir"/usr/share/freeswitch
+ mv "$pkgdir"/usr/db "$pkgdir"/var/lib/freeswitch/
+ mv "$pkgdir"/usr/grammar "$pkgdir"/var/lib/freeswitch/
+ mv "$pkgdir"/usr/htdocs "$pkgdir"/usr/share/freeswitch/
+ mv "$pkgdir"/usr/recordings "$pkgdir"/var/lib/freeswitch/
+ mv "$pkgdir"/usr/scripts "$pkgdir"/usr/share/freeswitch/
+ mv "$pkgdir"/usr/log "$pkgdir"/var/log/freeswitch
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-md5sums="86e34bdd8cc027d71772cb0dc51388da freeswitch-1.0.4.tar.gz
+md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz
c05f2356be159e99b3845f5260a33599 modules.conf
c608cca8ad773acebf201f581438c7e7 freeswitch.confd
-dd3a6535c54fc6ed8399d6bb57d88369 freeswitch.initd
-c0d7ad55063b1f62c9a2fcfa37b2fc0a freeswitch.post-install
-a34305ba1f8a8e7e6dbb9c678cc442b9 freeswitch.pre-install
-a7188703019a74fd7f128d165b3ecf42 freeswitch.post-deinstall"
+a15f739b6f4f2c1685ab9f8831d30ca6 freeswitch.initd
+107c52398ff88275006b8223ee0b4907 freeswitch.post-install
+25945ad43b7dd988f37bf6f2603e22be freeswitch.pre-install"
diff --git a/testing/freeswitch/freeswitch.confd b/main/freeswitch/freeswitch.confd
index 378e4b41..378e4b41 100644
--- a/testing/freeswitch/freeswitch.confd
+++ b/main/freeswitch/freeswitch.confd
diff --git a/main/freeswitch/freeswitch.initd b/main/freeswitch/freeswitch.initd
new file mode 100755
index 00000000..0538fff5
--- /dev/null
+++ b/main/freeswitch/freeswitch.initd
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
+
+depend() {
+ need net
+}
+
+opts="reload"
+
+start() {
+ local OPTS
+
+ [ -n "${FREESWITCH_USER}" ] && \
+ OPTS="${OPTS} -u ${FREESWITCH_USER}"
+
+ [ -n "${FREESWITCH_GROUP}" ] && \
+ OPTS="${OPTS} -g ${FREESWITCH_GROUP}"
+
+ [ -n "${FREESWITCH_OPTS}" ] && \
+ OPTS="${OPTS} ${FREESWITCH_OPTS}"
+
+ ebegin "Starting Freeswitch"
+ limits
+ start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \
+ -- -nc -conf /etc/freeswitch -log /var/log/freeswitch \
+ -run /var/run/freeswitch -db /var/lib/freeswitch/db \
+ -htdocs /usr/share/freeswitch/htdocs \
+ -scripts /usr/share/freeswitch/scripts ${OPTS}
+ eend $?
+}
+
+# Recomended ULIMIT settings
+# http://tinyurl.com/2dr467l (i,q,u,x not suppoted)
+
+limits() {
+ ulimit -c unlimited
+ ulimit -d unlimited
+ ulimit -f unlimited
+ ulimit -n 999999
+ ulimit -v unlimited
+ ulimit -s 244
+ ulimit -l unlimited
+}
+
+stop() {
+ ebegin "Stopping Freeswitch"
+ /usr/bin/freeswitch -stop
+ eend $?
+}
+
+reload() {
+ start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ /var/run/freeswitch.pid --name freeswitch
+ return 0
+}
+
diff --git a/main/freeswitch/freeswitch.post-install b/main/freeswitch/freeswitch.post-install
new file mode 100755
index 00000000..fef23cae
--- /dev/null
+++ b/main/freeswitch/freeswitch.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chown -R freeswitch:freeswitch /var/*/freeswitch
+
+exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
new file mode 100755
index 00000000..043b963b
--- /dev/null
+++ b/main/freeswitch/freeswitch.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -H -h /var/run/freeswitch -s /bin/false -D freeswitch 2>/dev/null
+
+exit 0
diff --git a/testing/freeswitch/modules.conf b/main/freeswitch/modules.conf
index c6f5a05d..c6f5a05d 100644
--- a/testing/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index 5e58429d..bae42d66 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
pkgver=0.82
-pkgrel=1
+pkgrel=2
pkgdesc="Tabular Datastream Library"
url="http://www.freetds.org/"
license="GPL"
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index e7f2a87f..f88da34b 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=freetype
pkgver=2.3.8
-pkgrel=0
+pkgrel=1
pkgdesc="TrueType font rendering library"
url="http://freetype.sourceforge.net"
license="GPL"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 3c146ec0..fdf62ff6 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
pkgver=0.19.2
-pkgrel=0
+pkgrel=1
pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
url="http://fribidi.org"
license="LGPL"
diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD
index 4ef92f88..f8f2d436 100644
--- a/main/galculator/APKBUILD
+++ b/main/galculator/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=galculator
pkgver=1.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="GTK+ based scientific calculator"
url="http://galculator.sourceforge.net/"
license="GPL"
diff --git a/main/gamin/APKBUILD b/main/gamin/APKBUILD
index 730271af..f7c8936a 100644
--- a/main/gamin/APKBUILD
+++ b/main/gamin/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gamin
pkgver=0.1.10
-pkgrel=1
+pkgrel=2
pkgdesc="Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system."
url="http://www.gnome.org/~veillard/gamin"
license="GPL"
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index fbc2daaa..b1389cd3 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gawk
-pkgver=3.1.7
+pkgver=3.1.8
pkgrel=0
pkgdesc="GNU awk pattern-matching language"
url="http://www.gnu.org/software/gawk/gawk.html"
@@ -22,9 +22,13 @@ build() {
--infodir=/usr/share/info \
--disable-nls
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums="a38d5dec19320ace01f1d16c8beb1363 gawk-3.1.7.tar.gz
+md5sums="35937a0f83f0efe7a8c2dee635624784 gawk-3.1.8.tar.gz
b84506d253e04db3c5af9016fead45a3 gawk.post-deinstall"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 7ab9918c..4668a068 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -4,12 +4,14 @@ pkgver=4.4.3
_pv=4.4.2
_specsver=0.1.7
_espfver=0.3.6
-pkgrel=0
+_uclibc_abiver=0.9.32
+
+pkgrel=3
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
license="GPL LGPL"
-depends="binutils libgcc"
-makedepends="bison flex gmp-dev mpfr-dev texinfo"
+depends="binutils libgcc libgomp"
+makedepends="bison flex gmp5-dev mpfr-dev texinfo"
subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
@@ -18,6 +20,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
gcc-spec-env.patch
pt_gnu_eh_frame.patch
uclibc-getipinfo.patch
+ gcc-dynamic-linker.patch
"
# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
build ()
@@ -52,7 +55,6 @@ build ()
--disable-libstdcxx-pch \
--disable-multilib \
--disable-nls \
- --disable-threads \
--disable-werror \
--enable-__cxa_atexit \
--enable-cld \
@@ -61,7 +63,10 @@ build ()
--enable-shared \
--enable-target-optspace \
--enable-tls \
+ --enable-threads \
--with-arch=i486 \
+ --with-dynamic-linker=ld-uClibc.so.$_uclibc_abiver \
+ --with-dynamic-linker-prefix=/lib \
--with-system-zlib \
--without-system-libunwind
@@ -127,4 +132,5 @@ cd179ec4f05ee17ce76464da25a2674c gcc-g++-4.4.3.tar.bz2
528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2
c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch
2db1e3482c5dd59dab70f701afa2ca80 pt_gnu_eh_frame.patch
-6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch"
+6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch
+6db5c87887beee75cde3cce86625b9ed gcc-dynamic-linker.patch"
diff --git a/main/gcc/gcc-dynamic-linker.patch b/main/gcc/gcc-dynamic-linker.patch
new file mode 100644
index 00000000..9b346645
--- /dev/null
+++ b/main/gcc/gcc-dynamic-linker.patch
@@ -0,0 +1,425 @@
+Submitted By: Kevin Day <thekevinday AT gmail DOT com>
+Date: 2008-12-19
+Initial Package Version: 4.3.2
+Upstream Status: Not submitted
+Description: Why not just be able to define the prefix of the dynamic linker instead of hardcoding it..
+This includes the --nostdinc patch as well, so think of this as a specs-3 patch
+This also allows for specifying the dynamic-linker as well
+
+diff -r -u gcc-4.4.0.orig/gcc/Makefile.in gcc-4.4.0/gcc/Makefile.in
+--- gcc-4.4.0.orig/gcc/Makefile.in 2009-06-06 09:15:56 -0500
++++ gcc-4.4.0/gcc/Makefile.in 2009-06-06 09:40:07 -0500
+@@ -893,7 +893,7 @@
+ # This is the variable actually used when we compile. If you change this,
+ # you probably want to update BUILD_CFLAGS in configure.ac
+ ALL_CFLAGS = $(T_CFLAGS) \
+- $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@
++ $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ @NOSTDINC@
+
+ # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro
+ # puts -I options in CPPFLAGS, our include files in the srcdir will always
+@@ -1947,6 +1947,8 @@
+ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
++ -DDYNAMIC_LINKER_PREFIX=\"@DYNAMICLINKERPREFIX@\" \
++ -DDYNAMIC_LINKER=\"@DYNAMICLINKER@\" \
+ -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
+ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+diff -r -u gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h
+--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/alpha/gnu.h 2009-06-06 09:40:29 -0500
+@@ -11,7 +11,7 @@
+ } while (0)
+
+ #undef ELF_DYNAMIC_LINKER
+-#define ELF_DYNAMIC_LINKER "/lib/ld.so"
++#define ELF_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+diff -r -u gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h 2009-06-06 09:40:07 -0500
+@@ -27,8 +27,8 @@
+ #define EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -r -u gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2009-06-06 09:16:10 -0500
++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-06-06 09:40:07 -0500
+@@ -61,7 +61,7 @@
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+ GNU/Linux binaries on an EABI system. */
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+ use the GNU/Linux version, not the generic BPABI version. */
+diff -r -u gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h 2009-06-06 09:16:10 -0500
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h 2009-06-06 09:40:07 -0500
+@@ -62,7 +62,7 @@
+
+ #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
+ %{b} \
+diff -r -u gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h
+--- gcc-4.4.0.orig/gcc/config/bfin/linux.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/bfin/linux.h 2009-06-06 09:40:07 -0500
+@@ -22,7 +22,7 @@
+ %{shared:-G -Bdynamic} \
+ %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
++ %{!dynamic-linker:-dynamic-linker DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER}} \
+ %{static}} -init __init -fini __fini"
+
+ #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
+diff -r -u gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h
+--- gcc-4.4.0.orig/gcc/config/cris/linux.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/cris/linux.h 2009-06-06 09:40:07 -0500
+@@ -103,7 +103,7 @@
+ #undef CRIS_DEFAULT_CPU_VERSION
+ #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ /* We need an -rpath-link to ld.so.1, and presumably to each directory
+ specified with -B. */
+diff -r -u gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h
+--- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-06-06 09:41:42 -0500
+@@ -144,7 +144,7 @@
+ #endif
+
+ #if FBSD_MAJOR < 6
+-#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
++#define FBSD_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #else
+-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
++#define FBSD_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #endif
+diff -r -u gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h
+--- gcc-4.4.0.orig/gcc/config/frv/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/frv/linux.h 2009-06-06 09:40:07 -0500
+@@ -35,7 +35,7 @@
+ #define ENDFILE_SPEC \
+ "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -r -u gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/i386/linux.h 2009-06-06 09:40:07 -0500
+@@ -100,7 +100,7 @@
+
+ /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
+ #define LINK_EMULATION "elf_i386"
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef ASM_SPEC
+ #define ASM_SPEC \
+diff -r -u gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-06 09:40:07 -0500
+@@ -58,8 +58,8 @@
+ When the -shared link option is used a final link is not being
+ done. */
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -r -u gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
+--- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-06-06 09:40:07 -0500
+@@ -37,7 +37,7 @@
+ /* Define this for shared library support because it isn't in the main
+ linux.h file. */
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+diff -r -u gcc-4.4.0.orig/gcc/config/knetbsd-gnu.h gcc-4.4.0/gcc/config/knetbsd-gnu.h
+--- gcc-4.4.0.orig/gcc/config/knetbsd-gnu.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/knetbsd-gnu.h 2009-06-06 09:40:59 -0500
+@@ -34,5 +34,5 @@
+
+ #ifdef GLIBC_DYNAMIC_LINKER
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #endif
+diff -r -u gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/linux.h 2009-06-06 09:40:07 -0500
+@@ -117,9 +117,9 @@
+ GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
+ GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+ supporting both 32-bit and 64-bit compilation. */
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #define LINUX_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ #define LINUX_DYNAMIC_LINKER32 \
+@@ -135,3 +135,8 @@
+ #define TARGET_HAS_SINCOS (OPTION_GLIBC)
+
+ #define TARGET_POSIX_IO
++
++#ifdef NOSTDINC
++#undef STANDARD_INCLUDE_DIR
++#define STANDARD_INCLUDE_DIR 0
++#endif
+diff -r -u gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h
+--- gcc-4.4.0.orig/gcc/config/m32r/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/m32r/linux.h 2009-06-06 09:40:07 -0500
+@@ -58,7 +58,7 @@
+
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #if TARGET_LITTLE_ENDIAN
+diff -r -u gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h
+--- gcc-4.4.0.orig/gcc/config/m68k/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/m68k/linux.h 2009-06-06 09:40:07 -0500
+@@ -84,7 +84,7 @@
+
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "-m m68kelf %{shared} \
+diff -r -u gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/mips/linux.h 2009-06-06 09:40:07 -0500
+@@ -64,7 +64,7 @@
+ #undef MIPS_DEFAULT_GVALUE
+ #define MIPS_DEFAULT_GVALUE 0
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
+diff -r -u gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-06 09:40:07 -0500
+@@ -35,10 +35,10 @@
+ %{!shared: \
+ %{profile:-lc_p} %{!profile:-lc}}"
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKERN32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKERN32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #define LINUX_DYNAMIC_LINKERN32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+
+diff -r -u gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h
+--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h 2009-06-06 09:16:11 -0500
++++ gcc-4.4.0/gcc/config/mn10300/linux.h 2009-06-06 09:40:07 -0500
+@@ -32,7 +32,7 @@
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{Wa,*:%*}"
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
+diff -r -u gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h 2009-06-06 09:40:07 -0500
+@@ -342,10 +342,10 @@
+ #undef LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define UCLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+ #if UCLIBC_DEFAULT
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
+ #else
+diff -r -u gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h 2009-06-06 09:16:10 -0500
++++ gcc-4.4.0/gcc/config/s390/linux.h 2009-06-06 09:40:07 -0500
+@@ -72,8 +72,8 @@
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+diff -r -u gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h
+--- gcc-4.4.0.orig/gcc/config/sh/linux.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/sh/linux.h 2009-06-06 09:40:07 -0500
+@@ -47,7 +47,7 @@
+
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
+diff -r -u gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/sparc/linux.h 2009-06-06 09:40:07 -0500
+@@ -83,7 +83,7 @@
+
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+diff -r -u gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h 2009-06-06 09:16:15 -0500
++++ gcc-4.4.0/gcc/config/sparc/linux64.h 2009-06-06 09:40:07 -0500
+@@ -109,8 +109,8 @@
+
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #ifdef SPARC_BI_ARCH
+
+diff -r -u gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h
+--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h 2009-06-06 09:16:10 -0500
++++ gcc-4.4.0/gcc/config/xtensa/linux.h 2009-06-06 09:40:07 -0500
+@@ -43,7 +43,7 @@
+ %{mlongcalls:--longcalls} \
+ %{mno-longcalls:--no-longcalls}"
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER
+
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+diff -r -u gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
+--- gcc-4.4.0.orig/gcc/configure 2009-06-06 09:16:16 -0500
++++ gcc-4.4.0/gcc/configure 2009-06-06 09:40:07 -0500
+@@ -1118,6 +1118,14 @@
+ --with-gc={page,zone} choose the garbage collection mechanism to use
+ with the compiler
+ --with-system-zlib use installed libz
++ --with-dynamic-linker=PATH
++ specifies path to dynamic linker.
++ example: "/lib/ld-linux.so.2", where this defines "ld-linux.so.2"
++ --with-dynamic-linker-prefix=PATH
++ specifies path to dynamic linker.
++ example: "/lib/ld-linux.so.2", where this defines "/lib"
++ --with-nostdinc build gcc to ignore standard include directories.
++ You will have to use --with-local-prefix with this option.
+ --with-slibdir=DIR shared libraries in DIR [LIBDIR]
+ --with-datarootdir=DIR Use DIR as the data root [PREFIX/share]
+ --with-docdir=DIR Install documentation in DIR [DATAROOTDIR]
+@@ -5631,6 +5639,47 @@
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+
++# Check whether --with-dynamic-linker was given.
++
++DYNAMICLINKER="ld-linux.so.2" ;
++if test "${with_dynamic_linker+set}" = set; then
++ withval="$with_dynamic_linker"
++ case "${withval}" in
++yes) { { echo "$as_me:$LINENO: error: bad value "${withval}". Use something like --with-dynamic-linker=$DYNAMICLINKER" >&5
++echo "$as_me: error: bad value "${withval}". Use something like --with-dynamic-linker=$DYNAMICLINKER" >&2;}
++ { (exit 1); exit 1; }; } ;;
++no) ;;
++*) DYNAMICLINKER=$withval ;;
++esac
++fi;
++
++# Check whether --with-dynamic-linker-prefix= was given.
++
++DYNAMICLINKERPREFIX="/lib" ;
++if test "${with_dynamic_linker_prefix+set}" = set; then
++ withval="$with_dynamic_linker_prefix"
++ case "${withval}" in
++yes) { { echo "$as_me:$LINENO: error: bad value "${withval}". Use --with-dynamic-linker-prefix=/path/to/lib/" >&5
++echo "$as_me: error: bad value "${withval}". Use --with-dynamic-linker-prefix=/path/to/lib/" >&2;}
++ { (exit 1); exit 1; }; } ;;
++no) ;;
++*) DYNAMICLINKERPREFIX=$withval ;;
++esac
++
++fi;
++
++# Check whether --with-nostdinc was given.
++
++if test "${with_nostdinc+set}" = set; then
++ withval="$with_nostdinc"
++ case "${withval}" in
++yes) NOSTDINC="-DNOSTDINC" ;;
++no) ;;
++*) NOSTDINC="-DNOSTDINC" ;;
++esac
++fi;
++
++
+
+ echo "$as_me:$LINENO: checking for long" >&5
+ echo $ECHO_N "checking for long... $ECHO_C" >&6
+@@ -25488,6 +25537,9 @@
+ s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t
+ s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t
+ s,@onestep@,$onestep,;t t
++s,@DYNAMICLINKER@,$DYNAMICLINKER,;t t
++s,@DYNAMICLINKERPREFIX@,$DYNAMICLINKERPREFIX,;t t
++s,@NOSTDINC@,$NOSTDINC,;t t
+ s,@PKGVERSION@,$PKGVERSION,;t t
+ s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t
+ s,@REPORT_BUGS_TEXI@,$REPORT_BUGS_TEXI,;t t \ No newline at end of file
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index bee60645..5ec28766 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -3,7 +3,7 @@
pkgname=gd
pkgver=2.0.36_rc1
_myver=2.0.36RC1
-pkgrel=1
+pkgrel=2
pkgdesc="Library for the dynamic creation of images by programmers"
url="http://www.libgd.org/"
license="custom"
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index a851da31..67bb5d19 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdb
pkgver=6.8
-pkgrel=3
+pkgrel=4
pkgdesc="The GNU Debugger"
url="http://sources.redhat.com/gdb/"
license="GPL3"
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index e20966b3..a24bfb1f 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=gdbm
pkgver=1.8.3
-pkgrel=0
+pkgrel=1
pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
url="http://www.gnu.org/software/gdbm/"
license="GPL"
-depends="uclibc"
+depends=""
makedepends=""
install=
subpackages="$pkgname-dev $pkgname-dev"
diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD
index da959e6b..36e77f42 100644
--- a/main/geany/APKBUILD
+++ b/main/geany/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=geany
pkgver=0.18.1
-pkgrel=0
+pkgrel=1
pkgdesc="A fast and lightweight IDE"
url="http://www.geany.org"
license="GPL"
diff --git a/main/gegl/APKBUILD b/main/gegl/APKBUILD
new file mode 100644
index 00000000..1db5bd38
--- /dev/null
+++ b/main/gegl/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gegl
+pkgver=0.1.2
+pkgrel=0
+pkgdesc="Graph based image processing framework"
+url="http://www.gegl.org/"
+license="GPL3 LGPL3"
+makedepends="babl-dev libpng-dev jpeg-dev gtk+-dev librsvg-dev lua-dev"
+subpackages="$pkgname-dev"
+source="ftp://ftp.gimp.org/pub/$pkgname/0.1/$pkgname-$pkgver.tar.bz2
+ gegl-uclibc.patch"
+
+depends_dev="babl-dev glib-dev"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in "$srcdir"/*patch; do
+ patch -p1 -i "$i" || return 1
+ done
+}
+
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr \
+ --with-librsvg \
+ --disable-docs \
+ || return 1
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="d35ffe17dc042652eca3205488ece262 gegl-0.1.2.tar.bz2
+e8efbd53553220b97650a3b693461fa5 gegl-uclibc.patch"
diff --git a/main/gegl/gegl-uclibc.patch b/main/gegl/gegl-uclibc.patch
new file mode 100644
index 00000000..cb93f0fe
--- /dev/null
+++ b/main/gegl/gegl-uclibc.patch
@@ -0,0 +1,22 @@
+--- ./gegl/buffer/gegl-buffer.c.orig
++++ ./gegl/buffer/gegl-buffer.c
+@@ -80,7 +80,7 @@
+ /* #define GEGL_BUFFER_DEBUG_ALLOCATIONS to print allocation stack
+ * traces for leaked GeglBuffers using GNU C libs backtrace_symbols()
+ */
+-#ifndef G_OS_WIN32
++#if !defined(G_OS_WIN32) && !defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+
+@@ -876,8 +876,8 @@
+ gegl_buffer_get_alloc_stack (void)
+ {
+ char *result = NULL;
+-#ifdef G_OS_WIN32
+- result = g_strdup ("backtrack not available on win32\n");
++#if defined(G_OS_WIN32) || defined(__UCLIBC__)
++ result = g_strdup ("backtrack not available\n");
+ #else
+ void *functions[MAX_N_FUNCTIONS];
+ int n_functions = 0;
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index 5bb26daa..bd9eec61 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=gettext
pkgver=0.17
-pkgrel=3
+pkgrel=4
pkgdesc="GNU locale utilities"
url="http://www.gnu.org/software/gettext/gettext.html"
license='GPL'
depends=
-makedepends="libiconv-dev expat-dev ncurses-dev bash uclibc++-dev libxml2-dev"
+makedepends="libiconv-dev expat-dev ncurses-dev bash libxml2-dev libgomp"
source="ftp://ftp.mirror.nl/pub/mirror/gnu/gettext/gettext-0.17.tar.gz
gettext-0.15-expat-no-dlopen.patch
gettext-0.17-gnuinfo.patch
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index adc8756a..6373c076 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=ghostscript
pkgver=8.71
-pkgrel=1
+pkgrel=2
pkgdesc="An interpreter for the PostScript language and for PDF"
url="http://ghostscript.com/"
license="GPL"
diff --git a/main/giblib/APKBUILD b/main/giblib/APKBUILD
index e7242d86..90a61b4d 100644
--- a/main/giblib/APKBUILD
+++ b/main/giblib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=giblib
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2"
url="http://linuxbrit.co.uk/giblib/"
license="MIT"
diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD
index 4ea64b88..01fd9047 100644
--- a/main/giflib/APKBUILD
+++ b/main/giflib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=giflib
pkgver=4.1.6
-pkgrel=1
+pkgrel=2
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
license="MIT"
diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD
new file mode 100644
index 00000000..171766f5
--- /dev/null
+++ b/main/gimp/APKBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gimp
+pkgver=2.6.8
+pkgrel=0
+pkgdesc="GNU Image Manipulation Program"
+url="http://www.gimp.org/"
+license="GPL"
+makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev
+ libexif-dev desktop-file-utils intltool gegl-dev tiff-dev
+ jpeg-dev libpng-dev curl-dev"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2
+ libpng-1.4.patch
+ gtk-2.19-statusbar.patch"
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -Np1 -i "../libpng-1.4.patch" || return 1
+ patch -Np1 -i "$srcdir"/gtk-2.19-statusbar.patch || return 1
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-mp \
+ --enable-gimp-console \
+ --enable-gimp-remote \
+ --disable-devel-docs \
+ --disable-python \
+ --without-gvfs \
+ --without-gnomevfs \
+ --with-gif-compression=lzw \
+ --without-aa || return 1
+ make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install || return 1
+ ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1
+}
+md5sums="a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2
+211eccab51593526e852816e647f7da4 libpng-1.4.patch
+8be7d21231e3032e4723cf86588375c0 gtk-2.19-statusbar.patch"
diff --git a/main/gimp/gtk-2.19-statusbar.patch b/main/gimp/gtk-2.19-statusbar.patch
new file mode 100644
index 00000000..8bc278b4
--- /dev/null
+++ b/main/gimp/gtk-2.19-statusbar.patch
@@ -0,0 +1,67 @@
+From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Wed, 24 Mar 2010 17:08:01 +0000
+Subject: backport statusbar code needed for GTK+ >= 2.19.1
+
+Use the hbox that is provided via gtk_statusbar_get_message_area()
+since GTK+ 2.19.1.
+---
+diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
+index 5e89427..36651cd 100644
+--- a/app/display/gimpstatusbar.c
++++ b/app/display/gimpstatusbar.c
+@@ -49,6 +49,9 @@
+ /* maximal width of the string holding the cursor-coordinates */
+ #define CURSOR_LEN 256
+
++/* the spacing of the hbox */
++#define HBOX_SPACING 1
++
+ /* spacing between the icon and the statusbar label */
+ #define ICON_SPACING 2
+
+@@ -152,6 +155,7 @@ static void
+ gimp_statusbar_init (GimpStatusbar *statusbar)
+ {
+ GtkWidget *hbox;
++ GtkWidget *label;
+ GtkWidget *image;
+ GimpUnitStore *store;
+
+@@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
+ statusbar->progress_active = FALSE;
+ statusbar->progress_shown = FALSE;
+
+- /* remove the label and insert a hbox */
+- gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame),
+- g_object_ref (GTK_STATUSBAR (statusbar)->label));
+-
+- hbox = gtk_hbox_new (FALSE, 1);
+- gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox);
+- gtk_widget_show (hbox);
++ label = g_object_ref (GTK_STATUSBAR (statusbar)->label);
++
++ /* remove the message area or label and insert a hbox */
++#if GTK_CHECK_VERSION (2, 19, 1)
++ {
++ hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar));
++ gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING);
++ gtk_container_remove (GTK_CONTAINER (hbox), label);
++ }
++#else
++ {
++ GtkWidget *label_parent;
++
++ label_parent = gtk_widget_get_parent (label);
++ gtk_container_remove (GTK_CONTAINER (label_parent), label);
++
++ hbox = gtk_hbox_new (FALSE, HBOX_SPACING);
++ gtk_container_add (GTK_CONTAINER (label_parent), hbox);
++ gtk_widget_show (hbox);
++ }
++#endif
+
+ statusbar->cursor_label = gtk_label_new ("8888, 8888");
+ gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5);
+--
+cgit v0.8.3.1
diff --git a/main/gimp/libpng-1.4.patch b/main/gimp/libpng-1.4.patch
new file mode 100644
index 00000000..8f7963d2
--- /dev/null
+++ b/main/gimp/libpng-1.4.patch
@@ -0,0 +1,26 @@
+diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c
+--- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500
++++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500
+@@ -286,14 +286,22 @@
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
++#if PNG_LIBPNG_VER < 10400
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
+ png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
++#if PNG_LIBPNG_VER < 10400
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index ca396675..f8d9e8bb 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=git
-pkgver=1.7.0.5
-pkgrel=0
+pkgver=1.7.1
+pkgrel=2
pkgdesc="GIT - the stupid content tracker"
url="http://git.or.cz/"
license="GPL2"
@@ -10,6 +10,7 @@ subpackages="$pkgname-doc $pkgname-perl"
makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev"
source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2
bb-tar.patch
+ git-do-not-dump-core-when-iconv-fails.patch
"
_makeopts="NO_ICONV=YesPlease
@@ -17,14 +18,16 @@ _makeopts="NO_ICONV=YesPlease
NO_TCLTK=YesPlease
NO_SVN_TESTS=YesPlease"
-build () {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 -i ../bb-tar.patch || return 1
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 -i "$srcdir"/bb-tar.patch || return 1
+ patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \
+ || return 1
make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
make prefix=/usr DESTDIR="$pkgdir" $_makeopts install
}
@@ -42,5 +45,6 @@ perl() {
}
-md5sums="77d50f41ef282752dc69d9a47765f5c7 git-1.7.0.5.tar.bz2
-e63a201556c4f089de790805c09a2e5b bb-tar.patch"
+md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2
+e63a201556c4f089de790805c09a2e5b bb-tar.patch
+7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch"
diff --git a/main/git/git-do-not-dump-core-when-iconv-fails.patch b/main/git/git-do-not-dump-core-when-iconv-fails.patch
new file mode 100644
index 00000000..b338ee48
--- /dev/null
+++ b/main/git/git-do-not-dump-core-when-iconv-fails.patch
@@ -0,0 +1,43 @@
+commit 43acff34b902c38808ac0f326090f2516250e1f0
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date: Sat May 8 18:17:29 2010 -0500
+
+ cherry-pick: do not dump core when iconv fails
+
+ When cherry-picking, usually the new and old commit encodings are both
+ UTF-8. Most old iconv implementations do not support this trivial
+ conversion, so on old platforms, out->message remains NULL, and later
+ attempts to read it segfault.
+
+ Fix this by noticing the input and output encodings match and skipping
+ the iconv step, like the other reencode_string() call sites already do.
+ Also stop segfaulting on other iconv failures: if iconv fails for some
+ other reason, the best we can do is to pass the old message through.
+
+ This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
+ clarify label on conflict hunks, 2010-03-20).
+
+ Reported-by: Andreas Krey <a.krey@gmx.de>
+ Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
+
+diff --git a/builtin/revert.c b/builtin/revert.c
+index 778a56e..7d68ef7 100644
+--- a/builtin/revert.c
++++ b/builtin/revert.c
+@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out)
+ encoding = "UTF-8";
+ if (!git_commit_encoding)
+ git_commit_encoding = "UTF-8";
+- if ((out->reencoded_message = reencode_string(raw_message,
+- git_commit_encoding, encoding)))
++
++ out->reencoded_message = NULL;
++ out->message = raw_message;
++ if (strcmp(encoding, git_commit_encoding))
++ out->reencoded_message = reencode_string(raw_message,
++ git_commit_encoding, encoding);
++ if (out->reencoded_message)
+ out->message = out->reencoded_message;
+
+ abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 4c2405eb..1e88f6c7 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glib
pkgver=2.24.0
-pkgrel=0
+pkgrel=2
pkgdesc="Common C routines used by Gtk+ and other libs"
url="http://www.gtk.org"
license='GPL'
depends=
-makedepends="gettext-dev libiconv-dev zlib-dev pkgconfig"
+makedepends="gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig"
source="http://ftp.gnome.org/pub/gnome/sources/glib/${pkgver%.*}/glib-$pkgver.tar.bz2"
subpackages="$pkgname-doc $pkgname-dev"
-depends_dev="perl gettext-dev libiconv-dev zlib-dev pkgconfig"
+depends_dev="perl gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig"
_builddir="$srcdir/$pkgname-$pkgver"
diff --git a/main/gmp/APKBUILD b/main/gmp/APKBUILD
index 5407514d..36ad708d 100644
--- a/main/gmp/APKBUILD
+++ b/main/gmp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gmp
pkgver=4.3.2
-pkgrel=0
+pkgrel=1
pkgdesc="A free library for arbitrary precision arithmetic"
url="http://gmplib.org/"
license="LGPL3"
diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD
new file mode 100644
index 00000000..c2a4ad6f
--- /dev/null
+++ b/main/gmp5/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_name=gmp
+pkgname=${_name}5
+
+pkgver=5.0.1
+pkgrel=0
+pkgdesc="A free library for arbitrary precision arithmetic"
+url="http://gmplib.org/"
+license="LGPL3"
+makedepends="m4 texinfo"
+depends=
+subpackages="$pkgname-doc $pkgname-dev"
+source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
+ gmp-4.1.4-noexecstack.patch
+ "
+
+_builddir="$srcdir"/$_name-$pkgver
+build() {
+ cd "$_builddir"
+ patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1
+
+ ABI="32" ./configure --prefix=/usr \
+ --build=${CHOST} \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --localstatedir=/var/state/gmp \
+ --disable-mpfr \
+ --disable-mpbsd \
+ --disable-cxx \
+ --with-pic \
+ || return 1
+
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make -j1 DESTDIR="${pkgdir}" install || return 1
+}
+
+dev() {
+ replaces="gmp"
+ default_dev
+}
+
+md5sums="6bac6df75c192a13419dfd71d19240a7 gmp-5.0.1.tar.bz2
+13c34f00e77ded6673270cfea06c35c3 gmp-4.1.4-noexecstack.patch"
diff --git a/main/gmp5/gmp-4.1.4-noexecstack.patch b/main/gmp5/gmp-4.1.4-noexecstack.patch
new file mode 100644
index 00000000..093bec1a
--- /dev/null
+++ b/main/gmp5/gmp-4.1.4-noexecstack.patch
@@ -0,0 +1,20 @@
+fixed executable stack
+
+http://bugs.gentoo.org/115038
+
+--- gmp-4.1.4/configure
++++ gmp-4.1.4/configure
+@@ -21689,6 +21689,13 @@
+ fi
+ echo "')" >> $gmp_configm4
+ echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
++# Gentoo hack
++case $host_os in
++ *linux*)
++ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
++ echo '.previous' >> $gmp_configm4
++ ;;
++esac
+
+ # Create Makefiles
+ # FIXME: Upcoming version of autoconf/automake may not like broken lines.
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
index 535f46ee..bcf94e1b 100644
--- a/main/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnats
pkgver=4.1.0
-pkgrel=2
+pkgrel=3
pkgdesc="The GNU Bug Tracking System"
url="http://www.gnu.org/software/gnats/"
license="GPL-2"
-depends="uclibc postfix"
+depends="postfix"
makedepends="texinfo"
install="gnats.pre-install"
source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index fa1387b7..b35f8566 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnupg
-pkgver=2.0.10
+pkgver=2.0.15
pkgrel=0
pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
url="http://www.gnupg.org/"
license="GPL"
-depends="curl zlib libksba libgcrypt libgpg-error pth pinentry libiconv"
+depends=
makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev
- pth-dev zlib-dev libiconv-dev"
+ pth-dev zlib-dev libiconv-dev libassuan-dev"
subpackages="$pkgname-doc"
source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
@@ -16,6 +16,10 @@ build () {
./configure --prefix=/usr \
--disable-nls
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums="1cb778dd555f87685a8fde2f7113725e gnupg-2.0.10.tar.bz2"
+md5sums="c1286e85b66349879dc4b760dd83e2f1 gnupg-2.0.15.tar.bz2"
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index 160f0155..ebd171cb 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnutls
pkgver=2.8.6
-pkgrel=0
+pkgrel=1
pkgdesc="A library which provides a secure connection"
url="http://www.gnu.org/software/gnutls/"
license="GPL"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 6e936cb0..67404c54 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gobject-introspection
-pkgver=0.6.9
+pkgver=0.6.12
pkgrel=0
pkgdesc="Introspection system for GObject-based libraries"
url="http://live.gnome.org/GObjectInstrospection"
license="LGPL GPL"
makedepends="flex bison glib-dev libffi-dev python-dev"
-depends="python glib-dev libffi-dev"
+depends="python glib-dev libffi-dev cairo-dev"
source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.bz2"
# since this is a dev package by definition we dont bother separate -dev
@@ -17,7 +17,8 @@ build() {
cd "$_builddir"
export CPPFLAGS=
./configure --prefix=/usr --disable-static || return 1
- make || return 1
+ # FIXME: parallel builds is broken
+ make -j1 || return 1
}
package() {
@@ -32,4 +33,4 @@ libgirepository() {
mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/
}
-md5sums="37cb473c6bafd03c4a48e1f37e19cc04 gobject-introspection-0.6.9.tar.bz2"
+md5sums="265e24520996820d39d6149ea10dc0df gobject-introspection-0.6.12.tar.bz2"
diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD
new file mode 100644
index 00000000..51c0be8d
--- /dev/null
+++ b/main/goffice/APKBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=goffice
+pkgver=0.8.3
+pkgrel=0
+pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
+url="http://www.gnome.org"
+license="GPL"
+makedepends="libgsf-dev intltool cairo-dev gtk+-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="glib-dev libgsf-dev cairo-dev libxml2-dev"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --without-gconf \
+ --disable-static \
+ || return 1
+ make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="f8c4fd47e1ef9d2512126d1074952201 goffice-0.8.3.tar.bz2"
diff --git a/main/gperf/APKBUILD b/main/gperf/APKBUILD
index cc97c06d..84d5ab2c 100644
--- a/main/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
@@ -1,21 +1,24 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gperf
pkgver=3.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="Perfect hash function generator."
url="http://www.gnu.org/software/gperf/"
license="GPL"
subpackages="$pkgname-doc"
-depends="uclibc libgcc uclibc++"
-makedepends="uclibc++-dev"
+depends=
+makedepends=
source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
build ()
{
cd "$srcdir"/$pkgname-$pkgver
- export CXX=g++-uc
./configure --prefix=/usr
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
md5sums="c1f1db32fb6598d6a93e6e88796a8632 gperf-3.0.4.tar.gz"
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index 9db0713c..6c2062c3 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gpicview
pkgver=0.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="Picture viewer of the LXDE Desktop"
url="http://wiki.lxde.org/en/GPicView"
license="GPL-2"
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 7d1106be..df9cd263 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=grep
pkgver=2.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="Searches input files for lines containing a match to a specified pattern"
url="http://www.gnu.org/software/grep/grep.html"
license="GPL"
diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD
index 6866c2db..ffd69601 100644
--- a/main/groff/APKBUILD
+++ b/main/groff/APKBUILD
@@ -1,22 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=groff
pkgver=1.20.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNU troff text-formatting system"
url="http://www.gnu.org/software/groff/groff.html"
license="GPL"
-depends="uclibc uclibc++ libgcc"
-makedepends="perl texinfo uclibc++-dev"
+depends=
+makedepends="perl texinfo"
subpackages="$pkgname-doc"
source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
build () {
cd "$srcdir/$pkgname-$pkgver"
-
- export CXX=g++-uc
./configure --prefix=/usr --without-x
-
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
md5sums="48fa768dd6fdeb7968041dd5ae8e2b02 groff-1.20.1.tar.gz"
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index 7e6953d9..efb7ba61 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gross
pkgver=1.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="Greylisting of suspicious sources"
url="http://code.google.com/p/gross/"
license="BSD"
diff --git a/main/gst-plugins-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD
index 1949f16c..e27d02a6 100644
--- a/main/gst-plugins-ffmpeg/APKBUILD
+++ b/main/gst-ffmpeg/APKBUILD
@@ -1,32 +1,27 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-ffmpeg
-pkgver=0.10.7
-pkgrel=0
+pkgver=0.10.10
+pkgrel=3
pkgdesc="Gstreamer FFMpeg Plugin"
url="http://www.gstreamer.net"
license="GPL"
-makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev ffmpeg-dev"
+makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev coreutils"
source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2"
-build ()
-{
+build() {
cd "$srcdir"/gst-ffmpeg-$pkgver
- sed -i \
- -e 's,ffmpeg/avformat.h,libavformat/avformat.h,' \
- -e 's,ffmpeg/avcodec.h,libavcodec/avcodec.h,' \
- -e 's,ffmpeg/swscale.h,libswscale/swscale.h,' \
- ext/ffmpeg/gst* \
- ext/libpostproc/gstpostproc.c \
- || return 1
-
export CFLAGS="$CFLAGS -fno-strict-aliasing"
./configure --prefix=/usr \
--sysconfdir=/etc \
- --with-system-ffmpeg \
- --localstatedir=/var || return 1
+ --localstatedir=/var \
+ --with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/gst-ffmpeg-$pkgver
make DESTDIR="$pkgdir" install || return 1
rm -f "$pkgdir"/usr/lib/gstreamer-0.10/*.{l,}a
}
-md5sums="6be89b26592f36ef631b22a68b8e06c4 gst-ffmpeg-0.10.7.tar.bz2"
+md5sums="447292deff5f3748444e6a5fba41da29 gst-ffmpeg-0.10.10.tar.bz2"
diff --git a/main/gst-plugins-bad/APKBUILD b/main/gst-plugins-bad/APKBUILD
index 97eb64f2..4821c459 100644
--- a/main/gst-plugins-bad/APKBUILD
+++ b/main/gst-plugins-bad/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-bad
-pkgver=0.10.14
+pkgver=0.10.18
pkgrel=0
pkgdesc="GStreamer bad plugins"
url="http://gstreamer.freedesktop.org/"
@@ -13,9 +13,8 @@ makedepends="pkgconfig gst-plugins-base-dev gstreamer-dev xvidcore-dev
#'libdca>=0.0.5' 'bzip2' 'libdc1394>=2.1.0' 'exempi>=2.1.0' 'jack-audio-connection-kit>=0.116.2' 'neon>=0.28.4' 'faac>=1.28' 'libexif>=0.6.17' 'musicbrainz>=2.1.5' 'faad2>=2.7' 'libmms>=0.4' 'libcdaudio>=0.99.12' 'libmpcdec>=1.2.6' 'mjpegtools>=1.9.0' 'libdvdnav>=4.1.3' 'libmodplug>=0.8.7' 'jasper>=1.900.1' 'liblrdf>=0.4.0' 'libofa>=0.9.3')
source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$pkgver.tar.bz2"
-build ()
-{
- cd ""$srcdir"/gst-plugins-bad-$pkgver"
+build() {
+ cd "$srcdir"/gst-plugins-bad-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -25,7 +24,11 @@ build ()
--with-package-origin="http://www.alpinelinux.org/" \
|| return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/gst-plugins-bad-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums="6be38b04fc76cdfef3a3b02b8434efa2 gst-plugins-bad-0.10.14.tar.bz2"
+md5sums="84838893b447e774d401a698ff812b32 gst-plugins-bad-0.10.18.tar.bz2"
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index 253cc5fe..423f5873 100644
--- a/main/gst-plugins-base/APKBUILD
+++ b/main/gst-plugins-base/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-base
-pkgver=0.10.25
-pkgrel=2
+pkgver=0.10.29
+pkgrel=0
pkgdesc="GStreamer Multimedia Framework Base Plugins"
url="http://gstreamer.freedesktop.org/"
license="GPL LGPL"
@@ -34,4 +34,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
}
-md5sums="d29669dd79276c5cd94e1613c03cd9ab gst-plugins-base-0.10.25.tar.bz2"
+md5sums="d07e251152cccbaa81807c14cf0fd8c0 gst-plugins-base-0.10.29.tar.bz2"
diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD
index ed2088ea..d493cc2a 100644
--- a/main/gst-plugins-good/APKBUILD
+++ b/main/gst-plugins-good/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-good
-pkgver=0.10.17
-pkgrel=2
+pkgver=0.10.22
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Good Plugins"
url="http://gstreamer.freedesktop.org/"
license="LGPL"
@@ -9,6 +9,7 @@ subpackages="$pkgname-dev"
depends=
makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev
libsoup-dev flac-dev libogg-dev taglib-dev jpeg-dev zlib-dev"
+replaces="gst-plugins-bad"
# might consider those:
#libavc1394
@@ -41,4 +42,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="833546cd2b8bbf86b8ed083b00897918 gst-plugins-good-0.10.17.tar.bz2"
+md5sums="4804aaa32044af9846914304991cc9d6 gst-plugins-good-0.10.22.tar.bz2"
diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD
index cb49433c..818b3ec9 100644
--- a/main/gst-plugins-ugly/APKBUILD
+++ b/main/gst-plugins-ugly/APKBUILD
@@ -1,13 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-ugly
-pkgver=0.10.13
-pkgrel=0
+pkgver=0.10.14
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
url="http://gstreamer.freedesktop.org/"
license="LGPL"
depends= #"gstreamer0.10-ugly>=0.10.11 libdvdread>=4.1.3 lame>=3.98.2 libmpeg2>=0.5.1 a52dec>=0.7.4 libid3tag>=0.15.1b libmad>=0.15.1b libsidplay>=1.36.59 libcdio>=0.81"
makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev
- libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev"
+ libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev
+ x264-dev"
source="http://gstreamer.freedesktop.org//src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2"
build() {
@@ -26,4 +27,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="1619365247ef9cd7da1cd890285bf87a gst-plugins-ugly-0.10.13.tar.bz2"
+md5sums="0bc0d27bcce88c73ef6c81e88624e686 gst-plugins-ugly-0.10.14.tar.bz2"
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index df825c01..ffcd46b7 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gstreamer
-pkgver=0.10.25
+pkgver=0.10.29
pkgrel=0
pkgdesc="GStreamer Multimedia Framework"
url="http://gstreamer.freedesktop.org/"
@@ -26,4 +26,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
cd "$pkgdir"/usr/bin
}
-md5sums="88544e034a051baf472983791d233076 gstreamer-0.10.25.tar.bz2"
+md5sums="c92d6bce4fc65fa9d5a3ad35cdd1a466 gstreamer-0.10.29.tar.bz2"
diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD
index 9ce2d3cc..07fba13c 100644
--- a/main/gtk+/APKBUILD
+++ b/main/gtk+/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+
-pkgver=2.20.0
-pkgrel=0
+pkgver=2.20.1
+pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
url="http://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -34,7 +34,7 @@ makedepends="pkgconfig
zlib-dev"
source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2"
-depends_dev="atk-dev pango-dev cairo-dev glib-dev"
+depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool"
build() {
cd "$srcdir"/gtk+-$pkgver
./configure --prefix=/usr \
@@ -57,4 +57,4 @@ dev() {
mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/
}
-md5sums="5517f78b1eb9b1eb60bd48a0152d09e6 gtk+-2.20.0.tar.bz2"
+md5sums="53e6f3a93bd22934878fc4a4a34c68aa gtk+-2.20.1.tar.bz2"
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index 9c86f49c..7b804017 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-doc
-pkgver=1.13
+pkgver=1.14
pkgrel=0
pkgdesc="Documentation tool for public library API"
url="http://www.gtk.org/gtk-doc/"
license="GPL FDL"
depends="docbook-xsl gnome-doc-utils perl pkgconfig"
-makedepends="rarian-dev"
+makedepends="rarian-dev py-libxml2 gettext"
source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
@@ -20,4 +20,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="27940d6cd5c9dcda8fc003043d8c299a gtk-doc-1.13.tar.bz2"
+md5sums="7aa8a1262c70692ebbdf33395fddd5c4 gtk-doc-1.14.tar.bz2"
diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD
index 5e03a8c9..a321b867 100644
--- a/main/gtk-vnc/APKBUILD
+++ b/main/gtk-vnc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-vnc
pkgver=0.3.10
-pkgrel=1
+pkgrel=2
pkgdesc="A VNC viewer widget for GTK"
url="http://live.gnome.org/gtk-vnc"
license="LGPL"
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index d83f314e..888c79f3 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-xfce-engine
pkgver=2.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="A port of Xfce engine to GTK+-2.0"
url="http://www.xfce.org/"
license="GPL-2"
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 2a7609e0..8850b0f1 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -1,22 +1,25 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=guile
pkgver=1.8.7
-pkgrel=0
+pkgrel=2
pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
url="http://www.gnu.org/software/guile/"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
-makedepends="gmp-dev libtool ncurses-dev texinfo"
+makedepends="gmp5-dev libtool ncurses-dev texinfo"
depends=
install=
source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
--disable-error-on-warning || return 1
make LDFLAGS+="-lpthread" || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index e6c6c316..1d3510ac 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gzip
pkgver=1.4
-pkgrel=0
+pkgrel=1
pkgdesc="A popular data compression program"
subpackages="$pkgname-doc"
url="http://www.gnu.org/software/gzip/"
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 2c4e08e4..9e86e354 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -1,20 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=haserl
pkgver=0.9.25
-pkgrel=1
+pkgrel=2
pkgdesc="Html And Shell Embedded Report Language"
url="http://haserl.sourceforge.net/"
license="GPL-2"
-depends="lua uclibc"
+depends=
makedepends="lua-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
subpackages="$pkgname-doc"
build() {
cd "$srcdir/$pkgname-$pkgver"
-
./configure --prefix=/usr --with-lua || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
chmod 4111 "$pkgdir"/usr/bin/haserl
}
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index e98d9cf0..cb867c72 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
pkgname=heimdal
pkgver=1.3.1
-pkgrel=4
+pkgrel=5
pkgdesc="An implementation of Kerberos 5"
url="http://www.h5l.org/"
license="BSD"
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index c08847fd..915792b2 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hostapd
pkgver=0.6.10
-pkgrel=0
+pkgrel=2
pkgdesc="daemon for wireless software access points"
url="http://hostap.epitest.fi/hostapd/"
license="custom"
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index cb62c3a5..7d27031c 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:Carlo Landmeter
pkgname=htop
pkgver=0.8.3
-pkgrel=0
+pkgrel=1
pkgdesc="An interactive process viewer for Linux"
url="http://htop.sourceforge.net"
license='GPL'
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index 6883855a..efd3476c 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -1,23 +1,25 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hunspell
-pkgver=1.2.8
+pkgver=1.2.11
pkgrel=0
pkgdesc="Spell checker and morphological analyzer library and program"
url="http://hunspell.sourceforge.net/"
license="GPL LGPL MPL"
subpackages="$pkgname-dev $pkgname-doc"
-depends="libgcc uclibc++"
-makedepends="uclibc++-dev"
+depends=
+makedepends=
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
build ()
{
cd "$srcdir/hunspell-$pkgver"
- export CXX="${CXX_UC:-g++-uc}"
-
./configure --prefix=/usr --disable-static || return 1
make || return 1
- make DESTDIR="$pkgdir" install || return 1
+}
+
+package() {
+ cd "$srcdir/hunspell-$pkgver"
+ make -j1 DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/share/locale/locale.alias
}
-md5sums="1177af54a09e320d2c24015f29c3a93e hunspell-1.2.8.tar.gz"
+md5sums="8f57cdc4db091d69e1f682ed4d8ab282 hunspell-1.2.11.tar.gz"
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 42450d46..06a868b9 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=hylafax
pkgver=4.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="Sends and receives faxes"
url="http://www.hylafax.org/"
license="custom"
diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD
index baf9fa10..d41cb8db 100644
--- a/main/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
pkgname=hypermail
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Mail Archiver"
url="http://www.hypermail-project.org"
license="GPL"
diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index 7393e754..786c0799 100644
--- a/main/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=iaxmodem
pkgver=1.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
url="http://iaxmodem.sourceforge.net/"
license="GPL"
diff --git a/main/iceauth/APKBUILD b/main/iceauth/APKBUILD
index 30da7ad0..eed42250 100644
--- a/main/iceauth/APKBUILD
+++ b/main/iceauth/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iceauth
pkgver=1.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org ICE authority file utility"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index f37e7664..df9de54b 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=icu
-pkgver=4.4
+pkgver=4.4.1
_ver=4_2_1
pkgrel=0
pkgdesc="International Components for Unicode library"
url="http://www.icu-project.org/"
license="custom:icu"
subpackages="$pkgname-dev $pkgname-doc"
-depends=""
-makedepends="uclibc++-dev"
+depends=
+makedepends=
source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz"
_builddir="$srcdir"/icu/source
build() {
cd "$_builddir"
- export CXX=g++-uc
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man
diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD
index db210d49..ea750d2c 100644
--- a/main/iftop/APKBUILD
+++ b/main/iftop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iftop
pkgver=0.17
-pkgrel=0
+pkgrel=1
pkgdesc="iftop does for network usage what top(1) does for CPU usage"
url="http://www.ex-parrot.com/~pdw/iftop/"
license="GPL"
diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD
index 2ec2c018..3bb9be97 100644
--- a/main/igmpproxy/APKBUILD
+++ b/main/igmpproxy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=igmpproxy
pkgver=0.1
-pkgrel=0
+pkgrel=1
pkgdesc="a simple dynamic Multicast Routing Daemon using only IGMP signalling"
url="http://sourceforge.net/projects/igmpproxy/"
license="GPL"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 982416a9..60ecebbe 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imagemagick
-pkgver=6.6.0.10
+pkgver=6.6.2.0
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="A collection of tools and libraries for many image formats"
@@ -47,4 +47,4 @@ dev() {
"$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/
}
-md5sums="6aa19d1b08a0dfee5c78de864a8176e8 ImageMagick-6.6.0-10.tar.gz"
+md5sums="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz"
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index f7c788c2..547cf396 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,7 +5,7 @@
# build it shared
pkgname=imap
pkgver=2007e
-pkgrel=3
+pkgrel=5
pkgdesc="An IMAP/POP server"
url="http://www.washington.edu/imap"
license="APACHE"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index ff9944a9..fcd4e38a 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,23 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
-pkgver=1.4.2
-pkgrel=4
+pkgver=1.4.4
+pkgrel=0
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
license="BSD"
subpackages="$pkgname-dev $pkgname-doc"
depends=
makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev
- libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev"
+ libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev util-linux-ng-dev"
source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
- bufferoverflow.patch
- libpng14.patch"
+ "
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -Np0 -i "$srcdir"/bufferoverflow.patch || return 1
- patch -Np1 -i "$srcdir"/libpng14.patch || return 1
}
build() {
@@ -36,6 +33,4 @@ package() {
make DESTDIR=$pkgdir install || return 1
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
-md5sums="9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2
-76def1fe0ac2ac1686ff24d29979606f bufferoverflow.patch
-68f671641e298ef7eead0aded4087c53 libpng14.patch"
+md5sums="b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2"
diff --git a/main/imlib2/bufferoverflow.patch b/main/imlib2/bufferoverflow.patch
deleted file mode 100644
index 397b43fb..00000000
--- a/main/imlib2/bufferoverflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c.new
-@@ -246,8 +246,8 @@
- return 0;
- }
- ptr = im->data;
-- end = ptr + (sizeof(DATA32) * w * h);
- pixels = w * h;
-+ end = ptr + pixels;
- }
- else
- {
-
diff --git a/main/imlib2/libpng14.patch b/main/imlib2/libpng14.patch
deleted file mode 100644
index 04092284..00000000
--- a/main/imlib2/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c
---- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c 2010-01-19 03:37:21.000000000 -0500
-+++ imlib2-1.4.2/src/modules/loaders/loader_png.c 2010-01-19 03:38:51.000000000 -0500
-@@ -38,7 +38,7 @@
-
- /* if we haven't read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index c9951eb8..d133c905 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iperf
pkgver=2.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="tool to measure IP bandwidth using UDP or TCP"
url="http://iperf.sourceforge.net/"
license="GPL"
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index c031ed9c..6ca29991 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iproute2
-pkgver=2.6.31
-_realver=2.6.31
-pkgrel=0
+pkgver=2.6.33
+_realver=2.6.33
+pkgrel=1
pkgdesc="IP Routing Utilities"
url="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL2"
@@ -31,4 +31,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-md5sums="230f35282a95451622f3e8394f9cd80a iproute2-2.6.31.tar.bz2"
+md5sums="b371fca3fcb5e436e69a7c2111d84a3c iproute2-2.6.33.tar.bz2"
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index a3da4fc1..4d8ef0d0 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -2,7 +2,7 @@
pkgname=ipsec-tools
pkgver=0.8_alpha20090903
_myver=0.8-alpha20090903
-pkgrel=6
+pkgrel=8
pkgdesc="User-space IPsec tools for various IPsec implementations"
url="http://ipsec-tools.sourceforge.net/"
license="BSD"
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 09c5ffb3..836131dd 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -3,7 +3,7 @@
pkgname=iptables
pkgver=1.4.7
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
url="http://www.iptables.org/"
license=GPL-2
diff --git a/main/iptraf/APKBUILD b/main/iptraf/APKBUILD
index e8f0c496..152bbe45 100644
--- a/main/iptraf/APKBUILD
+++ b/main/iptraf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=iptraf
pkgver=3.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="IP Network Monitoring Software"
url="http://iptraf.seoul.org"
license="GPL"
diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD
index 75cf4c5b..b5d7e25d 100644
--- a/main/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iputils
pkgver=20100214
-pkgrel=0
+pkgrel=1
pkgdesc="IP Configuration Utilities (and Ping)"
url="http://www.linuxfoundation.org/en/Net:Iputils"
license="GPL"
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD
index 2ff651e8..bcb44899 100644
--- a/main/ircii/APKBUILD
+++ b/main/ircii/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ircii
pkgver=20060725
-pkgrel=0
+pkgrel=1
pkgdesc="ircII is an IRC and ICB client that runs under most UNIX platforms."
url="http://www.eterna.com.au/ircii/"
license="GPL-2"
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index e5e324c8..59cbdb33 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,7 +1,6 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=irssi
-pkgver=0.8.14
-#_pkgver=0.8.14
+pkgver=0.8.15
pkgrel=1
pkgdesc="A modular textUI IRC client with IPv6 support"
url="http://irssi.org/"
@@ -11,8 +10,10 @@ makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
source="http://irssi.org/files/irssi-${pkgver}.tar.bz2"
subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
+_builddir="$srcdir/$pkgname-$pkgver"
+
build() {
- cd "$srcdir/$pkgname-${pkgver}"
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -22,13 +23,24 @@ build() {
make DESTDIR="$pkgdir" install
}
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install
+}
+
perl() {
depends="$pkgname perl"
+ pkgdesc="Irssi perl support and scripts"
mkdir -p "$subpkgdir"/usr/share/irssi
mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
mkdir -p "$subpkgdir"/usr/lib/irssi
mv "$pkgdir"/usr/lib/irssi/modules "$subpkgdir"/usr/lib/irssi/
mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
+ #need write permission when stripping
+ chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/TextUI/TextUI.so
+ chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irssi.so
+ chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irc/Irc.so
+ chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/UI/UI.so
}
-md5sums="00efe7638dd596d5930dfa2aeae87b3a irssi-0.8.14.tar.bz2"
+md5sums="1dcb3f511b88df94b0c996f36668c7da irssi-0.8.15.tar.bz2"
diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD
index 67394407..a53e6286 100644
--- a/main/iscsitarget/APKBUILD
+++ b/main/iscsitarget/APKBUILD
@@ -2,7 +2,7 @@
pkgname=iscsitarget
pkgver=1.4.19
-pkgrel=0
+pkgrel=2
pkgdesc="Open Source iSCSI target with professional features - userspace utils"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
index 9317a184..d74cbd43 100644
--- a/main/jasper/APKBUILD
+++ b/main/jasper/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jasper
pkgver=1.900.1
-pkgrel=0
+pkgrel=1
pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
url="http://www.ece.uvic.ca/~mdadams/jasper/"
license="custom:JasPer2.0"
diff --git a/main/jpeg/APKBUILD b/main/jpeg/APKBUILD
index 9292022a..e3bd30d1 100644
--- a/main/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jpeg
pkgver=8
-pkgrel=0
+pkgrel=1
pkgdesc="JPEG image tools"
url="http://www.ijg.org/"
license="AS-IS"
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 2b64a76e..84355bb1 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kamailio
-pkgver=1.5.3
-pkgrel=8
+pkgver=1.5.4
+pkgrel=1
pkgdesc="Open Source SIP Server"
url="http://www.kamailio.org/"
pkgusers="kamailio"
@@ -126,7 +126,7 @@ unixodbc() {
_mv_mod db_unixodbc
}
-md5sums="17eeea5cdc2fdd28b2f9a1bad6598de2 kamailio-1.5.3-notls_src.tar.gz
+md5sums="127233aff2f20566b54f84555602132d kamailio-1.5.4-notls_src.tar.gz
eb665248ee39cf755a247286affc5cbb kamailio.cfg
8ac6c260f090aea0ca344f18f9a2a904 kamailio.initd
3259980a45d9ad3fc6fca83414021d07 kamailio-backslash.patch"
diff --git a/main/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
index d8cc04fd..9653627d 100644
--- a/main/ksymoops/APKBUILD
+++ b/main/ksymoops/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ksymoops
pkgver=2.4.11
-pkgrel=0
+pkgrel=1
pkgdesc="A Linux kernel Oops file troubleshooting tool"
url="ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4"
license="GPL-2"
-depends="uclibc"
+depends=""
makedepends="!gettext !libiconv"
source="ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-$pkgver.tar.bz2
$pkgname-2.4.11-build.patch
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 83fe97d1..9ebd4ed6 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lame
-pkgver=3.98.3
+pkgver=3.98.4
_ver=398-2
pkgrel=0
pkgdesc="An MP3 encoder and graphical frame analyzer"
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index 188a7b91..7508a25f 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=less
pkgver=436
-pkgrel=0
+pkgrel=1
pkgdesc="File pager"
url="http://www.greenwoodsoftware.com/less/"
license="GPL"
-depends="uclibc ncurses"
+depends=
makedepends="ncurses-dev"
install="$pkgname.post-deinstall"
subpackages="$pkgname-doc"
@@ -15,12 +15,15 @@ source="http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz
build() {
cd "$srcdir/$pkgname-$pkgver"
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index ffd61ae0..714b7cf2 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=lftp
-pkgver=4.0.5
-pkgrel=0
+pkgver=4.0.7
+pkgrel=1
pkgdesc="LFTP is sophisticated ftp/http client"
url="http://lftp.yar.ru/"
license="GPL"
@@ -11,8 +11,10 @@ makedepends="openssl-dev readline-dev ncurses-dev gettext-dev"
subpackages="$pkgname-doc"
source="http://ftp.yars.free.net/pub/source/lftp/lftp-${pkgver}.tar.bz2"
+_builddir="$srcdir/$pkgname-$pkgver"
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc/lftp \
@@ -25,8 +27,8 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
make -j1 DESTDIR="$pkgdir" install
}
-md5sums="5400cad5f91e131ac2ded7c24aea594c lftp-4.0.5.tar.bz2"
+md5sums="a40e4518fc477c82ffcc5b04d9ff64ff lftp-4.0.7.tar.bz2"
diff --git a/main/lha/APKBUILD b/main/lha/APKBUILD
index 705e51e0..5fc94b35 100644
--- a/main/lha/APKBUILD
+++ b/main/lha/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=lha
pkgver=1.14i
-pkgrel=0
+pkgrel=1
pkgdesc="Compression and archive utility for LH-7 format archives"
url="http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/"
license="custom"
subpackages="$pkgname-doc"
-depends="uclibc"
+depends=""
makedepends=""
install=
source="http://osdn.dl.sourceforge.jp/lha/22231/$pkgname-$pkgver-ac20050924p1.tar.gz"
diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD
index a82ba465..9c179172 100644
--- a/main/libao/APKBUILD
+++ b/main/libao/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libao
-pkgver=0.8.8
-pkgrel=1
+pkgver=1.0.0
+pkgrel=0
pkgdesc="Cross-platform audio output library and plugins"
url="http://www.xiph.org/ao"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc alsa-lib"
+depends=
makedepends="alsa-lib-dev"
source="http://downloads.xiph.org/releases/ao/$pkgname-$pkgver.tar.gz"
@@ -17,6 +17,10 @@ build () {
--disable-esd \
--disable-arts
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums="b92cba3cbcf1ee9bc221118a85d23dcd libao-0.8.8.tar.gz"
+md5sums="08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz"
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index a9cf7776..0203cd51 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libart-lgpl
pkgver=2.3.21
-pkgrel=0
+pkgrel=1
pkgdesc="A library for high-performance 2D graphics"
url="http://www.levien.com/libart/"
license="LGPL"
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 2b2498c4..ee8a0d97 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -1,18 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libassuan
-pkgver=1.0.5
+pkgver=2.0.0
pkgrel=0
pkgdesc="Libassuan is the IPC library used by some GnuPG related software"
url="ftp://ftp.gnupg.org/gcrypt/libgcrypt"
license="GPL"
-makedepends="pth-dev"
-subpackages="$pkgname-doc"
+depends=
+makedepends="pth-dev libgpg-error-dev"
+subpackages="$pkgname-dev $pkgname-doc"
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
}
-md5sums="c2db0974fcce4401f48f3fa41c4edc5a libassuan-1.0.5.tar.bz2"
+md5sums="59bc0ae7194c412d7a522029005684b2 libassuan-2.0.0.tar.bz2"
diff --git a/main/uclibc/0001-ldd-segfault-fix.patch b/main/libc0.9.32/0001-ldd-segfault-fix.patch
index 4384fa54..4384fa54 100644
--- a/main/uclibc/0001-ldd-segfault-fix.patch
+++ b/main/libc0.9.32/0001-ldd-segfault-fix.patch
diff --git a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
new file mode 100644
index 00000000..2898a0d0
--- /dev/null
+++ b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
@@ -0,0 +1,125 @@
+From 67403d1d692c3b8022b0adca127a2c14ef8e3237 Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Fri, 7 May 2010 11:28:27 +0300
+Subject: [PATCH 1/2] static build: fix internal locking weaks to get pulled in always
+
+Linker is smart and does not pull in weaks.os, ever. This happens
+because that compilation unit does not get strong references and
+ld eliminates dead code. We really need the weaks for static build
+in a compilation unit that is always there, otherwise it won't work.
+
+Signed-off-by: Timo Teras <timo.teras@iki.fi>
+---
+ libc/misc/internals/__uClibc_main.c | 35 ++++++++++++++++++++++++++++++
+ libc/misc/pthread/Makefile.in | 1 -
+ libc/misc/pthread/weaks.c | 40 -----------------------------------
+ 3 files changed, 35 insertions(+), 41 deletions(-)
+ delete mode 100644 libc/misc/pthread/weaks.c
+
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index f7e45c6..f9e1244 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -68,6 +68,41 @@ uintptr_t __guard attribute_relro;
+ */
+
+ void internal_function _dl_aux_init (ElfW(auxv_t) *av);
++
++/*
++ * uClibc internal locking requires that we have weak aliases
++ * for dummy functions in case libpthread.a is not linked in.
++ * This needs to be in compilation unit that is pulled always
++ * in or linker will disregard these weaks.
++ */
++
++static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; }
++weak_alias (__pthread_return_0, __pthread_mutex_lock)
++weak_alias (__pthread_return_0, __pthread_mutex_trylock)
++weak_alias (__pthread_return_0, __pthread_mutex_unlock)
++
++int weak_function
++__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
++{
++ return 0;
++}
++
++void weak_function
++_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer,
++ void (*__routine) (void *), void *__arg)
++{
++ __buffer->__routine = __routine;
++ __buffer->__arg = __arg;
++}
++
++void weak_function
++_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer,
++ int __execute)
++{
++ if (__execute)
++ __buffer->__routine(__buffer->__arg);
++}
++
+ #endif /* !SHARED */
+
+ /*
+diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in
+index 69cdf10..2f436ac 100644
+--- a/libc/misc/pthread/Makefile.in
++++ b/libc/misc/pthread/Makefile.in
+@@ -11,7 +11,6 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread
+ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
+
+ libc-shared-$(UCLIBC_HAS_TLS) += $(MISC_PTHREAD_OUT)/tsd.os
+-libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
+
+ objclean-y += CLEAN_libc/misc/pthread
+
+diff --git a/libc/misc/pthread/weaks.c b/libc/misc/pthread/weaks.c
+deleted file mode 100644
+index fb1d85f..0000000
+--- a/libc/misc/pthread/weaks.c
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/* The weak pthread functions for Linux.
+- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+-
+- The GNU C Library is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Library General Public License as
+- published by the Free Software Foundation; either version 2 of the
+- License, or (at your option) any later version.
+-
+- The GNU C Library is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with the GNU C Library; see the file COPYING.LIB. If not,
+- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
+-
+-#include <libc-internal.h>
+-
+-/* Weaks for internal library use only.
+- *
+- * We need to define weaks here to cover all the pthread functions that
+- * libc itself will use so that we aren't forced to link libc against
+- * libpthread. This file is only used in libc.a and since we have
+- * weaks here, they will be automatically overridden by libpthread.a
+- * if it gets linked in.
+- */
+-
+-static int __pthread_return_0 (void) { return 0; }
+-static void __pthread_return_void (void) { return; }
+-
+-weak_alias (__pthread_return_0, __pthread_mutex_init)
+-weak_alias (__pthread_return_0, __pthread_mutex_lock)
+-weak_alias (__pthread_return_0, __pthread_mutex_trylock)
+-weak_alias (__pthread_return_0, __pthread_mutex_unlock)
+-weak_alias (__pthread_return_void, _pthread_cleanup_push_defer)
+-weak_alias (__pthread_return_void, _pthread_cleanup_pop_restore)
+-
+--
+1.6.3.3
+
diff --git a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
new file mode 100644
index 00000000..562d648a
--- /dev/null
+++ b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
@@ -0,0 +1,69 @@
+From bfe9a589a402d4b6265e32b1b5ca0942efdcff3b Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Fri, 7 May 2010 11:30:04 +0300
+Subject: [PATCH 2/2] resolv: various memory corruption and off by one fixes
+
+Fixes resolution of names with AAAA entries and gethostbyaddr issues.
+
+Signed-off-by: Timo Teras <timo.teras@iki.fi>
+---
+ libc/inet/resolv.c | 12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index 84289a6..320aec4 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -689,7 +689,7 @@ int attribute_hidden __decode_dotted(const unsigned char *packet,
+
+ if (used + b + 1 >= dest_len)
+ return -1;
+- if (offset + b + 1 >= packet_len)
++ if (offset + b >= packet_len)
+ return -1;
+ memcpy(dest + used, packet + offset, b);
+ offset += b;
+@@ -2417,7 +2417,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
+ /* Layout in buf:
+ * char *alias[ALIAS_DIM];
+ * struct in[6]_addr* addr_list[2];
+- * struct in[6]_addr* in;
++ * struct in[6]_addr in;
+ * char scratch_buffer[256+];
+ */
+ #define in6 ((struct in6_addr *)in)
+@@ -2431,9 +2431,13 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
+ #ifndef __UCLIBC_HAS_IPV6__
+ buf += sizeof(*in);
+ buflen -= sizeof(*in);
++ if (addrlen > sizeof(*in))
++ return ERANGE;
+ #else
+ buf += sizeof(*in6);
+ buflen -= sizeof(*in6);
++ if (addrlen > sizeof(*in6))
++ return ERANGE;
+ #endif
+ if ((ssize_t)buflen < 256)
+ return ERANGE;
+@@ -2441,7 +2445,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
+ alias[1] = NULL;
+ addr_list[0] = in;
+ addr_list[1] = NULL;
+- memcpy(&in, addr, addrlen);
++ memcpy(in, addr, addrlen);
+
+ if (0) /* nothing */;
+ #ifdef __UCLIBC_HAS_IPV4__
+@@ -2456,7 +2460,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
+ char *dst = buf;
+ unsigned char *tp = (unsigned char *)addr + addrlen - 1;
+ do {
+- dst += sprintf(dst, "%x.%x.", tp[i] & 0xf, tp[i] >> 4);
++ dst += sprintf(dst, "%x.%x.", tp[0] & 0xf, tp[0] >> 4);
+ tp--;
+ } while (tp >= (unsigned char *)addr);
+ strcpy(dst, "ip6.arpa");
+--
+1.6.3.3
+
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
new file mode 100644
index 00000000..0b7751f3
--- /dev/null
+++ b/main/libc0.9.32/APKBUILD
@@ -0,0 +1,106 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_abiver=0.9.32
+pkgname=libc$_abiver
+_gitver=100507
+pkgver=${_abiver}_alpha0_git$_gitver
+pkgrel=3
+pkgdesc="C library for developing embedded Linux systems"
+url=http://uclibc.org
+license="LGPL-2"
+
+subpackages="uclibc-dev:dev uclibc-utils:utils"
+depends_dev="linux-headers=>2.6.32"
+#options="!strip"
+replaces=uclibc
+
+_snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2"
+_snapfile="$pkgname-$pkgver.tar.bz2"
+source="http://build.alpinelinux.org:8010/distfiles/$_snapfile
+ compat-stack-guard.patch
+ 0001-ldd-segfault-fix.patch
+ 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
+ 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
+ uclibc-libm-pic.patch
+ uclibc-resolv-tls.patch
+ uclibcconfig.x86
+ uclibcconfig.i486
+ "
+
+_config="$srcdir"/uclibcconfig.${ARCH:-x86}
+_builddir="$srcdir"/master
+
+snapshot() {
+ local _date=$(date +%y%m%d%H%M)
+ pkgver=${_abiver}_alpha0_git$_gitver
+
+ rm -f "$SRCDEST"/$_snapfile
+ wget -O "$SRCDEST"/$_snapfile $_snapurl
+ pkgrel=0
+ sed -i -e "s/^_gitver=.*/_gitver=$(date +%y%m%d)/" \
+ -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \
+ APKBUILD
+ checksum
+}
+
+prepare() {
+ local i
+ cd "$_builddir"
+ # patches goes here
+ for i in ../*.patch ../*.diff; do
+ [ -r "$i" ] || continue
+ msg "Applying $i..."
+ patch -p1 < $i || return 1
+ done
+ # set abi version and remove unsupported warnings c flag
+ sed -i -e "s/^ABI_VERSION.*/ABI_VERSION := $_abiver/" \
+ -e "s/-Wold-style-declaration//g" \
+ Rules.mak
+}
+
+build() {
+ local _kh=
+ cd "$_builddir"
+ if [ -n "$SYSROOT" ]; then
+ _kh=KERNEL_HEADERS="$SYSROOT/include"
+ fi
+ cp "$_config" .config
+ make silentoldconfig
+ make -j1 pregen KERNEL_HEADERS="$SYSROOT"/usr/include \
+ CROSS="$CROSS" || return 1
+ make all KERNEL_HEADERS="$SYSROOT/usr/include" CROSS="$CROSS" || return 1
+ make utils CROSS="$CROSS" || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" KERNEL_HEADERS="$SYSROOT/usr/include" \
+ CROSS="$CROSS" install install_utils
+ install -Dm755 extra/scripts/getent "$pkgdir"/usr/bin/getent
+ # provided by linux-headers
+ rm -f "$pkgdir"/usr/include/scsi/scsi.h
+}
+
+dev() {
+ default_dev
+ replaces=uclibc
+ mkdir "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/
+}
+
+utils() {
+ pkgdesc="uClibc utility programs"
+ replaces=uclibc
+ mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin
+ mv "$pkgdir"/sbin/* "$subpkgdir"/sbin/
+ mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
+}
+
+md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.tar.bz2
+4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch
+4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch
+826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
+0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
+2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch
+d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch
+e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86
+e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486"
diff --git a/main/libc0.9.32/compat-stack-guard.patch b/main/libc0.9.32/compat-stack-guard.patch
new file mode 100644
index 00000000..71d78bac
--- /dev/null
+++ b/main/libc0.9.32/compat-stack-guard.patch
@@ -0,0 +1,51 @@
+diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
+index 125cf96..bb47952 100644
+--- a/ldso/ldso/ldso.c
++++ b/ldso/ldso/ldso.c
+@@ -101,10 +101,10 @@ extern void _start(void);
+ #ifdef __UCLIBC_HAS_SSP__
+ # include <dl-osinfo.h>
+ uintptr_t stack_chk_guard;
++uintptr_t __stack_chk_guard attribute_relro;
+ # ifndef THREAD_SET_STACK_GUARD
+ /* Only exported for architectures that don't store the stack guard canary
+ * in local thread area. */
+-uintptr_t __stack_chk_guard attribute_relro;
+ # ifdef __UCLIBC_HAS_SSP_COMPAT__
+ strong_alias(__stack_chk_guard,__guard)
+ # endif
+@@ -935,13 +935,12 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+ #ifdef __UCLIBC_HAS_SSP__
+ /* Set up the stack checker's canary. */
+ stack_chk_guard = _dl_setup_stack_chk_guard ();
++ __stack_chk_guard = stack_chk_guard;
+ # ifdef THREAD_SET_STACK_GUARD
+ THREAD_SET_STACK_GUARD (stack_chk_guard);
+ # ifdef __UCLIBC_HAS_SSP_COMPAT__
+ __guard = stack_chk_guard;
+ # endif
+-# else
+- __stack_chk_guard = stack_chk_guard;
+ # endif
+ #endif
+
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index f7e45c6..b527068 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -43,13 +43,13 @@ void *__libc_stack_end = NULL;
+
+ # ifdef __UCLIBC_HAS_SSP__
+ # include <dl-osinfo.h>
++/* for gcc-4.1 non-TLS */
++uintptr_t __stack_chk_guard attribute_relro;
+ # ifndef THREAD_SET_STACK_GUARD
+ /* Only exported for architectures that don't store the stack guard canary
+ * in thread local area. */
+ # include <stdint.h>
+ uintptr_t stack_chk_guard;
+-/* for gcc-4.1 non-TLS */
+-uintptr_t __stack_chk_guard attribute_relro;
+ /* for gcc-3.x + Etoh ssp */
+ # ifdef __UCLIBC_HAS_SSP_COMPAT__
+ # ifdef __HAVE_SHARED__
diff --git a/main/libc0.9.32/uclibc-libm-pic.patch b/main/libc0.9.32/uclibc-libm-pic.patch
new file mode 100644
index 00000000..ad87b78b
--- /dev/null
+++ b/main/libc0.9.32/uclibc-libm-pic.patch
@@ -0,0 +1,67 @@
+GCC can emit prologue/epilogue code for the functions in various
+different cases:
+ - frame pointers
+ - PIC build (to load ebx for indirect calls/jumps)
+ - forced stack smashing protection
+
+If we used jump in such cases, we'd corrupt the call stack and
+crash.
+
+Signed-off-by: Timo Teräs <timo.teras at iki.fi>
+---
+ libm/ldouble_wrappers.c | 12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
+index 7d5af90..5b424dc 100644
+--- a/libm/ldouble_wrappers.c
++++ b/libm/ldouble_wrappers.c
+@@ -60,7 +60,9 @@ long long func##l(long double x) \
+ * The return value is returned in st(0) per ABI in both cases (returning
+ * a long double or returning a double). So we can simply jump to func.
+ * Using __GI_func in jump to make optimized intra-library jump.
+- * gcc will still generate a useless "ret" after asm. Oh well...
++ *
++ * We do need to use call (instead of tail jump) as gcc can create
++ * stack frame, and push/modify/pop ebx during PIC build.
+ */
+ # define WRAPPER1(func) \
+ long double func##l(long double x) \
+@@ -69,7 +71,7 @@ long double func##l(long double x) \
+ __asm ( \
+ " fldt %1\n" \
+ " fstpl %1\n" \
+- " jmp " __stringify(__GI_##func) "\n" \
++ " call " __stringify(__GI_##func) "\n" \
+ : "=t" (st_top) \
+ : "m" (x) \
+ ); \
+@@ -82,7 +84,7 @@ int func##l(long double x) \
+ __asm ( \
+ " fldt %1\n" \
+ " fstpl %1\n" \
+- " jmp " __stringify(__GI_##func) "\n" \
++ " call " __stringify(__GI_##func) "\n" \
+ : "=a" (ret) \
+ : "m" (x) \
+ ); \
+@@ -95,7 +97,7 @@ long func##l(long double x) \
+ __asm ( \
+ " fldt %1\n" \
+ " fstpl %1\n" \
+- " jmp " __stringify(__GI_##func) "\n" \
++ " call " __stringify(__GI_##func) "\n" \
+ : "=a" (ret) \
+ : "m" (x) \
+ ); \
+@@ -108,7 +110,7 @@ long long func##l(long double x) \
+ __asm ( \
+ " fldt %1\n" \
+ " fstpl %1\n" \
+- " jmp " __stringify(__GI_##func) "\n" \
++ " call " __stringify(__GI_##func) "\n" \
+ : "=A" (ret) \
+ : "m" (x) \
+ ); \
+--
+1.7.0.4
diff --git a/main/libc0.9.32/uclibc-resolv-tls.patch b/main/libc0.9.32/uclibc-resolv-tls.patch
new file mode 100644
index 00000000..45a22851
--- /dev/null
+++ b/main/libc0.9.32/uclibc-resolv-tls.patch
@@ -0,0 +1,15 @@
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index 320aec4..f8066d2 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -2916,8 +2916,8 @@ static void res_sync_func(void)
+ __nameserver[n].sa4 = rp->nsaddr_list[n]; /* struct copy */
+ #endif
+ }
+- __resolv_timeout = rp->retrans;
+- __resolv_attempts = rp->retry;
++ __resolv_timeout = rp->retrans ?: RES_TIMEOUT;
++ __resolv_attempts = rp->retry ?: RES_DFLRETRY;
+ /* Extend and comment what program is known
+ * to use which _res.XXX member(s).
+
diff --git a/main/libc0.9.32/uclibcconfig.i486 b/main/libc0.9.32/uclibcconfig.i486
new file mode 120000
index 00000000..6ab0f7e5
--- /dev/null
+++ b/main/libc0.9.32/uclibcconfig.i486
@@ -0,0 +1 @@
+uclibcconfig.x86 \ No newline at end of file
diff --git a/main/uclibc/uclibcconfig.x86 b/main/libc0.9.32/uclibcconfig.x86
index 78835525..1368b58e 100644
--- a/main/uclibc/uclibcconfig.x86
+++ b/main/libc0.9.32/uclibcconfig.x86
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.30.1
-# Mon Jun 15 09:42:10 2009
+# Version: 0.9.32-git
+# Fri May 7 11:46:52 2010
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -66,6 +66,7 @@ ARCH_USE_MMU=y
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
+DO_XSI_MATH=y
UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS="/usr/include"
@@ -82,17 +83,21 @@ HAVE_SHARED=y
FORCE_SHAREABLE_TEXT_SEGMENTS=y
LDSO_LDD_SUPPORT=y
LDSO_CACHE_SUPPORT=y
+LDSO_PRELOAD_ENV_SUPPORT=y
# LDSO_PRELOAD_FILE_SUPPORT is not set
LDSO_BASE_FILENAME="ld.so"
UCLIBC_STATIC_LDCONFIG=y
LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
+# LINUXTHREADS_OLD is not set
+# LINUXTHREADS_NEW is not set
+UCLIBC_HAS_THREADS_NATIVE=y
UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TLS=y
# PTHREADS_DEBUG_SUPPORT is not set
-# LINUXTHREADS_OLD is not set
-LINUXTHREADS_NEW=y
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
@@ -103,6 +108,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y
UCLIBC_SUSV3_LEGACY=y
UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_SUSV4_LEGACY=y
# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -111,11 +117,13 @@ UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
UNIX98PTY_ONLY=y
# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_LIBUTIL=y
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
UCLIBC_HAS_TZ_FILE_READ_MANY=y
UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
#
# Advanced Library Settings
@@ -152,6 +160,10 @@ UCLIBC_HAS_REENTRANT_RPC=y
UCLIBC_USE_NETLINK=y
UCLIBC_SUPPORT_AI_ADDRCONFIG=y
UCLIBC_HAS_BSD_RES_CLOSE=y
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_LIBRESOLV_STUB=y
+# UCLIBC_HAS_LIBNSL_STUB is not set
#
# String and Stdio Support
@@ -192,6 +204,7 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
UCLIBC_HAS_GNU_GETSUBOPT=y
#
@@ -202,6 +215,7 @@ UCLIBC_HAS_REGEX_OLD=y
UCLIBC_HAS_FNMATCH=y
# UCLIBC_HAS_FNMATCH_OLD is not set
UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_NFTW=y
UCLIBC_HAS_FTW=y
UCLIBC_HAS_GLOB=y
UCLIBC_HAS_GNU_GLOB=y
@@ -209,9 +223,10 @@ UCLIBC_HAS_GNU_GLOB=y
#
# Library Installation Options
#
-SHARED_LIB_LOADER_PREFIX="/lib"
RUNTIME_PREFIX="/"
DEVEL_PREFIX="/usr"
+MULTILIB_DIR="lib"
+# HARDWIRED_ABSPATH is not set
#
# Security options
@@ -224,7 +239,7 @@ UCLIBC_HAS_SSP_COMPAT=y
# SSP_QUICK_CANARY is not set
# PROPOLICE_BLOCK_ABRT is not set
PROPOLICE_BLOCK_SEGV=y
-UCLIBC_BUILD_SSP=y
+# UCLIBC_BUILD_SSP is not set
UCLIBC_BUILD_RELRO=y
UCLIBC_BUILD_NOW=y
UCLIBC_BUILD_NOEXECSTACK=y
@@ -235,12 +250,12 @@ UCLIBC_BUILD_NOEXECSTACK=y
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
-# DOSTRIP is not set
+DOSTRIP=y
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
+EXTRA_WARNINGS=y
# DOMULTI is not set
# UCLIBC_MJN3_ONLY is not set
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index 61b526cc..e379bee1 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap
pkgver=2.19
-pkgrel=0
+pkgrel=1
pkgdesc="POSIX 1003.1e capabilities"
license="GPL"
url="http://www.friedhoff.org/posixfilecaps.html"
diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD
index cd2d6e00..b566400a 100644
--- a/main/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libconfig
pkgver=1.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="a simple library for manipulating structured configuration files"
url="http://www.hyperrealm.com/libconfig/"
license='LGPL'
diff --git a/main/libcroco/APKBUILD b/main/libcroco/APKBUILD
index 47a28966..4c0e8ef4 100644
--- a/main/libcroco/APKBUILD
+++ b/main/libcroco/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcroco
pkgver=0.6.2
-pkgrel=0
+pkgrel=1
pkgdesc="GNOME CSS2 parsing and manipulation toolkit"
url="http://www.gnome.org"
license="LGPL"
diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD
index 8544bb90..881accbd 100644
--- a/main/libdnet/APKBUILD
+++ b/main/libdnet/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdnet
pkgver=1.12
+pkgrel=1
pkgdesc="A simplified, portable interface to several low-level networking routines"
url="http://code.google.com/p/libdnet/"
license="BSD"
@@ -22,6 +23,10 @@ build ()
--without-python
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
md5sums="9253ef6de1b5e28e9c9a62b882e44cc9 libdnet-1.12.tgz"
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index 3e265a00..9138bbf4 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdrm
pkgver=2.4.20
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
url="http://dri.freedesktop.org/"
license="custom"
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index bf490ed2..8356039e 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libetpan
-pkgver=0.58
-pkgrel=2
+pkgver=1.0
+pkgrel=0
_dbver=4.8
pkgdesc="a portable middleware for email access"
url="http://www.etpan.org/"
@@ -15,7 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
build ()
{
cd "$srcdir"/$pkgname-$pkgver
- sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1
+# sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1
./configure --prefix=/usr \
--disable-static
@@ -27,4 +27,4 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt
}
-md5sums="bf20b5c0548f06b94bc588afdf5b3436 libetpan-0.58.tar.gz"
+md5sums="5addc766141a0b1d29ee1ca4ba1b6808 libetpan-1.0.tar.gz"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index a90b9678..f7447798 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libevent
pkgver=1.4.13
-pkgrel=0
+pkgrel=1
pkgdesc="An event notification library"
url="http://www.monkey.org/~provos/libevent/"
license="GPL-2"
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
index ba829f8b..83546b1c 100644
--- a/main/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libexif
pkgver=0.6.19
-pkgrel=0
+pkgrel=1
pkgdesc="A library to parse an EXIF file and read the data from those tags"
url="http://sourceforge.net/projects/libexif"
license="LGPL"
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 3ef74150..39b3ba3a 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libffi
pkgver=3.0.9
-pkgrel=0
+pkgrel=1
pkgdesc="A portable, high level programming interface to various calling conventions."
url="http://sourceware.org/libffi"
license="MIT"
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index 7dac13ea..e7b1e30b 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libfontenc
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X11 font encoding library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 644c2696..9f8c2044 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgcrypt
pkgver=1.4.5
-pkgrel=0
+pkgrel=1
pkgdesc="general purpose crypto library based on the code used in GnuPG"
url="http://www.gnupg.org"
license="LGPL"
diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
index 3a4b079e..3b8f67e6 100644
--- a/main/libglade/APKBUILD
+++ b/main/libglade/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libglade
pkgver=2.6.4
-pkgrel=1
+pkgrel=2
pkgdesc="Allows you to load glade interface files in a program at runtime"
url="http://www.gnome.org"
license="LGPL"
diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 24cac436..2ae2c026 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgpg-error
pkgver=1.7
-pkgrel=0
+pkgrel=1
pkgdesc="Support library for libgcrypt"
url="http://www.gnupg.org"
license="LGPL"
-depends="uclibc"
+depends=""
subpackages="$pkgname-dev $pkgname-lisp"
source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
nocxx.patch
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index ae307f67..3f34d315 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgsf
-pkgver=1.14.16
-pkgrel=0
+pkgver=1.14.18
+pkgrel=1
pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
url="http://www.gnome.org/"
license="GPL LGPL"
@@ -10,7 +10,7 @@ depends=
makedepends="libxml2-dev glib-dev bzip2-dev intltool python zlib-dev"
source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.bz2"
-depends_dev="glib-dev libxml2-dev pkgconfig"
+depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig"
build() {
cd "$srcdir"/$pkgname-$pkgver
@@ -31,4 +31,4 @@ package() {
rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
}
-md5sums="8478d83fda0b6e57f36550c11a693ee1 libgsf-1.14.16.tar.bz2"
+md5sums="2c15d875b1931c40c7e7a2368f3ed948 libgsf-1.14.18.tar.bz2"
diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD
index 4cf8058d..5da1d877 100644
--- a/main/libice/APKBUILD
+++ b/main/libice/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libice
pkgver=1.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Inter-Client Exchange library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 6cd441ca..0ad6f627 100644
--- a/main/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=libiconv
pkgver=1.12
-pkgrel=0
+pkgrel=1
pkgdesc="GNU charset conversion library for libc which doesn't implement it"
url="http://www.gnu.org/software/libiconv"
license='LGPL'
-depends="uclibc"
+depends=""
source="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz"
subpackages="$pkgname-doc $pkgname-dev"
diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 9410e353..1bd9c956 100644
--- a/main/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=libid3tag
pkgver=0.15.1b
-pkgrel=0
+pkgrel=1
pkgdesc="id3 tagger for mp3"
url="http://www.underbit.com/products/mad/"
license="GPL"
diff --git a/main/libidn/APKBUILD b/main/libidn/APKBUILD
index cc4d7af2..b684e642 100644
--- a/main/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libidn
pkgver=1.16
-pkgrel=0
+pkgrel=1
pkgdesc="An encode and decode library for internationalized domain names"
url="http://www.gnu.org/software/libidn/"
license="GPL"
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index ae100b62..ed719a0e 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libksba
-pkgver=1.0.3
+pkgver=1.0.7
pkgrel=0
pkgdesc="Libksba is a CMS and X.509 access library"
url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
@@ -12,9 +12,12 @@ 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
}
-md5sums="91682491186d4ed43fff351aab2f5aad libksba-1.0.3.tar.bz2"
+md5sums="eebce521a90600369c33c5fa6b9bbbd8 libksba-1.0.7.tar.bz2"
diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD
index 72968faa..f48894ae 100644
--- a/main/libmad/APKBUILD
+++ b/main/libmad/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libmad
pkgver=0.15.1b
-pkgrel=0
+pkgrel=1
pkgdesc="A high-quality MPEG audio decoder"
url="http://www.underbit.com/products/mad/"
license="GPL"
diff --git a/main/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 905d880f..76b6948c 100644
--- a/main/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=libmcrypt
pkgver=2.5.8
-pkgrel=0
+pkgrel=1
pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms"
url="http://mcrypt.sourceforge.net/"
license="GPL"
-depends="uclibc"
+depends=""
makedepends="libtool uclibc++-dev"
install=
subpackages="$pkgname-doc $pkgname-dev"
diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD
index 4b439586..81f413e2 100644
--- a/main/libmpdclient/APKBUILD
+++ b/main/libmpdclient/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libmpdclient
pkgver=2.1
-pkgrel=0
+pkgrel=1
pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages"
url="http://mpd.wikia.com/wiki/Client:libmpdclient"
license="GPL2"
diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD
index 15704d0d..e933c835 100644
--- a/main/libmpeg2/APKBUILD
+++ b/main/libmpeg2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libmpeg2
pkgver=0.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams."
url="http://libmpeg2.sourceforge.net/"
license="GPL2"
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index 8d341b2e..558f827b 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Your Name <youremail@domain.com>
pkgname=libnet
pkgver=1.1.4
-pkgrel=0
+pkgrel=1
pkgdesc="A generic networking API that provides access to several protocols."
url="http://sourceforge.net/projects/libnet-dev/"
license="BSD"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 1262fe4b..af9dc280 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnetfilter_conntrack
pkgver=0.0.101
-pkgrel=0
+pkgrel=1
pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
license="GPL-2"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 69f887b3..cebfe70a 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnfnetlink
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="low-level library for netfilter related kernel/userspace communication"
url="http://www.netfilter.org/projects/libnfnetlink/"
license="GPL-2"
-depends="uclibc"
+depends=""
makedepends=""
subpackages="$pkgname-dev"
source="http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2"
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
index 9db755ae..b63fb044 100644
--- a/main/libnl/APKBUILD
+++ b/main/libnl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnl
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="Library for applications dealing with netlink sockets"
url="http://people.suug.ch/~tgr/libnl"
license="GPL"
diff --git a/main/libnotify/APKBUILD b/main/libnotify/APKBUILD
index 788d3b97..4d366af4 100644
--- a/main/libnotify/APKBUILD
+++ b/main/libnotify/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnotify
pkgver=0.4.5
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop notification library"
url="http://www.galago-project.org/"
license="LGPL"
diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD
index 13fc7688..5d5c3719 100644
--- a/main/libogg/APKBUILD
+++ b/main/libogg/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libogg
-pkgver=1.1.4
+pkgver=1.2.0
pkgrel=0
pkgdesc="Ogg bitstream and framing library"
url="http://xiph.org/ogg/"
@@ -17,9 +17,12 @@ build() {
./configure --prefix=/usr
make || return 1
- make -j1 DESTDIR="$pkgdir" install
+}
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -j1 DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz"
+md5sums="c95b73759acfc30712beef6ce4e88efa libogg-1.2.0.tar.gz"
diff --git a/main/liboil/APKBUILD b/main/liboil/APKBUILD
index 57cdaa0e..11a577a4 100644
--- a/main/liboil/APKBUILD
+++ b/main/liboil/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=liboil
pkgver=0.3.17
-pkgrel=0
+pkgrel=1
pkgdesc="Library of simple functions that are optimized for various CPUs."
url="http://liboil.freedesktop.org/"
license="custom"
diff --git a/main/libpaper/APKBUILD b/main/libpaper/APKBUILD
index 9650361f..5cf53829 100644
--- a/main/libpaper/APKBUILD
+++ b/main/libpaper/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpaper
pkgver=1.1.23
-pkgrel=0
+pkgrel=1
pkgdesc="Library for handling paper characteristics"
url="http://packages.debian.org/unstable/source/libpaper"
license="GPL"
diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD
index a4a9f7de..4fc54bbc 100644
--- a/main/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
@@ -1,34 +1,36 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpcap
-pkgver=1.0.0
+pkgver=1.1.1
_sover=1.0.0
-pkgrel=2
+pkgrel=0
pkgdesc="A system-independent interface for user-level packet capture"
url="http://www.tcpdump.org/"
license="BSD"
depends=
makedepends="bison flex"
source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
- $pkgname-1.0.0-LDFLAGS.patch
- $pkgname-any.patch"
+ "
subpackages="$pkgname-doc $pkgname-dev"
-build ()
-{
- cd ${startdir}/src/${pkgname}-${pkgver}
- for i in ../*.patch; do
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in "$srcdir"/*.patch; do
+ [ -r "$i" ] || continue
msg "Applying $i..."
patch -p1 -i $i || return 1
done
+}
+build() {
+ cd "$_builddir"
./configure --prefix=/usr --enable-ipv6
-
make all shared || return 1
+}
+
+package() {
+ cd "$_builddir"
mkdir -p "$pkgdir/usr/bin"
make -j1 DESTDIR="$pkgdir" install install-shared
- ln -s libpcap.so.$_sover "$pkgdir"/usr/lib/libpcap.so.1
- ln -s libpcap.so.$_sover "$pkgdir"/usr/lib/libpcap.so
}
-md5sums="9ad1358c5dec48456405eac197a46d3d libpcap-1.0.0.tar.gz
-2bf7e986980c6e5d99758ba55b48d706 libpcap-1.0.0-LDFLAGS.patch
-1e6b01c4f283b497e81e137c3f35e744 libpcap-any.patch"
+md5sums="1bca27d206970badae248cfa471bbb47 libpcap-1.1.1.tar.gz"
diff --git a/main/libpcap/libpcap-1.0.0-LDFLAGS.patch b/main/libpcap/libpcap-1.0.0-LDFLAGS.patch
deleted file mode 100644
index b2fe8d6f..00000000
--- a/main/libpcap/libpcap-1.0.0-LDFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'Makefile.in'
---- a/Makefile.in 2008-11-04 18:53:20 +0000
-+++ b/Makefile.in 2008-11-04 18:53:49 +0000
-@@ -328,7 +328,7 @@
- #
- libpcap.so: $(OBJ)
- @rm -f $@
-- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-
- #
- # The following rule succeeds, but the result is untested.
-
diff --git a/main/libpcap/libpcap-any.patch b/main/libpcap/libpcap-any.patch
deleted file mode 100644
index 7754513b..00000000
--- a/main/libpcap/libpcap-any.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808
-Author: guy <guy>
-Date: Wed Nov 19 08:20:39 2008 +0000
-
- Fix the handling of the "any" device, including making it reject
- attempts to open it in monitor mode.
-
-diff --git a/pcap-linux.c b/pcap-linux.c
-index 2a92d30..b18c4d2 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -297,6 +297,12 @@ pcap_create(const char *device, char *ebuf)
- {
- pcap_t *handle;
-
-+ /*
-+ * A null device name is equivalent to the "any" device.
-+ */
-+ if (device == NULL)
-+ device = "any";
-+
- #ifdef HAVE_DAG_API
- if (strstr(device, "dag")) {
- return dag_create(device, ebuf);
-@@ -338,10 +344,9 @@ pcap_can_set_rfmon_linux(pcap_t *p)
- struct iwreq ireq;
- #endif
-
-- if (p->opt.source == NULL) {
-+ if (strcmp(p->opt.source, "any") == 0) {
- /*
-- * This is equivalent to the "any" device, and we don't
-- * support monitor mode on it.
-+ * Monitor mode makes no sense on the "any" device.
- */
- return 0;
- }
-@@ -518,12 +523,11 @@ pcap_activate_linux(pcap_t *handle)
- handle->stats_op = pcap_stats_linux;
-
- /*
-- * NULL and "any" are special devices which give us the hint to
-- * monitor all devices.
-+ * The "any" device is a special device which causes us not
-+ * to bind to a particular device and thus to look at all
-+ * devices.
- */
-- if (!device || strcmp(device, "any") == 0) {
-- device = NULL;
-- handle->md.device = strdup("any");
-+ if (strcmp(device, "any") == 0) {
- if (handle->opt.promisc) {
- handle->opt.promisc = 0;
- /* Just a warning. */
-@@ -531,10 +535,9 @@ pcap_activate_linux(pcap_t *handle)
- "Promiscuous mode not supported on the \"any\" device");
- status = PCAP_WARNING_PROMISC_NOTSUP;
- }
-+ }
-
-- } else
-- handle->md.device = strdup(device);
--
-+ handle->md.device = strdup(device);
- if (handle->md.device == NULL) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s",
- pcap_strerror(errno) );
-@@ -1657,19 +1660,21 @@ static int
- activate_new(pcap_t *handle)
- {
- #ifdef HAVE_PF_PACKET_SOCKETS
-+ const char *device = handle->opt.source;
-+ int is_any_device = (strcmp(device, "any") == 0);
- int sock_fd = -1, arptype, val;
- int err = 0;
- struct packet_mreq mr;
-- const char* device = handle->opt.source;
-
- /*
-- * Open a socket with protocol family packet. If a device is
-- * given we try to open it in raw mode otherwise we use
-- * the cooked interface.
-+ * Open a socket with protocol family packet. If the
-+ * "any" device was specified, we open a SOCK_DGRAM
-+ * socket for the cooked interface, otherwise we first
-+ * try a SOCK_RAW socket for the raw interface.
- */
-- sock_fd = device ?
-- socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))
-- : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL));
-+ sock_fd = is_any_device ?
-+ socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) :
-+ socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-
- if (sock_fd == -1) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
-@@ -1704,7 +1709,7 @@ activate_new(pcap_t *handle)
- * to cooked mode if we have an unknown interface type
- * or a type we know doesn't work well in raw mode.
- */
-- if (device) {
-+ if (!is_any_device) {
- /* Assume for now we don't need cooked mode. */
- handle->md.cooked = 0;
-
-@@ -1819,15 +1824,23 @@ activate_new(pcap_t *handle)
- }
- } else {
- /*
-- * This is cooked mode.
-+ * The "any" device.
-+ */
-+ if (handle->opt.rfmon) {
-+ /*
-+ * It doesn't support monitor mode.
-+ */
-+ return PCAP_ERROR_RFMON_NOTSUP;
-+ }
-+
-+ /*
-+ * It uses cooked mode.
- */
- handle->md.cooked = 1;
- handle->linktype = DLT_LINUX_SLL;
-
- /*
- * We're not bound to a device.
-- * XXX - true? Or true only if we're using
-- * the "any" device?
- * For now, we're using this as an indication
- * that we can't transmit; stop doing that only
- * if we figure out how to transmit in cooked
-@@ -1852,10 +1865,13 @@ activate_new(pcap_t *handle)
-
- /*
- * Hmm, how can we set promiscuous mode on all interfaces?
-- * I am not sure if that is possible at all.
-+ * I am not sure if that is possible at all. For now, we
-+ * silently ignore attempts to turn promiscuous mode on
-+ * for the "any" device (so you don't have to explicitly
-+ * disable it in programs such as tcpdump).
- */
-
-- if (device && handle->opt.promisc) {
-+ if (!is_any_device && handle->opt.promisc) {
- memset(&mr, 0, sizeof(mr));
- mr.mr_ifindex = handle->md.ifindex;
- mr.mr_type = PACKET_MR_PROMISC;
-@@ -3118,7 +3134,7 @@ activate_old(pcap_t *handle)
-
- /* Bind to the given device */
-
-- if (!device) {
-+ if (strcmp(device, "any") == 0) {
- strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems",
- PCAP_ERRBUF_SIZE);
- return PCAP_ERROR;
diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD
index 1f5e6365..3ca31cda 100644
--- a/main/libpciaccess/APKBUILD
+++ b/main/libpciaccess/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpciaccess
pkgver=0.11.0
-pkgrel=0
+pkgrel=1
pkgdesc="X11 PCI access library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD
index 0f971679..70f15d01 100644
--- a/main/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=libpng
pkgver=1.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="Portable Network Graphics library"
url="http://www.libpng.org/"
license="GPL"
diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD
index 05467c53..4094083a 100644
--- a/main/libpri/APKBUILD
+++ b/main/libpri/APKBUILD
@@ -3,7 +3,7 @@
pkgname=libpri
pkgver=1.4.11_alpha1
_pkgver=1.4.10.2
-pkgrel=0
+pkgrel=1
pkgdesc="Primary Rate ISDN (PRI) library"
url="http://www.asterisk.orig"
license="GPL"
diff --git a/main/libpthread-stubs/APKBUILD b/main/libpthread-stubs/APKBUILD
index 7ca630b4..843e4795 100644
--- a/main/libpthread-stubs/APKBUILD
+++ b/main/libpthread-stubs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpthread-stubs
pkgver=0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Pthread functions stubs for platforms missing them"
url="http://cgit.freedesktop.org/xcb/pthread-stubs"
license="X11"
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD
index 49b474f2..db588711 100644
--- a/main/librsvg/APKBUILD
+++ b/main/librsvg/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=librsvg
-pkgver=2.26.2
+pkgver=2.26.3
pkgrel=0
pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
url="http://librsvg.sourceforge.net/"
@@ -31,4 +31,4 @@ package() {
rm -rf "$pkgdir"/usr/lib/mozilla
}
-md5sums="6bb1993f9180176e45d6084089f47aa8 librsvg-2.26.2.tar.bz2"
+md5sums="8df68c2c02cdf2a96a92b43bf737bf9c librsvg-2.26.3.tar.bz2"
diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 786d6c1e..71b38fb3 100644
--- a/main/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsamplerate
pkgver=0.1.7
-pkgrel=0
+pkgrel=1
pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
url="http://www.mega-nerd.com/SRC/index.html"
subpackages="$pkgname-dev"
license="GPL"
-depends="uclibc"
+depends=""
source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz"
build () {
diff --git a/main/libsexy/APKBUILD b/main/libsexy/APKBUILD
index 64488a0a..ad2f441b 100644
--- a/main/libsexy/APKBUILD
+++ b/main/libsexy/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsexy
pkgver=0.1.11
-pkgrel=0
+pkgrel=1
pkgdesc="Doing naughty things to good widgets."
url="http://chipx86.com/wiki/Libsexy"
license="GPL"
diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD
index 9f17e18a..63a7303c 100644
--- a/main/libsm/APKBUILD
+++ b/main/libsm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsm
pkgver=1.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Session Management library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index edfb9328..b315291d 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsndfile
pkgver=1.0.21
-pkgrel=0
+pkgrel=1
pkgdesc="A C library for reading and writing files containing sampled sound"
url="http://www.mega-nerd.com/libsndfile"
license="LGPL"
diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD
index ee3f8fd8..66a25b5a 100644
--- a/main/libsoup/APKBUILD
+++ b/main/libsoup/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsoup
-pkgver=2.30.0
+pkgver=2.30.1
pkgrel=0
pkgdesc="Gnome HTTP Library"
url="http://www.gnome.org"
@@ -27,4 +27,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="2d18154b869da541c2c0909b443f053a libsoup-2.30.0.tar.bz2"
+md5sums="d80fb560a72370fba347785b00a750fb libsoup-2.30.1.tar.bz2"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index da5ba384..b09ea23d 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libspf2
pkgver=1.2.9
-pkgrel=1
+pkgrel=2
pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
url="http://www.libspf2.org"
license="LGPL-2.1 BSD-2"
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 88a2964e..84b96532 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtasn1
-pkgver=2.5
+pkgver=2.6
pkgrel=0
pkgdesc="The ASN.1 library used in GNUTLS"
url="http://www.gnu.org/software/gnutls/"
@@ -22,4 +22,4 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="e60b863697713c3d6a59b1e8c6f9b0d1 libtasn1-2.5.tar.gz"
+md5sums="d410671e13038324336917ceed7470a5 libtasn1-2.6.tar.gz"
diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD
index f17b0e8a..d608d361 100644
--- a/main/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtheora
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="An open video codec developed by the Xiph.org"
url="http://www.xiph.org"
license="custom"
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
index f82cdc7e..6741c58d 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=libtool
pkgver=2.2.6b
-pkgrel=0
+pkgrel=1
pkgdesc="A generic library support script"
license='GPL'
url="http://www.gnu.org/software/libtool"
diff --git a/testing/libunique/APKBUILD b/main/libunique/APKBUILD
index 29ed8abb..59bd4508 100644
--- a/testing/libunique/APKBUILD
+++ b/main/libunique/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libunique
pkgver=1.1.6
-pkgrel=0
+pkgrel=1
pkgdesc="Library for writing single instance applications"
url="http://live.gnome.org/LibUnique"
license="LGPL"
diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index 23e16cfa..d9ac9a0b 100644
--- a/main/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
@@ -1,20 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libusb-compat
pkgver=0.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="Compatility for older libusb"
url="http://libusb.sourceforge.net/"
license="LGPL"
subpackages="$pkgname-dev"
-depends="uclibc libusb"
+depends=
makedepends="libusb-dev"
source="http://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2"
-build ()
-{
+build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr --disable-build-docs
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
md5sums="652e1d9e6c6912fd924a5ad204f6d48b libusb-compat-0.1.0.tar.bz2"
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index 7234ad31..a9146298 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libusb
pkgver=1.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="Library to enable user space application programs to communicate with USB devices"
url="http://libusb.sourceforge.net/"
license="LGPL"
subpackages="$pkgname-dev"
-depends="uclibc"
+depends=""
makedepends=""
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index 07c2fc4d..82964167 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libvorbis
-pkgver=1.2.3
+pkgver=1.3.1
pkgrel=0
pkgdesc="Vorbis codec library"
url="http://www.xiph.org/ogg/vorbis/"
@@ -17,7 +17,11 @@ build ()
./configure --prefix=/usr \
--disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="5aa77f55c0e0aab8eb8ed982335daac8 libvorbis-1.2.3.tar.gz"
+md5sums="016e523fac70bdd786258a9d15fd36e9 libvorbis-1.3.1.tar.gz"
diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD
index 172e1d0e..b6977f82 100644
--- a/main/libwnck/APKBUILD
+++ b/main/libwnck/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libwnck
pkgver=2.30.0
-pkgrel=0
+pkgrel=1
pkgdesc="Window Navigator Construction Kit"
url="http://www.gnome.org/"
license="LGPL"
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD
index 78db7ccf..93dd4442 100644
--- a/main/libx11/APKBUILD
+++ b/main/libx11/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libx11
pkgver=1.3.3
-pkgrel=0
+pkgrel=1
pkgdesc="X11 client-side library"
url="http://xorg.freedesktop.org/"
license="custom:XFREE86"
diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD
index c6b79906..888eb7dd 100644
--- a/main/libxau/APKBUILD
+++ b/main/libxau/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxau
pkgver=1.0.5
-pkgrel=0
+pkgrel=1
pkgdesc="X11 authorisation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD
index a1b30a35..6086b38d 100644
--- a/main/libxcb/APKBUILD
+++ b/main/libxcb/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcb
-pkgver=1.5
+pkgver=1.6
pkgrel=0
pkgdesc="X11 client-side library"
url="http://xcb.freedesktop.org/"
license="custom"
-depends="xcb-proto>=1.6"
+depends="xcb-proto"
subpackages="$pkgname-dev $pkgname-doc"
makedepends="libxdmcp-dev libxau-dev libxslt libpthread-stubs pkgconfig python"
source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2
@@ -24,4 +24,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="d19c0ba6ba42ebccd3d62d8bb147b551 libxcb-1.5.tar.bz2"
+md5sums="cba9f6d1137ef00d9b326726d0bab6fd libxcb-1.6.tar.bz2"
diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD
index f2e48a91..cad84273 100644
--- a/main/libxcomposite/APKBUILD
+++ b/main/libxcomposite/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcomposite
pkgver=0.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Composite extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxcursor/APKBUILD b/main/libxcursor/APKBUILD
index bc9e33d4..2a83e866 100644
--- a/main/libxcursor/APKBUILD
+++ b/main/libxcursor/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcursor
pkgver=1.1.10
-pkgrel=1
+pkgrel=2
pkgdesc="X cursor management library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxdamage/APKBUILD b/main/libxdamage/APKBUILD
index bf58651c..338e425c 100644
--- a/main/libxdamage/APKBUILD
+++ b/main/libxdamage/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxdamage
pkgver=1.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="X11 damaged region extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD
index f61c9e48..2c6e7e82 100644
--- a/main/libxdmcp/APKBUILD
+++ b/main/libxdmcp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxdmcp
pkgver=1.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Display Manager Control Protocol library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD
index dbfb1b26..87d7d248 100644
--- a/main/libxext/APKBUILD
+++ b/main/libxext/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxext
pkgver=1.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="X11 miscellaneous extensions library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxfce4menu/APKBUILD b/main/libxfce4menu/APKBUILD
index 0023f2d9..7ba2bd6d 100644
--- a/main/libxfce4menu/APKBUILD
+++ b/main/libxfce4menu/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfce4menu
-pkgver=4.6.1
+pkgver=4.6.2
pkgrel=0
pkgdesc="a freedesktop.org compliant menu implementation for Xfce"
url="http://www.xfce.org/"
@@ -11,8 +11,7 @@ makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev
libiconv-dev"
source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-build ()
-{
+build () {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -20,6 +19,10 @@ build ()
--localstatedir=/var \
--disable-static
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="5dc9343885c2c6f931318b2a1cdcc9db libxfce4menu-4.6.1.tar.bz2"
+md5sums="ff10cacb76803ee37159e3a43345f0d1 libxfce4menu-4.6.2.tar.bz2"
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD
index 7cfbd769..884378e5 100644
--- a/main/libxfce4util/APKBUILD
+++ b/main/libxfce4util/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfce4util
-pkgver=4.6.1
-pkgrel=1
+pkgver=4.6.2
+pkgrel=0
pkgdesc="Basic utility non-GUI functions for Xfce"
url="http://www.xfce.org/"
license="GPL-2"
subpackages="$pkgname-dev $pkgname-doc"
depends=
-makedepends="pkgconfig glib-dev gettext-dev libiconv-dev"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
+makedepends="pkgconfig glib-dev gettext-dev libiconv-dev intltool"
+source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2"
depends_dev="glib-dev"
build() {
@@ -25,4 +25,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="eac51d58179cbcadc3f802450a8ec9cd libxfce4util-4.6.1.tar.bz2"
+md5sums="9c3129d827d480f0906c575e7a13f1e9 libxfce4util-4.6.2.tar.bz2"
diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD
index efb4c4d0..db84c195 100644
--- a/main/libxfcegui4/APKBUILD
+++ b/main/libxfcegui4/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfcegui4
-pkgver=4.6.3
-pkgrel=0
+pkgver=4.6.4
+pkgrel=1
pkgdesc="Basic GUI functions for Xfce"
url="http://www.xfce.org/"
license="GPL2"
@@ -12,7 +12,7 @@ makedepends="pkgconfig intltool glib-dev gettext-dev libiconv-dev gtk+-dev
libxfce4util-dev expat-dev"
source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2"
-depends_dev="gtk+-dev libxfce4util-dev xfconf-dev"
+depends_dev="gtk+-dev libxfce4util-dev xfconf-dev libsm-dev"
build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
@@ -28,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="a647411a0b95d45bb701beff83636307 libxfcegui4-4.6.3.tar.bz2"
+md5sums="88de59b222cb9977f93a4c61011c1e1f libxfcegui4-4.6.4.tar.bz2"
diff --git a/main/libxfixes/APKBUILD b/main/libxfixes/APKBUILD
index 87e81e1b..6e15f2c1 100644
--- a/main/libxfixes/APKBUILD
+++ b/main/libxfixes/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfixes
pkgver=4.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="X11 miscellaneous 'fixes' extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD
index f8a2bb25..3ce3622e 100644
--- a/main/libxfont/APKBUILD
+++ b/main/libxfont/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxfont
pkgver=1.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="X11 font rasterisation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxft/APKBUILD b/main/libxft/APKBUILD
index 43b5a3c0..c9bcb99b 100644
--- a/main/libxft/APKBUILD
+++ b/main/libxft/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxft
pkgver=2.1.14
-pkgrel=1
+pkgrel=2
pkgdesc="FreeType-based font drawing library for X"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 21fd77ce..4f02be89 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxi
pkgver=1.3
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Input extension library"
url="http://xorg.freedesktop.org"
license="custom"
diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD
index 589994d1..f0ea405c 100644
--- a/main/libxinerama/APKBUILD
+++ b/main/libxinerama/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxinerama
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Xinerama extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 1298aed0..10aed961 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxkbfile
pkgver=1.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="X11 keyboard file manipulation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD
index e585174a..eb53261b 100644
--- a/main/libxkbui/APKBUILD
+++ b/main/libxkbui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxkbui
pkgver=1.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="X11 keyboard UI presentation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxklavier/APKBUILD b/main/libxklavier/APKBUILD
index adbce6f6..65f66aea 100644
--- a/main/libxklavier/APKBUILD
+++ b/main/libxklavier/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxklavier
pkgver=5.0
-pkgrel=0
+pkgrel=1
pkgdesc="High-level API for X Keyboard Extension"
url="http://gswitchit.sourceforge.net"
license="LGPL"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 58514b1e..6c314eb5 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=libxml2
-pkgver=2.7.6
-pkgrel=2
+pkgver=2.7.7
+pkgrel=0
pkgdesc="XML parsing library, version 2"
url="http://www.xmlsoft.org/"
license="MIT"
@@ -10,8 +10,7 @@ depends=
makedepends="zlib-dev python-dev"
subpackages="$pkgname-doc $pkgname-dev py-$pkgname:py"
source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
- largefile64.patch
- zlib.patch"
+ largefile64.patch"
options="!strip"
@@ -46,6 +45,5 @@ py() {
}
-md5sums="7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz
-5ad4915665608ebfa5b89f7908467a72 largefile64.patch
-0365d5397164b8739219e56e5ca069d1 zlib.patch"
+md5sums="9abc9959823ca9ff904f1fbcf21df066 libxml2-2.7.7.tar.gz
+5ad4915665608ebfa5b89f7908467a72 largefile64.patch"
diff --git a/main/libxml2/zlib.patch b/main/libxml2/zlib.patch
deleted file mode 100644
index 4bf486d1..00000000
--- a/main/libxml2/zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 19 Jan 2010 15:28:48 +0000
-Subject: libxml violates the zlib interface and crashes
-
-* xmlIO.c: remove an abuse of zlib API and use a clean interface
- available in zlib >= 1.2.3
----
-diff --git a/xmlIO.c b/xmlIO.c
-index c03ac43..8fc00e3 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #ifdef HAVE_ZLIB_H
- if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
- (strcmp(URI, "-") != 0)) {
-+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
-+ ret->compressed = !gzdirect(context);
-+#else
- if (((z_stream *)context)->avail_in > 4) {
- char *cptr, buff4[4];
- cptr = (char *) ((z_stream *)context)->next_in;
-@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- gzrewind(context);
- }
- }
-+#endif
- }
- #endif
- }
---
-cgit v0.8.3.1
diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD
index 13343d78..fb55cfa9 100644
--- a/main/libxmu/APKBUILD
+++ b/main/libxmu/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxmu
pkgver=1.0.5
-pkgrel=0
+pkgrel=1
pkgdesc="X11 miscellaneous micro-utility library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index d1be1b73..cb970fef 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxpm
pkgver=3.5.8
-pkgrel=1
+pkgrel=2
pkgdesc="X11 pixmap library"
url="http://xorg.freedesktop.org/"
license="custom:BELL"
diff --git a/main/libxrandr/APKBUILD b/main/libxrandr/APKBUILD
index e261af4f..e433acc2 100644
--- a/main/libxrandr/APKBUILD
+++ b/main/libxrandr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxrandr
pkgver=1.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="X11 RandR extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD
index dc117553..293610e2 100644
--- a/main/libxrender/APKBUILD
+++ b/main/libxrender/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxrender
pkgver=0.9.5
-pkgrel=1
+pkgrel=2
pkgdesc="X Rendering Extension client library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxres/APKBUILD b/main/libxres/APKBUILD
index f446812f..cc654c8b 100644
--- a/main/libxres/APKBUILD
+++ b/main/libxres/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxres
pkgver=1.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Resource extension library"
url="http://xorg.freedesktop.org"
license="custom"
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 32353ba5..c4c9add3 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxslt
pkgver=1.1.26
-pkgrel=1
+pkgrel=2
pkgdesc="XML stylesheet transformation library"
url="http://xmlsoft.org/XSLT/"
license="custom"
diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD
index db0401e5..3bf47fe6 100644
--- a/main/libxt/APKBUILD
+++ b/main/libxt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxt
pkgver=1.0.8
-pkgrel=0
+pkgrel=1
pkgdesc="X11 toolkit intrinsics library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index c1e9c4b6..37eac754 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxtst
pkgver=1.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Testing -- Resource extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index ca40f7fd..c0070031 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxv
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Video extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxvmc/APKBUILD b/main/libxvmc/APKBUILD
index 3233ba40..871d1892 100644
--- a/main/libxvmc/APKBUILD
+++ b/main/libxvmc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxvmc
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Video Motion Compensation extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86dga/APKBUILD b/main/libxxf86dga/APKBUILD
index 5ac46866..238e7612 100644
--- a/main/libxxf86dga/APKBUILD
+++ b/main/libxxf86dga/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86dga
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Direct Graphics Access extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD
index aa644d18..c6dd2cb0 100644
--- a/main/libxxf86misc/APKBUILD
+++ b/main/libxxf86misc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86misc
pkgver=1.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="X11 XFree86 miscellaneous extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index 1a7ebc4f..87fe594d 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86vm
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="X11 XFree86 video mode extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 44125b0e..5c03ed55 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
pkgname=lighttpd
pkgver=1.4.26
_streamver=2.2.0
-pkgrel=2
+pkgrel=4
pkgdesc="a secure, fast, compliant and very flexible web-server"
url="http://www.lighttpd.net/"
license="custom"
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index 2d11cf9d..bc2e3f32 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=links
pkgver=2.2
-pkgrel=0
+pkgrel=2
pkgdesc="A text WWW browser, similar to Lynx"
url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
license="GPL"
diff --git a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch b/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
deleted file mode 100644
index 03ea13fa..00000000
--- a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From a60cfaf3df9cd0cddbc24695434ed5bfa917d505 Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@redhat.com>
-Date: Mon, 29 Mar 2010 13:16:02 -0700
-Subject: [PATCH 06/18] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
-
-Official patch to fix the r8169 frame length check error.
-
-Based on this initial thread:
-http://marc.info/?l=linux-netdev&m=126202972828626&w=1
-This is the official patch to fix the frame length problems in the r8169
-driver. As noted in the previous thread, while this patch incurs a performance
-hit on the driver, its possible to improve performance dynamically by updating
-the mtu and rx_copybreak values at runtime to return performance to what it was
-for those NICS which are unaffected by the ideosyncracy (if there are any).
-
-Summary:
-
- A while back Eric submitted a patch for r8169 in which the proper
-allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
-much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A
-long time prior to that however, Francois posted
-126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize
-setting due to the fact that the hardware behaved in odd ways when overlong
-frames were received on NIC's supported by this driver. This was mentioned in a
-security conference recently:
-http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
-
-It seems that if we can't enable frame size filtering, then, as Eric correctly
-noticed, we can find ourselves DMA-ing too much data to a buffer, causing
-corruption. As a result is seems that we are forced to allocate a frame which
-is ready to handle a maximally sized receive.
-
-This obviously has performance issues with it, so to mitigate that issue, this
-patch does two things:
-
-1) Raises the copybreak value to the frame allocation size, which should force
-appropriately sized packets to get allocated on rx, rather than a full new 16k
-buffer.
-
-2) This patch only disables frame filtering initially (i.e., during the NIC
-open), changing the MTU results in ring buffer allocation of a size in relation
-to the new mtu (along with a warning indicating that this is dangerous).
-
-Because of item (2), individuals who can't cope with the performance hit (or can
-otherwise filter frames to prevent the bug), or who have hardware they are sure
-is unaffected by this issue, can manually lower the copybreak and reset the mtu
-such that performance is restored easily.
-
-Signed-off-by: Neil Horman <nhorman@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit c0cd884af045338476b8e69a61fceb3f34ff22f1)
----
- drivers/net/r8169.c | 29 ++++++++++++++++++++++++-----
- 1 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 24599b5..1484528 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
-
- MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
-
--static int rx_copybreak = 200;
-+/*
-+ * we set our copybreak very high so that we don't have
-+ * to allocate 16k frames all the time (see note in
-+ * rtl8169_open()
-+ */
-+static int rx_copybreak = 16383;
- static int use_dac;
- static struct {
- u32 msg_enable;
-@@ -3245,9 +3250,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
- }
-
- static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
-- struct net_device *dev)
-+ unsigned int mtu)
- {
-- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-+
-+ if (max_frame != 16383)
-+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
-+ "May lead to frame reception errors!\n");
-
- tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
- }
-@@ -3259,7 +3268,17 @@ static int rtl8169_open(struct net_device *dev)
- int retval = -ENOMEM;
-
-
-- rtl8169_set_rxbufsize(tp, dev);
-+ /*
-+ * Note that we use a magic value here, its wierd I know
-+ * its done because, some subset of rtl8169 hardware suffers from
-+ * a problem in which frames received that are longer than
-+ * the size set in RxMaxSize register return garbage sizes
-+ * when received. To avoid this we need to turn off filtering,
-+ * which is done by setting a value of 16383 in the RxMaxSize register
-+ * and allocating 16k frames to handle the largest possible rx value
-+ * thats what the magic math below does.
-+ */
-+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN);
-
- /*
- * Rx and Tx desscriptors needs 256 bytes alignment.
-@@ -3912,7 +3931,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
-
- rtl8169_down(dev);
-
-- rtl8169_set_rxbufsize(tp, dev);
-+ rtl8169_set_rxbufsize(tp, dev->mtu);
-
- ret = rtl8169_init_ring(dev);
- if (ret < 0)
---
-1.7.0.2
-
diff --git a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch b/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
deleted file mode 100644
index dff3fd21..00000000
--- a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d1c9ac562923fa0b1738fceb4c7bafac3ab936ba Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Thu, 1 Apr 2010 07:30:07 +0000
-Subject: [PATCH 08/18] r8169: clean up my printk uglyness
-
-Fix formatting on r8169 printk
-
-Brandon Philips noted that I had a spacing issue in my printk for the
-last r8169 patch that made it quite ugly. Fix that up and add the PFX
-macro to it as well so it looks like the other r8169 printks
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e)
----
- drivers/net/r8169.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index bed1d47..790555e 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
- unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-
- if (max_frame != 16383)
-- printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
-- "May lead to frame reception errors!\n");
-+ printk(KERN_WARNING PFX "WARNING! Changing of MTU on this "
-+ "NIC may lead to frame reception errors!\n");
-
- tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
- }
---
-1.7.0.2
-
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 759d6716..538324b8 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=2.6.32.11
+pkgver=2.6.32.14
_kernver=2.6.32
-pkgrel=2
+pkgrel=0
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -14,15 +14,12 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- grsecurity-2.1.14-2.6.32.11-201004071936.patch
+ grsecurity-2.1.14-2.6.32.14-201005291720.patch
0001-grsec-revert-conflicting-flow-cache-changes.patch
0002-gre-fix-hard-header-destination-address-checking.patch
0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
0004-arp-flush-arp-cache-on-device-change.patch
- 0005-r8169-fix-broken-register-writes.patch
- 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
0007-r8169-Fix-rtl8169_rx_interrupt.patch
- 0008-r8169-clean-up-my-printk-uglyness.patch
0009-ipsec-Fix-bogus-bundle-flowi.patch
0010-xfrm-Remove-xfrm_state_genid.patch
0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -33,6 +30,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
0016-xfrm-remove-policy-garbage-collection.patch
0017-flow-delayed-deletion-of-flow-cache-entries.patch
0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
+ xfrm-fix-policy-unreferencing-on-larval-drop.patch
kernelconfig.x86
"
subpackages="$pkgname-dev linux-firmware:firmware"
@@ -47,7 +45,8 @@ prepare() {
fi
# first apply the grsecurity patch and then the rest
- for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch; do
+ for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch \
+ "$srcdir"/xfrm*; do
[ -f $i ] || continue
msg "Applying $i..."
patch -s -p1 -N < $i || return 1
@@ -68,7 +67,9 @@ menuconfig() {
build() {
cd "$srcdir"/build
- make CC="${CC:--gcc}" || return 1
+ make CC="${CC:--gcc}" \
+ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
+ || return 1
}
package() {
@@ -138,16 +139,13 @@ firmware() {
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-855c248334a71ef5ca3d8cb89d51334f patch-2.6.32.11.bz2
-6eabb0c08a988a97a823b5462d1c5018 grsecurity-2.1.14-2.6.32.11-201004071936.patch
+90f0ec928aff643f05a8b98fad54b10c patch-2.6.32.14.bz2
+a9985ec4cf7a50beaa755b1ebde839c4 grsecurity-2.1.14-2.6.32.14-201005291720.patch
1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
-afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch
-c538c0f735d79fd71b47dde02bf1f790 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
5f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch
-f878c802700e3babd03be3505119c5c2 0008-r8169-clean-up-my-printk-uglyness.patch
cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch
3af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch
9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -158,4 +156,5 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo
41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch
3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch
45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
+c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch
7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86"
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch
index 62c446bc..3e14e9ee 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alpha/include/asm/elf.h
---- linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/alpha/include/asm/elf.h linux-2.6.32.14/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alp
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/alpha/include/asm/pgtable.h linux-2.6.32.14/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha/kernel/module.c
---- linux-2.6.32.11/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/alpha/kernel/module.c linux-2.6.32.14/arch/alpha/kernel/module.c
+--- linux-2.6.32.14/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/alpha/kernel/osf_sys.c linux-2.6.32.14/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400
@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alph
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/fault.c
---- linux-2.6.32.11/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/alpha/mm/fault.c linux-2.6.32.14/arch/alpha/mm/fault.c
+--- linux-2.6.32.14/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/f
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/include/asm/elf.h
---- linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/include/asm/elf.h linux-2.6.32.14/arch/arm/include/asm/elf.h
+--- linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/i
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/include/asm/kmap_types.h linux-2.6.32.14/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/include/asm/uaccess.h linux-2.6.32.14/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/a
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kernel/kgdb.c
---- linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/kernel/kgdb.c linux-2.6.32.14/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kerne
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach-at91/pm.c
---- linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-at91/pm.c linux-2.6.32.14/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-omap1/pm.c linux-2.6.32.14/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mac
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/m
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/pm.c linux-2.6.32.14/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/a
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mach-sa1100/pm.c linux-2.6.32.14/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/ma
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault.c
---- linux-2.6.32.11/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mm/fault.c linux-2.6.32.14/arch/arm/mm/fault.c
+--- linux-2.6.32.14/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c
---- linux-2.6.32.11/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/mm/mmap.c linux-2.6.32.14/arch/arm/mm/mmap.c
+--- linux-2.6.32.14/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/arm/plat-s3c/pm.c linux-2.6.32.14/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr32/include/asm/elf.h
---- linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/avr32/include/asm/elf.h linux-2.6.32.14/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400
@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/a
};
#undef D
-diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr3
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/fault.c
---- linux-2.6.32.11/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/avr32/mm/fault.c linux-2.6.32.14/arch/avr32/mm/fault.c
+--- linux-2.6.32.14/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/f
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/blackfin/kernel/kgdb.c linux-2.6.32.14/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blac
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/blackfin/mach-common/pm.c linux-2.6.32.14/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/b
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/frv/include/asm/kmap_types.h linux-2.6.32.14/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400
@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400
@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
#define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/ia32/ia32priv.h linux-2.6.32.14/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/i
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/a
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64/include/asm/elf.h
---- linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/include/asm/elf.h linux-2.6.32.14/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/include/asm/machvec.h linux-2.6.32.14/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/include/asm/pgtable.h linux-2.6.32.14/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400
@@ -143,6 +143,17 @@
#define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/include/asm/uaccess.h linux-2.6.32.14/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/i
{
return dma_ops;
}
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/kernel/module.c
---- linux-2.6.32.11/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/module.c linux-2.6.32.14/arch/ia64/kernel/module.c
+--- linux-2.6.32.14/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/k
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-dma.c linux-2.6.32.14/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/
static int __init pci_iommu_init(void)
{
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/i
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64/kernel/topology.c
---- linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/topology.c linux-2.6.32.14/arch/ia64/kernel/topology.c
+--- linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64
.show = cache_show
};
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/i
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fault.c
---- linux-2.6.32.11/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/mm/fault.c linux-2.6.32.14/arch/ia64/mm/fault.c
+--- linux-2.6.32.14/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fau
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init.c
---- linux-2.6.32.11/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/mm/init.c linux-2.6.32.14/arch/ia64/mm/init.c
+--- linux-2.6.32.14/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/
.alloc_coherent = sn_dma_alloc_coherent,
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
-diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/lib/usercopy.c
---- linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/m32r/lib/usercopy.c linux-2.6.32.14/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/li
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips/include/asm/elf.h
---- linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/include/asm/elf.h linux-2.6.32.14/arch/mips/include/asm/elf.h
+--- linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips
+#endif
+
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mips/include/asm/page.h
---- linux-2.6.32.11/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/include/asm/page.h linux-2.6.32.14/arch/mips/include/asm/page.h
+--- linux-2.6.32.14/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mip
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/mips/include/asm/system.h
---- linux-2.6.32.11/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/include/asm/system.h linux-2.6.32.14/arch/mips/include/asm/system.h
+--- linux-2.6.32.14/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/m
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/kernel/kgdb.c
---- linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/kernel/kgdb.c linux-2.6.32.14/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/ker
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/kernel/process.c
---- linux-2.6.32.11/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/kernel/process.c linux-2.6.32.14/arch/mips/kernel/process.c
+--- linux-2.6.32.14/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/kernel/syscall.c
---- linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/kernel/syscall.c linux-2.6.32.14/arch/mips/kernel/syscall.c
+--- linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400
@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
else
-diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fault.c
---- linux-2.6.32.11/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/mips/mm/fault.c linux-2.6.32.14/arch/mips/mm/fault.c
+--- linux-2.6.32.14/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fau
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/parisc/include/asm/elf.h
---- linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/include/asm/elf.h linux-2.6.32.14/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/pa
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
but it's not easy, and we've already done it here. */
-diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/include/asm/pgtable.h linux-2.6.32.14/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arc
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/parisc/kernel/module.c
---- linux-2.6.32.11/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/kernel/module.c linux-2.6.32.14/arch/parisc/kernel/module.c
+--- linux-2.6.32.14/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/pari
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400
@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/parisc/kernel/traps.c
---- linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/kernel/traps.c linux-2.6.32.14/arch/parisc/kernel/traps.c
+--- linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/paris
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm/fault.c
---- linux-2.6.32.11/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.14/arch/parisc/mm/fault.c linux-2.6.32.14/arch/parisc/mm/fault.c
+--- linux-2.6.32.14/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arch/powerpc/include/asm/device.h
---- linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/device.h linux-2.6.32.14/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arc
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/elf.h linux-2.6.32.14/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400
@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/p
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/iommu.h linux-2.6.32.14/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page_64.h linux-2.6.32.14/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400
@@ -180,15 +180,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/ar
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/powerpc/include/asm/page.h
---- linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page.h linux-2.6.32.14/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400
@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pci.h linux-2.6.32.14/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/p
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11
#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/reg.h linux-2.6.32.14/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/p
#define DSISR_PROTFAULT 0x08000000 /* protection fault */
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400
@@ -327,52 +327,6 @@ do { \
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
@@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/ar
extern unsigned long __clear_user(void __user *addr, unsigned long size);
static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/
.show = cache_index_show,
};
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerpc/kernel/dma.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma.c linux-2.6.32.14/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerp
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arc
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/po
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/kgdb.c linux-2.6.32.14/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/power
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module_32.c linux-2.6.32.14/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/powerpc/kernel/module.c
---- linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module.c linux-2.6.32.14/arch/powerpc/kernel/module.c
+--- linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/pow
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/pci-common.c linux-2.6.32.14/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/powerpc/kernel/process.c
---- linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/process.c linux-2.6.32.14/arch/powerpc/kernel/process.c
+--- linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400
@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
@@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/po
-
- return ret;
-}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_32.c linux-2.6.32.14/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/
if (save_user_regs(regs, frame, 0, 1))
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_64.c linux-2.6.32.14/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/
}
return error;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vdso.c linux-2.6.32.14/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/power
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerpc/kernel/vio.c
---- linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vio.c linux-2.6.32.14/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerp
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/p
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/mm/fault.c
---- linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/mm/fault.c linux-2.6.32.14/arch/powerpc/mm/fault.c
+--- linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/mm/mmap_64.c linux-2.6.32.14/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerp
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/mm/slice.c
---- linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/mm/slice.c linux-2.6.32.14/arch/powerpc/mm/slice.c
+--- linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400
@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
@@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
.valid = lite5200_pm_valid,
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
.valid = mpc52xx_pm_valid,
.prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/a
.alloc_coherent = dma_fixed_alloc_coherent,
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
.alloc_coherent = ps3_alloc_coherent,
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390/include/asm/elf.h
---- linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/s390/include/asm/elf.h linux-2.6.32.14/arch/s390/include/asm/elf.h
+--- linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s390/include/asm/setup.h
---- linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/s390/include/asm/setup.h linux-2.6.32.14/arch/s390/include/asm/setup.h
+--- linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s3
#else
#define s390_noexec (0)
#endif
-diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/s390/include/asm/uaccess.h linux-2.6.32.14/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig
---- linux-2.6.32.11/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.14/arch/s390/Kconfig linux-2.6.32.14/arch/s390/Kconfig
+--- linux-2.6.32.14/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/kernel/module.c
---- linux-2.6.32.11/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/s390/kernel/module.c linux-2.6.32.14/arch/s390/kernel/module.c
+--- linux-2.6.32.14/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/k
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/kernel/setup.c
---- linux-2.6.32.11/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/s390/kernel/setup.c linux-2.6.32.14/arch/s390/kernel/setup.c
+--- linux-2.6.32.14/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/ke
static void setup_addressing_mode(void)
{
if (s390_noexec) {
-diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap.c
---- linux-2.6.32.11/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/s390/mm/mmap.c linux-2.6.32.14/arch/s390/mm/mmap.c
+--- linux-2.6.32.14/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/s
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/k
.show = sq_sysfs_show,
.store = sq_sysfs_store,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/kgdb.c
---- linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sh/kernel/kgdb.c linux-2.6.32.14/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400
@@ -14,18 +14,38 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/ar
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_32.h linux-2.6.32.14/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_64.h linux-2.6.32.14/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/a
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arc
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/a
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/a
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/kernel/iommu.c
---- linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/iommu.c linux-2.6.32.14/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc/kernel/ioport.c
---- linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/ioport.c linux-2.6.32.14/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/spar
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/spar
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc/kernel/Makefile
---- linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/Makefile linux-2.6.32.14/arch/sparc/kernel/Makefile
+--- linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400
@@ -3,7 +3,7 @@
#
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sp
.alloc_coherent = dma_4v_alloc_coherent,
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400
@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/kernel/traps_64.c linux-2.6.32.14/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400
@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
@@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/spa
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/lib/atomic_64.S linux-2.6.32.14/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib/ksyms.c
---- linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/lib/ksyms.c linux-2.6.32.14/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400
@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib
EXPORT_SYMBOL(atomic_sub_ret);
EXPORT_SYMBOL(atomic64_add);
EXPORT_SYMBOL(atomic64_add_ret);
-diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/lib/rwsem_64.S linux-2.6.32.14/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefile
---- linux-2.6.32.11/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/Makefile linux-2.6.32.14/arch/sparc/Makefile
+--- linux-2.6.32.14/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefi
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/mm/fault_32.c
---- linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_32.c linux-2.6.32.14/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/m
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/mm/fault_64.c
---- linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_64.c linux-2.6.32.14/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/m
/* Pure DTLB misses do not tell us whether the fault causing
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
-diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm/init_32.c
---- linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/mm/init_32.c linux-2.6.32.14/arch/sparc/mm/init_32.c
+--- linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/Makefile
---- linux-2.6.32.11/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/mm/Makefile linux-2.6.32.14/arch/sparc/mm/Makefile
+--- linux-2.6.32.14/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400
@@ -2,7 +2,7 @@
#
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/srmmu.c
---- linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/sparc/mm/srmmu.c linux-2.6.32.14/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/s
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/um/include/asm/kmap_types.h linux-2.6.32.14/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/include/asm/page.h
---- linux-2.6.32.11/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/um/include/asm/page.h linux-2.6.32.14/arch/um/include/asm/page.h
+--- linux-2.6.32.14/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/in
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/um/sys-i386/syscalls.c linux-2.6.32.14/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/s
/*
* Perform the select(nd, in, out, ex, tv) and mmap() system
* calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/bitops.h
---- linux-2.6.32.11/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/bitops.h linux-2.6.32.14/arch/x86/boot/bitops.h
+--- linux-2.6.32.14/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/boot.h
---- linux-2.6.32.11/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/boot.h linux-2.6.32.14/arch/x86/boot/boot.h
+--- linux-2.6.32.14/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/bo
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_32.S linux-2.6.32.14/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/ar
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_64.S linux-2.6.32.14/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/ar
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/misc.c linux-2.6.32.14/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/ar
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/relocs.c linux-2.6.32.14/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arc
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boot/cpucheck.c
---- linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/cpucheck.c linux-2.6.32.14/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boo
err = check_flags();
}
-diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/header.S
---- linux-2.6.32.11/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/header.S linux-2.6.32.14/arch/x86/boot/header.S
+--- linux-2.6.32.14/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5316,9 +5316,33 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
-diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/boot/video-vesa.c
---- linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/boot/memory.c linux-2.6.32.14/arch/x86/boot/memory.c
+--- linux-2.6.32.14/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400
+@@ -19,7 +19,7 @@
+
+ static int detect_memory_e820(void)
+ {
+- int count = 0;
++ unsigned int count = 0;
+ struct biosregs ireg, oreg;
+ struct e820entry *desc = boot_params.e820_map;
+ static struct e820entry buf; /* static so it is zeroed */
+diff -urNp linux-2.6.32.14/arch/x86/boot/video.c linux-2.6.32.14/arch/x86/boot/video.c
+--- linux-2.6.32.14/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400
+@@ -90,7 +90,7 @@ static void store_mode_params(void)
+ static unsigned int get_entry(void)
+ {
+ char entry_buf[4];
+- int i, len = 0;
++ unsigned int i, len = 0;
+ int key;
+ unsigned int v;
+
+diff -urNp linux-2.6.32.14/arch/x86/boot/video-vesa.c linux-2.6.32.14/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5327,9 +5351,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/b
}
/*
-diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32entry.S linux-2.6.32.14/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -5424,9 +5448,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32_signal.c linux-2.6.32.14/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -5445,9 +5469,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/arch/x86/include/asm/alternative.h
---- linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/alternative.h linux-2.6.32.14/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -5457,9 +5481,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/ar
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/include/asm/apm.h
---- linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/apm.h linux-2.6.32.14/arch/x86/include/asm/apm.h
+--- linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -5478,9 +5502,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/i
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_32.h linux-2.6.32.14/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -5811,9 +5835,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch
#define ATOMIC64_INIT(val) { (val) }
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_64.h linux-2.6.32.14/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -6391,9 +6415,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch
}
/**
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/include/asm/boot.h
---- linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/boot.h linux-2.6.32.14/arch/x86/include/asm/boot.h
+--- linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -6411,9 +6435,30 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86/include/asm/cache.h
---- linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/cacheflush.h linux-2.6.32.14/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400
+@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
+ static inline unsigned long get_page_memtype(struct page *pg)
+ {
+ if (!PageUncached(pg) && !PageWC(pg))
+- return -1;
++ return ~0UL;
+ else if (!PageUncached(pg) && PageWC(pg))
+ return _PAGE_CACHE_WC;
+ else if (PageUncached(pg) && !PageWC(pg))
+@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru
+ SetPageWC(pg);
+ break;
+ default:
+- case -1:
++ case ~0UL:
+ ClearPageUncached(pg);
+ ClearPageWC(pg);
+ break;
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/cache.h linux-2.6.32.14/arch/x86/include/asm/cache.h
+--- linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -6422,9 +6467,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86
#ifdef CONFIG_X86_VSMP
/* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/checksum_32.h linux-2.6.32.14/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -6458,9 +6503,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/ar
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/include/asm/desc.h
---- linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/desc.h linux-2.6.32.14/arch/x86/include/asm/desc.h
+--- linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -6554,7 +6599,66 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/
}
#define _LDT_empty(info) \
-@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_
+@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct
+ desc->limit = (limit >> 16) & 0xf;
+ }
+
+-static inline void _set_gate(int gate, unsigned type, void *addr,
++static inline void _set_gate(int gate, unsigned type, const void *addr,
+ unsigned dpl, unsigned ist, unsigned seg)
+ {
+ gate_desc s;
+@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u
+ * Pentium F0 0F bugfix can have resulted in the mapped
+ * IDT being write-protected.
+ */
+-static inline void set_intr_gate(unsigned int n, void *addr)
++static inline void set_intr_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
+@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig
+ /*
+ * This routine sets up an interrupt gate at directory privilege level 3.
+ */
+-static inline void set_system_intr_gate(unsigned int n, void *addr)
++static inline void set_system_intr_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
+ }
+
+-static inline void set_system_trap_gate(unsigned int n, void *addr)
++static inline void set_system_trap_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
+ }
+
+-static inline void set_trap_gate(unsigned int n, void *addr)
++static inline void set_trap_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
+@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne
+ static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
++ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
+ }
+
+-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
+ }
+
+-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+ BUG_ON((unsigned)n > 0xFF);
_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
}
@@ -6571,9 +6675,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x86/include/asm/device.h
---- linux-2.6.32.11/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/device.h linux-2.6.32.14/arch/x86/include/asm/device.h
+--- linux-2.6.32.14/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -6583,9 +6687,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x8
#endif
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -6625,9 +6729,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/ar
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/include/asm/e820.h
---- linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/e820.h linux-2.6.32.14/arch/x86/include/asm/e820.h
+--- linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
#define ISA_END_ADDRESS 0x100000
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6637,9 +6741,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/include/asm/elf.h
---- linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/elf.h linux-2.6.32.14/arch/x86/include/asm/elf.h
+--- linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400
@@ -257,7 +257,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -6693,9 +6797,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86/include/asm/futex.h
---- linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/futex.h linux-2.6.32.14/arch/x86/include/asm/futex.h
+--- linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
@@ -6832,9 +6936,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86
: "memory"
);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/include/asm/i387.h
---- linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/i387.h linux-2.6.32.14/arch/x86/include/asm/i387.h
+--- linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -6875,9 +6979,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86/include/asm/io_64.h
---- linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.14/arch/x86/include/asm/io_64.h linux-2.6.32.14/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -6896,9 +7000,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86
#include <asm-generic/iomap.h>
void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86/include/asm/iommu.h
---- linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-04-04 2