summaryrefslogtreecommitdiff
path: root/extra/apache
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-08-03 17:45:52 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-08-03 17:45:52 +0200
commit513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch)
tree161509e3271db459f14f8c69de7c52d4902ba107 /extra/apache
parent8183144fe6e064d80985ac810f6178a3cf289d0d (diff)
parente191a289464c21aafe7478065ea7ed3ddda0766f (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/arm-elf-binutils/PKGBUILD community/bird/PKGBUILD community/cantata/PKGBUILD community/dbmail/PKGBUILD community/ekg2/PKGBUILD community/ffmpeg-compat/PKGBUILD community/gigedit/PKGBUILD community/gimp-refocus/PKGBUILD community/gmime24/PKGBUILD community/gmpc/PKGBUILD community/gnash/PKGBUILD community/id3lib-rcc/PKGBUILD community/linuxsampler/PKGBUILD community/lwm/PKGBUILD community/midori/PKGBUILD community/mplayer2/PKGBUILD community/mtpaint/PKGBUILD community/nestopia/PKGBUILD community/preload/PKGBUILD community/projectm/PKGBUILD community/rusxmms/PKGBUILD community/taglib-rcc/PKGBUILD community/the_silver_searcher/PKGBUILD community/xnee/PKGBUILD core/libgcrypt/PKGBUILD core/libusbx/PKGBUILD core/mkinitcpio-busybox/PKGBUILD extra/a2ps/PKGBUILD extra/a52dec/PKGBUILD extra/abook/PKGBUILD extra/avidemux/PKGBUILD extra/bzflag/PKGBUILD extra/cln/PKGBUILD extra/exempi/PKGBUILD extra/ffmpeg/PKGBUILD extra/fluxter/PKGBUILD extra/fontforge/PKGBUILD extra/glib/PKGBUILD extra/gnet/PKGBUILD extra/gnome-vfs/PKGBUILD extra/gnutls/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gtk/PKGBUILD extra/idnkit/PKGBUILD extra/ilmbase/PKGBUILD extra/imake/PKGBUILD extra/kdenetwork/PKGBUILD extra/libdatrie/PKGBUILD extra/libmbim/PKGBUILD extra/libmp3splt/PKGBUILD extra/libqmi/PKGBUILD extra/libtxc_dxtn/PKGBUILD extra/libxfont/PKGBUILD extra/mesa/PKGBUILD extra/modemmanager/PKGBUILD extra/nedit/PKGBUILD extra/nmap/PKGBUILD extra/openexr/PKGBUILD extra/purple-plugin-pack/PKGBUILD extra/qemu/PKGBUILD extra/qtwebkit/PKGBUILD extra/subversion/PKGBUILD extra/transmission/PKGBUILD extra/truecrypt/PKGBUILD extra/vigra/PKGBUILD extra/virtuoso/PKGBUILD extra/vlc/PKGBUILD extra/wireshark/PKGBUILD extra/wxmaxima/PKGBUILD extra/x264/PKGBUILD extra/xorg-iceauth/PKGBUILD extra/xorg-mkfontscale/PKGBUILD extra/xorg-xfd/PKGBUILD libre/abuse-libre/PKGBUILD libre/clementine-libre/PKGBUILD libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/apache')
-rw-r--r--extra/apache/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 6602b518b..1ee8ea565 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $
+# $Id: PKGBUILD 190843 2013-07-18 19:19:10Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apache
-pkgver=2.2.24
-pkgrel=3
+pkgver=2.2.25
+pkgrel=1
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64' 'mips64el')
options=('!libtool')
@@ -38,7 +38,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
httpd.logrotate
httpd.service
arch.layout)
-md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045'
'SKIP'
'f1d9d41360908ceb2374da55ae99197a'
'cdfa04985a0efa850976aef01c2a0c40'