summaryrefslogtreecommitdiff
path: root/community/yaws
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 /community/yaws
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 'community/yaws')
-rw-r--r--community/yaws/PKGBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 0b32e20c4..412bca218 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 88640 2013-04-20 21:08:12Z arodseth $
+# $Id: PKGBUILD 94952 2013-08-01 13:32:19Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Patrick Smits <mail@patricksmits.net>
pkgname=yaws
pkgver=1.96
-pkgrel=1
+pkgrel=2
pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
arch=('x86_64' 'i686' 'mips64el')
url='http://yaws.hyber.org/'
license=('BSD')
-depends=('pam' 'erlang')
+depends=('pam' 'erlang') # segfaults with erlang-nox
backup=('etc/yaws/yaws.conf')
options=('!emptydirs')
install=$pkgname.install
-optdepends=('erlang-nox: Erlang without X (headless)')
source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
"$pkgname.service")
sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2'
@@ -27,6 +26,8 @@ prepare() {
for file in cgi.yaws cgi-bin/foo.py; do
sed -i '0,/on/s//on2/' "www/$file"
done
+ # R16B1 fix
+ sed -i 's/:sha(Salted)/:hash(sha, Salted)/' src/yaws_websockets.erl
}
build() {