diff options
Diffstat (limited to 'testing')
31 files changed, 1827 insertions, 17 deletions
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD new file mode 100644 index 000000000..cc21970ba --- /dev/null +++ b/testing/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 139133 2011-09-30 07:33:19Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Mildred <mildred593 at online dot fr> + +pkgname=claws-mail-extra-plugins +pkgver=3.7.10 +pkgrel=2 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.7.10') +makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus-core: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin' + 'libsoup-gnome: for the fancy webkit html plugin' + 'python2: for python plugin' + 'libgdata: for gdata plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' + 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' + 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' + 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool' '!strip') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + webkit1.6.1.patch) +md5sums=('fe782b2d4762c9727e22c1bb7979f7d6' + '8b94fa44072331b9c3926607eb42ba26') +sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf' + '8efd800617406dfe58a14422f243a678c582a90d') + +build() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + + # fix for new webkit api + pushd fancy* + patch -Np0 -i ${srcdir}/webkit1.6.1.patch + popd + + # fix for python2 + export PYTHON="/usr/bin/python2" + + # fix gdata plugin build + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure + + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && ( + cd $dir + + ./configure --prefix=/usr --disable-static + make + ) + done +} + +package() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && + make -C $dir DESTDIR="$pkgdir" install + done + + # fix fileconflict with libical, #11485 + rm -f "$pkgdir/usr/include/ical.h" +} diff --git a/testing/claws-mail-extra-plugins/webkit1.6.1.patch b/testing/claws-mail-extra-plugins/webkit1.6.1.patch new file mode 100644 index 000000000..82bc5d062 --- /dev/null +++ b/testing/claws-mail-extra-plugins/webkit1.6.1.patch @@ -0,0 +1,106 @@ +--- src/fancy_viewer.c 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.c 2011-09-30 06:02:45.000000000 +0200 +@@ -83,8 +83,10 @@ + static void download_file_cb(GtkWidget *widget, FancyViewer *viewer); + #endif + +-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */ +-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView); ++#if !WEBKIT_CHECK_VERSION (1,5,1) ++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view); ++#endif ++ + /*------*/ + static GtkWidget *fancy_get_widget(MimeViewer *_viewer) + { +@@ -243,6 +245,8 @@ + + gtk_print_unix_dialog_set_manual_capabilities(print_dialog, + GTK_PRINT_CAPABILITY_GENERATE_PS); ++ gtk_print_unix_dialog_set_manual_capabilities(print_dialog, ++ GTK_PRINT_CAPABILITY_PREVIEW); + + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (dialog); +@@ -293,7 +297,19 @@ + { + debug_print("fancy_get_selection\n"); + FancyViewer *viewer = (FancyViewer *) _viewer; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ gchar *sel = webkit_dom_range_get_text (viewer->range); ++#else + gchar *sel = webkit_web_view_get_selected_text(viewer->view); ++#endif + if (!viewer->view || strlen(sel) == 0) { + g_free(sel); + return NULL; +@@ -686,7 +702,15 @@ + debug_print("Clicked on Search on Web\n"); + if (webkit_web_view_has_selection(viewer->view)) { + gchar *search; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ gchar *tmp = webkit_dom_range_get_text (viewer->range); ++#else + gchar *tmp = webkit_web_view_get_selected_text(viewer->view); ++#endif + search = g_strconcat(GOOGLE_SEARCH, tmp, NULL); + webkit_web_view_open(viewer->view, search); + g_free(search); +@@ -896,7 +920,6 @@ + static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, + FancyViewer *viewer) + { +- /*FIXME hack..until webkit does not give the proper way to handle it*/ + Plugin *plugin = plugin_get_loaded_by_name("RSSyl"); + gtk_container_foreach(GTK_CONTAINER(menu), + (GtkCallback)viewer_menu_handler, +@@ -941,7 +964,19 @@ + if (webkit_web_view_can_copy_clipboard(view)) { + GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + const gchar *sel_text; +- sel_text = (const gchar*)webkit_web_view_get_selected_text(view); ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range); ++#else ++ sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view); ++#endif + gtk_clipboard_set_text(wv_clipboard, sel_text, -1); + } + return FALSE; +--- src/fancy_viewer.h 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.h 2011-09-30 06:02:45.000000000 +0200 +@@ -113,6 +113,14 @@ + gint tag; + gint loading; + gint stop_previous; ++ ++ /* DOM Objects */ ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ WebKitDOMDocument *doc; ++ WebKitDOMDOMWindow *window; ++ WebKitDOMDOMSelection *selection; ++ WebKitDOMRange *range; ++#endif + }; + #define OPEN_INTERNAL FALSE + #define OPEN_EXTERNAL TRUE diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD new file mode 100644 index 000000000..eca5f998a --- /dev/null +++ b/testing/clutter-gst/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 139157 2011-09-30 11:58:56Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=clutter-gst +pkgver=1.4.0 +pkgrel=1 +pkgdesc="GStreamer bindings for clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org/" +license=('LGPL') +depends=('clutter' 'gstreamer0.10-base' 'libxdamage') +makedepends=('gobject-introspection' 'gtk-doc') +options=('!libtool') +source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/fwbuilder/PKGBUILD b/testing/fwbuilder/PKGBUILD new file mode 100644 index 000000000..b0e0eb0c8 --- /dev/null +++ b/testing/fwbuilder/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 139139 2011-09-30 09:12:13Z eric $ +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=fwbuilder +pkgver=5.0.0.3568 +pkgrel=2 +pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" +url="http://www.fwbuilder.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libxslt' 'net-snmp' 'qt') +conflicts=('libfwbuilder') +install=fwbuilder.install +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz") +md5sums=('0324edab10329dde029953d646aa8dad') + +build() { + cd "${srcdir}/fwbuilder-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/fwbuilder-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/testing/fwbuilder/fwbuilder.install b/testing/fwbuilder/fwbuilder.install new file mode 100644 index 000000000..45f0c2242 --- /dev/null +++ b/testing/fwbuilder/fwbuilder.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD index 9792cc7d3..4e9c5a3b2 100644 --- a/testing/gnome-games/PKGBUILD +++ b/testing/gnome-games/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 138917 2011-09-28 19:30:24Z ibiru $ +# $Id: PKGBUILD 139159 2011-09-30 12:26:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') +depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -provides=('glchess') -conflicts=('glchess') options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" diff --git a/testing/hplip/PKGBUILD b/testing/hplip/PKGBUILD new file mode 100644 index 000000000..f91e41043 --- /dev/null +++ b/testing/hplip/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 139141 2011-09-30 09:12:15Z eric $ +# Maintainer : Rémy Oudompheng <remy@archlinux.org> +# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> + +pkgname=hplip +pkgver=3.11.7 +pkgrel=2 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +arch=('i686' 'x86_64') +url="http://hplipopensource.com" +license=('GPL') +makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups') +depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' + 'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat') +optdepends=('cups: for printing support' + 'dbus-python: for dbus support' + 'sane: for scanner support' + 'python-imaging: for commandline scanning support' + 'python-notify: for Desktop notification support' + 'rpcbind: for network support' + 'python2-qt: for running hp-toolbox' + 'pygobject: for running hp-toolbox' + 'hplip-plugin: binary blobs for specific devices') +replaces=('hpijs') +options=('!libtool') +install=hplip.install +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} + hplip-cups-1.5.0-compatibility.patch) +md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1' + 'f4422ee0dc842e1a53b75c24f468d65c' + 'a767000ce920e9f7f6a5b0a8e4392ef9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch" + export PYTHON=python2 + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + ./configure --prefix=/usr \ + --enable-qt4 \ + --enable-foomatic-rip-hplip-install \ + --enable-foomatic-ppd-install \ + --enable-hpcups-install \ + --enable-cups-drv-install \ + --enable-hpijs-install \ + --enable-foomatic-drv-install \ + --enable-pp-build \ + --enable-udev-acl-rules + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + rm -rf "$pkgdir/etc/sane.d" + # remove autostart of hp-daemon + rm -r "$pkgdir/etc/xdg" + # move udev rules to /lib/udev/rules.d + mkdir -p "$pkgdir/lib/udev/rules.d" + mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" + rm -r "$pkgdir/etc/udev" + # remove lp user, it's not used on archlinux + sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" + # fix sysfs rules + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + -e 's|"bin/sh|"/bin/sh|g' \ + "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" +} + diff --git a/testing/hplip/hplip-cups-1.5.0-compatibility.patch b/testing/hplip/hplip-cups-1.5.0-compatibility.patch new file mode 100644 index 000000000..a4039e6c9 --- /dev/null +++ b/testing/hplip/hplip-cups-1.5.0-compatibility.patch @@ -0,0 +1,10 @@ +--- hplip-3.11.7~/prnt/hpps/hppsfilter.c 2011-07-24 18:58:05.000000000 +0000 ++++ hplip-3.11.7/prnt/hpps/hppsfilter.c 2011-08-09 20:51:54.150214165 +0000 +@@ -38,6 +38,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <cups/cups.h> ++#include <cups/ppd.h> + #include <sys/types.h> + #include <sys/stat.h> + diff --git a/testing/hplip/hplip.install b/testing/hplip/hplip.install new file mode 100644 index 000000000..cb0eaf8e8 --- /dev/null +++ b/testing/hplip/hplip.install @@ -0,0 +1,10 @@ +post_install() { + cat << EOF + +NOTE +---- +# If you want to use this driver with sane: +# echo "hpaio" >> /etc/sane.d/dll.conf + +EOF +} diff --git a/testing/hpoj/PKGBUILD b/testing/hpoj/PKGBUILD new file mode 100644 index 000000000..a523ec699 --- /dev/null +++ b/testing/hpoj/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 139143 2011-09-30 09:12:18Z eric $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + + +pkgname=hpoj +pkgver=0.91 +pkgrel=17 +pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers" +arch=('i686' 'x86_64') +url="http://hpoj.sourceforge.net" +license=('GPL' 'custom') +depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2') +makedepends=('qt3') +optdepends=('qt3: for using xojpanel') +install=hpoj.install +source=(http://downloads.sourceforge.net/sourceforge/hpoj/$pkgname-$pkgver.tgz \ + hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch \ + hpoj_gcc43.diff hpoj0.91-snmp5.5.patch) +md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\ + '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\ + '42bb57791cacf83e4d339e3653ad003e' 'af1cf13e95ff2654b84e470d0e18f537') +sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7'\ + 'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' '80258e3190ffb514c20386e8a7cf70ee18df95a5'\ + '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a') + +build() { + cd "$srcdir"/$pkgname-$pkgver + # adding various patches + patch -Np1 -i ../hpoj-gcc4.patch + patch -Np1 -i ../hpoj-kernel26.patch + patch -Np1 -i ../hpoj-pack.patch + patch -Np1 -i ../hpoj_gcc43.diff + patch -Np1 -i ../hpoj0.91-snmp5.5.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make prefix="$pkgdir"/usr/ user_install + mkdir -p "$pkgdir"/etc/rc.d + mkdir -p "$pkgdir"/usr/lib/sane + mkdir -p "$pkgdir"/usr/lib/cups/backend + install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL + cd "$pkgdir"/usr/lib/sane + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1 + ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d + ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal + } diff --git a/testing/hpoj/hpoj-gcc4.patch b/testing/hpoj/hpoj-gcc4.patch new file mode 100644 index 000000000..ab1c125dd --- /dev/null +++ b/testing/hpoj/hpoj-gcc4.patch @@ -0,0 +1,194 @@ +--- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4 2002-07-25 11:01:24.000000000 +0200 ++++ hpoj-0.91/lib/hpojip/xjpg_fix.c 2005-03-01 23:05:52.905482223 +0100 +@@ -389,7 +389,7 @@ + \*****************************************************************************/ + + +-#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader) ++#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader) + #define MYWRITE(p) lenAddedHeader+=sizeof(*(p)) + #define MYWRITEBUF(data,datalen) \ + do { \ +--- hpoj-0.91/mlcd/ExMgr.h.gcc4 2003-11-04 02:03:18.000000000 +0100 ++++ hpoj-0.91/mlcd/ExMgr.h 2005-03-01 23:38:34.297977986 +0100 +@@ -127,8 +127,8 @@ + QueueEntry(): prev(0),next(0) { } + #ifdef JD_DEBUGLITE + void dump(void) { +- printf("QueueEntry(0x%8.8X): prev=0x%8.8X, next=0x%8.8X\n", +- (int)this,(int)prev,(int)next); ++ printf("QueueEntry(%p): prev=%p, next=%p\n", ++ this,prev,next); + } + #endif + int isEnqueued(void) { return (prev || next); } +--- hpoj-0.91/mlcd/ExMgr.cpp.gcc4 2003-11-04 02:03:18.000000000 +0100 ++++ hpoj-0.91/mlcd/ExMgr.cpp 2005-03-01 23:41:49.408864110 +0100 +@@ -248,8 +248,8 @@ + + #ifdef JD_DEBUGLITE + void ExWatchdogTimer::dump(void) { +- printf("pMsgHandler=0x%8.8X\n",(int)pMsgHandler); +- printf("pMsg=0x%8.8X\n",(int)pMsg); ++ printf("pMsgHandler=%p\n",pMsgHandler); ++ printf("pMsg=%p\n",pMsg); + printf("delay=%d seconds, %d usec\n", + (int)delay.tv_sec,(int)delay.tv_usec); + printf("cancelled=%d\n",cancelled); +@@ -1307,13 +1307,13 @@ + printf("\tstate=%d\n",session[scd].state); + printf("\tfd=%d\n",session[scd].fd); + printf("\tscdlink=%d\n",session[scd].scdlink); +- printf("\tpLookup=0x%8.8X\n",(int)session[scd].pLookup); ++ printf("\tpLookup=%p\n",session[scd].pLookup); + printf("\toutstandingForwardBdrCount=%d\n", + session[scd].outstandingForwardBdrCount); + printf("\tpReverseBdrQueue: depth=%d\n", + session[scd].pReverseBdrQueue->depth()); +- printf("\ttcd=0x%8.8X\n",(int)session[scd].tcd); +- printf("\tpCommandBdr=0x%8.8X\n",(int)session[scd].pCommandBdr); ++ printf("\ttcd=%p\n",session[scd].tcd); ++ printf("\tpCommandBdr=%p\n",session[scd].pCommandBdr); + printf("\tpmlTrapsRegistered=%d\n",session[scd].pmlTrapsRegistered); + printf("\tbitbucketSocket=%d\n",session[scd].bitbucketSocket); + +@@ -2407,8 +2407,8 @@ + } + printf("llioPossibleNameCount=%d\n",llioPossibleNameCount); + printf("llioName=<%s>\n",SAFE_STRING(llioName)); +- printf("llioGlobBuffer.gl_pathc=%d\n",llioGlobBuffer.gl_pathc); +- printf("llioGlobBuffer.gl_offs=%d\n",llioGlobBuffer.gl_offs); ++ printf("llioGlobBuffer.gl_pathc=%lu\n",(unsigned long)llioGlobBuffer.gl_pathc); ++ printf("llioGlobBuffer.gl_offs=%lu\n",(unsigned long)llioGlobBuffer.gl_offs); + printf("llioGlobFlags=%d\n",llioGlobFlags); + for (i=0;i<llioMatchDeviceIDCount;i++) { + printf("llioMatchDeviceID[%d]=<%s>\n",i, +--- hpoj-0.91/mlcd/transport/ExTransport.cpp.gcc4 2005-03-04 14:00:57.000000000 +0000 ++++ hpoj-0.91/mlcd/transport/ExTransport.cpp 2005-03-04 14:03:37.000000000 +0000 +@@ -70,6 +70,7 @@ + + #ifdef JD_DEBUGLITE + void ExLookup::dump(void) { ++#if 0 + printf("sizeof(ExLookup)=%d, this=0x%8.8X\n", + sizeof(ExLookup),(int)this); + printf("pService=0x%8.8X\n", +@@ -82,6 +83,7 @@ + lastSet); + printf("status=%d\n", + status); ++#endif + } + void ExLookup__dump(ExLookup *_this) { + return _this->dump(); +@@ -316,6 +318,7 @@ + + #ifdef JD_DEBUGLITE + void ExTransportChannel::dump(void) { ++#if 0 + printf("this=0x%8.8X\n", + (int)this); + printf("port=%d\n", +@@ -378,6 +381,7 @@ + currentGrabbedCredit); + printf("currentGrabbedTransaction=%d\n", + currentGrabbedTransaction); ++#endif + } + #endif + +@@ -922,6 +926,7 @@ + #ifdef JD_DEBUGLITE + + void ExTransport::dump(void) { ++#if 0 + int channel; + + printf("this=0x%8.8X\n", +@@ -971,6 +976,7 @@ + if (pLookupRequest) { + pLookupRequest->dump(); + } ++#endif + } + + void ExTransport::dumpall(void) { +@@ -1101,7 +1107,7 @@ + ExMsg *pMsg=pMgr->getFreeMsg(); + + pMsg->setType(eEXMSG_ACTIVATE_WAIT); +- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this); ++ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this); // HACK + pMsg->send(pMgr); + } + +@@ -1248,7 +1254,7 @@ + ExMsg *pMsg=pMgr->getFreeMsg(); + + pMsg->setType(eEXMSG_ACTIVATE_RESPONSE); +- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status); ++ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK + pMsg->send(pMgr); + } + +@@ -1282,7 +1288,7 @@ + ExMsg *pMsg=pMgr->getFreeMsg(); + + pMsg->setType(eEXMSG_DEACTIVATE_RESPONSE); +- pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status); ++ pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK + pMsg->send(pMgr); + } + +--- hpoj-0.91/mlcd/transport/ExMlcTransport.cpp.gcc4 2005-03-04 14:28:28.000000000 +0000 ++++ hpoj-0.91/mlcd/transport/ExMlcTransport.cpp 2005-03-04 14:29:40.000000000 +0000 +@@ -409,6 +409,7 @@ + + #ifdef JD_DEBUGLITE + void ExMlcTransportChannel::dump(void) { ++#if 0 + ExTransportChannel::dump(); + printf("----------------\n"); + printf("pMlcTransport=0x%8.8X\n", +@@ -487,6 +488,7 @@ + countHandleEmptyCreditRequestReply.get()); + printf("isGusher=%d\n", + isGusher()); ++#endif + } + #endif + +@@ -1597,6 +1599,7 @@ + + #ifdef JD_DEBUGLITE + void ExMlcTransport::dump(void) { ++#if 0 + int i; + + ExTransport::dump(); +@@ -1631,6 +1634,7 @@ + remoteSocketArray[i].maxForwardPacketSize, + remoteSocketArray[i].maxReversePacketSize); + } ++#endif + } + #endif + +--- hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp.gcc4 2005-03-04 14:37:19.000000000 +0000 ++++ hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp 2005-03-04 14:37:46.000000000 +0000 +@@ -214,6 +214,7 @@ + + #ifdef JD_DEBUGLITE + void ExMlcCommandChannel::dump(void) { ++#if 0 + ExMlcTransportChannel::dump(); + printf("----------------\n"); + printf("pForwardCommandPool=0x%8.8X\n", +@@ -238,6 +239,7 @@ + lastPsid); + printf("lastSsid=%d\n", + lastSsid); ++#endif + } + #endif + diff --git a/testing/hpoj/hpoj-kernel26.patch b/testing/hpoj/hpoj-kernel26.patch new file mode 100644 index 000000000..38b8d0464 --- /dev/null +++ b/testing/hpoj/hpoj-kernel26.patch @@ -0,0 +1,86 @@ +--- hpoj-0.91/scripts/ptal-init.in.kernel26 2004-03-03 17:30:47.000000000 +0000 ++++ hpoj-0.91/scripts/ptal-init.in 2004-03-03 17:30:59.000000000 +0000 +@@ -90,6 +90,11 @@ + my $varLock="/var/lock"; + my $varLockSubsys="$varLock/subsys"; + my $osPlatform=`uname -s 2>/dev/null`; ++chomp $osPlatform; ++my $linuxVersion=($osPlatform eq 'Linux' ? `uname -r 2>/dev/null` : ''); ++$linuxVersion=~s/^(\s*)(\d+\.\d+)(\..*)$/$2/; ++chomp $linuxVersion; ++my $usbprintermodule = ($linuxVersion eq '2.6' ? "usblp" : "printer"); + my %devnames; + my %obsoleteDevnames; + my %configInfo; +@@ -1222,12 +1227,12 @@ + # undef -- skip USB probe + # 0 -- do nothing, proceed with USB probe + # >0 -- load printer.o +-# <0 -- disable and unload printer.o ++# <0 -- disable and unload printer.o/usblp.o + sub linuxWhatShouldWeDoAboutUsbPrinterModule { + my $isSmp=&linuxIsSmp; + my $libusbSupported=&ptalMlcdSupportsLibusb; + my $usblpIsLoaded=&linuxUsblpIsLoaded; +- my $printerIsLoaded=&linuxModuleIsLoaded("printer"); ++ my $printerIsLoaded=&linuxModuleIsLoaded($usbprintermodule); + + # non-SMP: + if (!$isSmp) { +@@ -1261,9 +1266,10 @@ + } + goto allowInsmodPrinter; + +- # SMP, libusb support, some sort of printer.c functionality loaded: ++ # SMP, libusb support, some sort of printer.c/usblp.c ++ # functionality loaded: + } elsif ($usblpIsLoaded) { +- # printer.c compiled into the kernel: ++ # printer.c/usblp.c compiled into the kernel: + if (!$printerIsLoaded) { + if (!&askYN( + "\n". +@@ -1280,7 +1286,7 @@ + return undef; + } + +- # printer.c compiled and loaded as a module: ++ # printer.c/usblp.c compiled and loaded as a module: + } else { + promptDisableRmmodPrinter: + my $r=&askYN( +@@ -1301,8 +1307,9 @@ + } + } + +- # SMP, libusb support, printer.c enabled although not loaded: +- } elsif (!&linuxModuleIsDisabled("printer")) { ++ # SMP, libusb support, printer.c/usblp.c enabled although not ++ # loaded: ++ } elsif (!&linuxModuleIsDisabled($usbprintermodule)) { + goto promptDisableRmmodPrinter; + } + +@@ -1326,11 +1333,11 @@ + return 1; + } + if ($r<0) { +- $r=&linuxDisableAndUnloadModule("printer", ++ $r=&linuxDisableAndUnloadModule($usbprintermodule, + "to prevent possible system instability due to SMP+USB"); + } else { + linuxJustLoad: +- $r=&linuxInsmod("printer",$quiet); ++ $r=&linuxInsmod($usbprintermodule,$quiet); + } + if (!$r && !$quiet && + &askYN("\n*** Continue with the USB probe anyway".$msg,0)) { +@@ -1601,7 +1608,7 @@ + + } else { + my $parModulesLoaded=0; +- # Don't "modprobe printer" on SMP Linux with libusb support: ++ # Don't "modprobe printer/usblp" on SMP Linux with libusb support: + my $usbModulesLoaded= + (&ptalMlcdSupportsLibusb && + $osPlatform=~/Linux/ && &linuxIsSmp); diff --git a/testing/hpoj/hpoj-pack.patch b/testing/hpoj/hpoj-pack.patch new file mode 100644 index 000000000..beb7040dc --- /dev/null +++ b/testing/hpoj/hpoj-pack.patch @@ -0,0 +1,59 @@ +There is a rather scary and longstanding GCC bug [1] which causes +instant crashes if a program defines a struct with function-pointers +and that structure happens to be "packed". Why anybody would want to +do such a thing is beyond me, but suffice it to say that hpoj v0.91 is +doing precisely that. The current Debian/sarge package for hpoj is +definitely affected (any attempt to scan an image results in an +instant crash). + +A patch to work around the problem is attached. + +Perhaps the hpoj developers can tell us whether it was really +intentional to have the #pragma pack(1) span all of <stdlib.h> and +<xform.h>? + +Thanks, + + --david + +[1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1844 + +--- hpoj-0.91/include/hpojip.h 2002-07-25 02:01:24.000000000 -0700 ++++ hpoj-0.91-davidm/include/hpojip.h 2004-11-11 21:19:58.775236374 -0800 +@@ -131,12 +132,15 @@ + float fl; + } DWORD_OR_PVOID; + ++#pragma pack () ++ + #ifdef HPOJIP_INTERNAL + #include "../lib/hpojip/xform.h" // this file uses the above definitions + #else + typedef struct IP_XFORM_TBL_s FAR *LPIP_XFORM_TBL; + #endif + ++#pragma pack (1) + + /****************************************************************************\ + **************************************************************************** +@@ -587,8 +591,6 @@ + + EXPORT(WORD) ipGetFuncPtrs (LPIP_JUMP_TBL lpJumpTbl); + +-#pragma pack () +- + /****************************************************************************\ + **************************************************************************** + * + + +------------------------------------------------------- +This SF.Net email is sponsored by: +Sybase ASE Linux Express Edition - download now for FREE +LinuxWorld Reader's Choice Award Winner for best database on Linux. +http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click + +_______________________________________________ +hpoj-devel mailing list +hpoj-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/hpoj-devel diff --git a/testing/hpoj/hpoj.install b/testing/hpoj/hpoj.install new file mode 100644 index 000000000..acce9b033 --- /dev/null +++ b/testing/hpoj/hpoj.install @@ -0,0 +1,7 @@ +post_install() { +cat << EOF +==> To get the HP-Officejet working run as root: ptal-init setup +==> Add ptal-init to /etc/rc.conf daemon list and place it before cups is started! +==> To access scanner enable in /etc/sane.d/dll.conf hpoj line. +EOF +} diff --git a/testing/hpoj/hpoj0.91-snmp5.5.patch b/testing/hpoj/hpoj0.91-snmp5.5.patch new file mode 100644 index 000000000..2042d6f1a --- /dev/null +++ b/testing/hpoj/hpoj0.91-snmp5.5.patch @@ -0,0 +1,11 @@ +diff -Naur hpoj-0.91-orig/lib/ptal/ptal-hpjd.c hpoj-0.91/lib/ptal/ptal-hpjd.c +--- hpoj-0.91-orig/lib/ptal/ptal-hpjd.c 2010-02-19 22:33:54.000000000 -0500 ++++ hpoj-0.91/lib/ptal/ptal-hpjd.c 2010-02-19 22:34:45.000000000 -0500 +@@ -45,6 +45,7 @@ + #include <stdlib.h> + + #ifdef HAVE_SNMP ++#include <net-snmp/net-snmp-config.h> + #include <asn1.h> + #include <snmp.h> + #include <snmp_api.h> diff --git a/testing/hpoj/hpoj_gcc43.diff b/testing/hpoj/hpoj_gcc43.diff new file mode 100644 index 000000000..099c9d755 --- /dev/null +++ b/testing/hpoj/hpoj_gcc43.diff @@ -0,0 +1,20 @@ +diff -Nru --exclude changelog hpoj-0.91/mlcd/transport/ExMlcTransport.h hpoj-0.91/mlcd/transport/ExMlcTransport.h +--- hpoj-0.91/mlcd/transport/ExMlcTransport.h 2003-11-04 06:33:19.000000000 +0530 ++++ hpoj-0.91/mlcd/transport/ExMlcTransport.h 2008-03-20 10:14:02.000000000 +0530 +@@ -888,14 +888,14 @@ + void remsockReset(void); + public: + STATUS remsockLookup(int socketID,int *pState, +- int *pMaxForwardPacketSize,int *pMaxForwardPacketSize); ++ int *pMaxForwardPacketSize,int *pMaxForwardPacketSize2); + STATUS remsockAdd(int socketID); + void handleConfigSocketReply(int result,int socketID, + int maxPriToSecPacketSize,int maxSecToPriPacketSize, + int statusLevel); + protected: + STATUS remsockUpdate(int socketID, +- int maxForwardPacketSize,int maxForwardPacketSize); ++ int maxForwardPacketSize,int maxForwardPacketSize2); + STATUS remsockDelete(int socketID); + + // Peripheral-initiated opens (not supported): diff --git a/testing/icedtea-web-java7/PKGBUILD b/testing/icedtea-web-java7/PKGBUILD index 91d3c1290..5aa4b468f 100644 --- a/testing/icedtea-web-java7/PKGBUILD +++ b/testing/icedtea-web-java7/PKGBUILD @@ -4,16 +4,18 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.1.3 -_date=20110925 -pkgrel=0.${_date}.1 +#_date=20110925 +#pkgrel=0.${_date}.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'xulrunner') -source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz) +source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz + http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz -md5sums=('5da8a5aa74fb92fcb84cb9921c909ab1') -sha1sums=('b9b1fb5ee4f280945cd22731af49f25038592607') +md5sums=('0e2e653c7436d81edcbc1d4255571ab6') +sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk diff --git a/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch new file mode 100644 index 000000000..5352688a2 --- /dev/null +++ b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch @@ -0,0 +1,40 @@ +From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001 +From: Ionut Biru <ibiru@archlinux.org> +Date: Fri, 30 Sep 2011 10:57:14 +0000 +Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN + +Signed-off-by: Ionut Biru <ibiru@archlinux.org> +--- + libepc/enums.c.in | 2 +- + libepc/enums.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libepc/enums.c.in b/libepc/enums.c.in +index 75f737c..bc81b84 100644 +--- a/libepc/enums.c.in ++++ b/libepc/enums.c.in +@@ -65,7 +65,7 @@ G@Type@Class* + * + * Returns: The string representation of @value, or %NULL. + */ +-G_CONST_RETURN gchar* ++const gchar* + @enum_name@_to_string (@EnumName@ value) + { + const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value); +diff --git a/libepc/enums.h.in b/libepc/enums.h.in +index fea8b07..48973e5 100644 +--- a/libepc/enums.h.in ++++ b/libepc/enums.h.in +@@ -19,7 +19,7 @@ G_BEGIN_DECLS + + GType @enum_name@_get_type (void) G_GNUC_CONST; + G@Type@Class* @enum_name@_get_class (void) G_GNUC_CONST; +-G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; ++const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; + /*** END value-header ***/ + + /*** BEGIN file-tail ***/ +-- +1.7.6.4 + diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD new file mode 100644 index 000000000..21b5e79d7 --- /dev/null +++ b/testing/libepc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 139151 2011-09-30 11:14:26Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libepc +pkgver=0.4.1 +pkgrel=1 +pkgdesc="Easy Publish and Consume Library" +arch=(i686 x86_64) +license=('LGPL') +url="http://live.gnome.org/libepc" +depends=('gtk3' 'avahi' 'libsoup') +makedepends=('intltool' 'gtk-doc' 'gnome-common') +options=('!libtool' '!makeflags') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz + 0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch) +sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e' + 'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch" + gnome-autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + + diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD new file mode 100644 index 000000000..4f3080b9e --- /dev/null +++ b/testing/net-snmp/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 139145 2011-09-30 09:12:20Z eric $ +# Maintainer: +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.7.1 +pkgrel=1 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('BSD') +depends=('openssl' 'libnl' 'pciutils') +makedepends=('python2-distribute') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +backup=('etc/conf.d/snmpd') +options=('!libtool' '!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + snmpd.confd snmpd.rc) +sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' + '2bdc2839ce09d7daa608cd54687fa8beb47ed907' + 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' + '90600c0141eed10d6e3ca3ccc97ad8dda15c2112') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" + make NETSNMP_DONT_CHECK_VERSION=1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd new file mode 100644 index 000000000..926b09bbf --- /dev/null +++ b/testing/net-snmp/snmpd.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to snmpd +# +SNMPD_ARGS="" + diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc new file mode 100644 index 000000000..b00c09f4f --- /dev/null +++ b/testing/net-snmp/snmpd.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/snmpd + +PID=`pidof -o %PPID /usr/sbin/snmpd` +case "$1" in + start) + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/snmpd.pid + add_daemon snmpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Net-SNMP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/snmpd.pid + rm_daemon snmpd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD new file mode 100644 index 000000000..67e323089 --- /dev/null +++ b/testing/php/PKGBUILD @@ -0,0 +1,363 @@ +# $Id: PKGBUILD 139147 2011-09-30 09:12:23Z eric $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=4 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' + '08582e502fed8221c6577042ca45ddb8' + '65606c606df97a0760dfe5aaf9893afc' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '09005dabd90c48ddd392b3dbf05f8a82' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/testing/php/apache.conf b/testing/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/testing/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/testing/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b4dd32f96 --- /dev/null +++ b/testing/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -102,7 +102,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -121,9 +122,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -163,23 +164,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -333,7 +334,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch new file mode 100644 index 000000000..46c842921 --- /dev/null +++ b/testing/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/testing/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD index a4ae11451..73f2c19af 100644 --- a/testing/telepathy-glib/PKGBUILD +++ b/testing/telepathy-glib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139057 2011-09-28 19:33:16Z ibiru $ +# $Id: PKGBUILD 139169 2011-09-30 19:17:32Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.15.5 -pkgrel=1 +pkgver=0.15.6 +pkgrel=2 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" @@ -14,11 +14,14 @@ license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('18c93456fcf3568e47c6a6342b8c46f5') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + fix_gnome-shell.patch) +md5sums=('37881cb8d2a33184cf5957db809b8278' + '015037782eeb8658a9fb093f49a2097f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix_gnome-shell.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-vala-bindings \ diff --git a/testing/telepathy-glib/fix_gnome-shell.patch b/testing/telepathy-glib/fix_gnome-shell.patch new file mode 100644 index 000000000..425a6ce48 --- /dev/null +++ b/testing/telepathy-glib/fix_gnome-shell.patch @@ -0,0 +1,123 @@ +commit 014135b89d23f15464d8a82f462ed0f9f98344e0 +Author: Jan Steffens <jan.steffens@gmail.com> +Date: Fri Sep 30 21:09:25 2011 +0200 + + Revert "Sort alphabetically introspected files" + + This reverts commit 48998822d5e9575af822c1936b35be514dc2401b. + + Conflicts: + + telepathy-glib/introspection.am + +diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am +index 2027c5f..0c867cc 100644 +--- a/telepathy-glib/introspection.am ++++ b/telepathy-glib/introspection.am +@@ -8,63 +8,64 @@ introspection_extra_dist = \ + if HAVE_INTROSPECTION + + INTROSPECTION_FILES = \ ++ $(srcdir)/proxy.c _gen/proxy-introspectable.h \ + $(srcdir)/account.c $(srcdir)/account.h \ + $(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \ + $(srcdir)/account-manager.c $(srcdir)/account-manager.h \ +- $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \ + $(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \ + $(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \ +- $(srcdir)/base-client.c $(srcdir)/base-client.h \ +- $(srcdir)/base-connection.c $(srcdir)/base-connection.h \ + $(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \ +- $(srcdir)/capabilities.c $(srcdir)/capabilities.h \ +- $(srcdir)/channel.c $(srcdir)/channel.h \ +- $(srcdir)/channel-contacts.c \ +- $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \ +- $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \ +- $(srcdir)/channel-group.c \ +- $(srcdir)/channel-request.c $(srcdir)/channel-request.h \ + $(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \ +- $(srcdir)/client-message.c $(srcdir)/client-message.h \ + $(srcdir)/connection.c $(srcdir)/connection.h \ +- $(srcdir)/connection-avatars.c \ + $(srcdir)/connection-contact-list.c $(srcdir)/connection-contact-list.h \ + $(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \ ++ $(srcdir)/connection-avatars.c \ ++ $(srcdir)/protocol.c $(srcdir)/protocol.h \ + $(srcdir)/connection-manager.c $(srcdir)/connection-manager.h \ ++ $(srcdir)/channel.c $(srcdir)/channel.h \ ++ $(srcdir)/channel-contacts.c \ ++ $(srcdir)/channel-group.c \ ++ $(srcdir)/handle.c $(srcdir)/handle.h \ ++ $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \ ++ $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \ ++ $(srcdir)/interfaces.c \ ++ $(srcdir)/intset.c $(srcdir)/intset.h \ ++ $(srcdir)/dbus.c $(srcdir)/dbus.h \ ++ $(srcdir)/capabilities.c $(srcdir)/capabilities.h \ + $(srcdir)/contact.c $(srcdir)/contact.h \ + $(srcdir)/contact-operations.c $(srcdir)/contact-operations.h \ + $(srcdir)/contact-search.c $(srcdir)/contact-search.h \ + $(srcdir)/contact-search-result.c $(srcdir)/contact-search-result.h \ +- $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \ +- $(srcdir)/dbus.c $(srcdir)/dbus.h \ +- $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \ +- $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \ +- $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \ +- $(srcdir)/debug.c $(srcdir)/debug.h \ + $(srcdir)/defs.h \ +- $(srcdir)/errors.c $(srcdir)/errors.h \ +- $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \ +- $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \ +- $(srcdir)/handle.c $(srcdir)/handle.h \ +- $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \ +- $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \ +- $(srcdir)/interfaces.c \ +- $(srcdir)/intset.c $(srcdir)/intset.h \ +- $(srcdir)/message.c $(srcdir)/message.h \ +- $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \ +- $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \ +- $(srcdir)/protocol.c $(srcdir)/protocol.h \ +- $(srcdir)/proxy.c _gen/proxy-introspectable.h \ +- $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \ ++ $(srcdir)/debug.c $(srcdir)/debug.h \ ++ $(srcdir)/base-client.c $(srcdir)/base-client.h \ + $(srcdir)/simple-approver.c $(srcdir)/simple-approver.h \ + $(srcdir)/simple-client-factory.c $(srcdir)/simple-client-factory.h \ + $(srcdir)/simple-handler.c $(srcdir)/simple-handler.h \ + $(srcdir)/simple-observer.c $(srcdir)/simple-observer.h \ ++ $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \ ++ $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \ ++ $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \ ++ $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \ ++ $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \ ++ $(srcdir)/channel-request.c $(srcdir)/channel-request.h \ ++ $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \ ++ $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \ ++ $(srcdir)/protocol.c $(srcdir)/protocol.h \ ++ $(srcdir)/base-connection.c $(srcdir)/base-connection.h \ ++ $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \ + $(srcdir)/stream-tube-channel.c $(srcdir)/stream-tube-channel.h \ ++ $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \ + $(srcdir)/stream-tube-connection.c $(srcdir)/stream-tube-connection.h \ + $(srcdir)/text-channel.c $(srcdir)/text-channel.h \ ++ $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \ ++ $(srcdir)/client-message.c $(srcdir)/client-message.h \ ++ $(srcdir)/message.c $(srcdir)/message.h \ ++ $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \ ++ $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \ ++ $(srcdir)/errors.c $(srcdir)/errors.h \ + _gen/telepathy-enums.h _gen/telepathy-enums-gtk-doc.h \ +- _gen/telepathy-interfaces.h _gen/telepathy-interfaces-gtk-doc.h\ ++ _gen/telepathy-interfaces.h \ + $(NULL) + + _gen/proxy-introspectable.h: proxy.h introspection.am +@@ -76,7 +77,6 @@ TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \ + $(srcdir)/kludge.xsl \ + $(INTROSPECTION_FILES) + $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ +- --warn-all \ + --namespace TelepathyGLib \ + --nsversion=0.12 \ + --identifier-prefix=Tp \ + diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD index 116fc431a..9ea91174e 100644 --- a/testing/totem/PKGBUILD +++ b/testing/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139065 2011-09-28 19:33:24Z ibiru $ +# $Id: PKGBUILD 139155 2011-09-30 11:49:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64') |