From 7d11e9346ebd0f9c378952caee0c82d6ca815f4e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Jun 2012 00:01:46 +0000 Subject: Fri Jun 8 00:01:46 UTC 2012 --- extra/aspell-de/PKGBUILD | 6 +- extra/cups/PKGBUILD | 14 +- extra/cups/cups-systemd-socket.patch | 527 +++++++++++++++++++++++++++++++++++ extra/dnsmasq/PKGBUILD | 6 +- extra/dovecot/PKGBUILD | 8 +- extra/fcitx/PKGBUILD | 13 +- extra/gnu-efi/PKGBUILD | 34 +++ extra/mod_perl/PKGBUILD | 16 +- extra/mx/PKGBUILD | 8 +- extra/quodlibet/PKGBUILD | 9 +- extra/vim/PKGBUILD | 12 +- 11 files changed, 608 insertions(+), 45 deletions(-) create mode 100644 extra/cups/cups-systemd-socket.patch create mode 100644 extra/gnu-efi/PKGBUILD (limited to 'extra') diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD index 7d15c7fe8..65b775c23 100644 --- a/extra/aspell-de/PKGBUILD +++ b/extra/aspell-de/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137818 2011-09-11 20:26:33Z pierre $ +# $Id: PKGBUILD 160921 2012-06-07 02:05:22Z pierre $ # Maintainer: # Contributor: Simo Leone # Contributor: Tobias Kieslich pkgname=aspell-de -pkgver=20110609 +pkgver=20120607 pkgrel=1 pkgdesc="German dictionary for aspell" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://j3e.de/ispell/igerman98/index.html" license=('GPL2') depends=('aspell') source=("http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2") -md5sums=('6e7ea765b6188c08d470111e221cc91a') +md5sums=('9433d0ccd7db3c7681037980ece3f710') build() { cd "${srcdir}/igerman98-${pkgver}" diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 3a0a56d26..7a7ec85d7 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 160061 2012-05-29 14:41:20Z andyrtr $ +# $Id: PKGBUILD 160812 2012-06-06 15:26:42Z andyrtr $ # Maintainer: Andreas Radke pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.5.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') + 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi-1-config.patch cups-avahi-2-backend.patch @@ -19,6 +19,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch + cups-systemd-socket.patch cups cups.logrotate cups.pam) #options=('!emptydirs') md5sums=('e1ad15257aa6f162414ea3beae0c5df8' @@ -30,6 +31,7 @@ md5sums=('e1ad15257aa6f162414ea3beae0c5df8' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' 'c9159ba1233902ba6ddbbe6885a46b72' + '4505b8b2c57a7c28ea79e08388bbbbb9' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -44,6 +46,9 @@ build() { patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch + # add systemd socket support - Fedora patch, also used in Gentoo + patch -Np1 -i ${srcdir}/cups-systemd-socket.patch + # Do not export SSL libs in cups-config patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" @@ -57,6 +62,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc \ --with-cups-user=daemon \ @@ -116,7 +122,7 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme') +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') optdepends=('php: for included phpcups.so module' 'xdg-utils: xdg .desktop file support') diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch new file mode 100644 index 000000000..09d17d415 --- /dev/null +++ b/extra/cups/cups-systemd-socket.patch @@ -0,0 +1,527 @@ +diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in +--- cups-1.5.2/config.h.in.systemd-socket 2012-03-16 14:50:57.089449755 +0000 ++++ cups-1.5.2/config.h.in 2012-03-16 14:50:57.146449787 +0000 +@@ -503,6 +503,13 @@ + + + /* ++ * Do we have systemd support? ++ */ ++ ++#undef HAVE_SYSTEMD ++ ++ ++/* + * Various scripting languages... + */ + +diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/config-scripts/cups-systemd.m4 +--- cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket 2012-03-16 14:50:57.146449787 +0000 ++++ cups-1.5.2/config-scripts/cups-systemd.m4 2012-03-16 14:50:57.146449787 +0000 +@@ -0,0 +1,36 @@ ++dnl ++dnl "$Id$" ++dnl ++dnl systemd stuff for CUPS. ++ ++dnl Find whether systemd is available ++ ++SDLIBS="" ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_MSG_CHECKING(for libsystemd-daemon) ++ if $PKGCONFIG --exists libsystemd-daemon; then ++ AC_MSG_RESULT(yes) ++ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` ++ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon` ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++ AC_DEFINE(HAVE_SYSTEMD) ++ else ++ AC_MSG_RESULT(no) ++ fi ++fi ++ ++if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then ++ SYSTEMD_UNITS="cups.service cups.socket cups.path" ++else ++ SYSTEMD_UNITS="" ++fi ++ ++AC_SUBST(SYSTEMD_UNITS) ++AC_SUBST(SDLIBS) ++ ++dnl ++dnl "$Id$" ++dnl +diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in +--- cups-1.5.2/configure.in.systemd-socket 2011-08-31 02:36:33.000000000 +0100 ++++ cups-1.5.2/configure.in 2012-03-16 14:50:57.146449787 +0000 +@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4) + sinclude(config-scripts/cups-largefile.m4) + sinclude(config-scripts/cups-dnssd.m4) + sinclude(config-scripts/cups-launchd.m4) ++sinclude(config-scripts/cups-systemd.m4) + sinclude(config-scripts/cups-defaults.m4) + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) +@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs + conf/snmp.conf + cups-config + data/testprint ++ data/cups.service ++ data/cups.socket ++ data/cups.path + desktop/cups.desktop + doc/help/ref-cupsd-conf.html + doc/help/standard.html +diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c +--- cups-1.5.2/cups/usersys.c.systemd-socket 2012-03-16 14:50:57.054449734 +0000 ++++ cups-1.5.2/cups/usersys.c 2012-03-16 14:50:57.148449788 +0000 +@@ -778,7 +778,7 @@ cups_read_client_conf( + struct stat sockinfo; /* Domain socket information */ + + if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && +- (sockinfo.st_mode & S_IRWXO) == S_IRWXO) ++ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH)) + cups_server = CUPS_DEFAULT_DOMAINSOCKET; + else + #endif /* CUPS_DEFAULT_DOMAINSOCKET */ +diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.in +--- cups-1.5.2/data/cups.path.in.systemd-socket 2012-03-16 14:50:57.148449788 +0000 ++++ cups-1.5.2/data/cups.path.in 2012-03-16 14:50:57.148449788 +0000 +@@ -0,0 +1,8 @@ ++[Unit] ++Description=CUPS Printer Service Spool ++ ++[Path] ++PathExistsGlob=@CUPS_REQUESTS@/d* ++ ++[Install] ++WantedBy=multi-user.target +diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.service.in +--- cups-1.5.2/data/cups.service.in.systemd-socket 2012-03-16 14:50:57.149449788 +0000 ++++ cups-1.5.2/data/cups.service.in 2012-03-16 14:50:57.149449788 +0000 +@@ -0,0 +1,10 @@ ++[Unit] ++Description=CUPS Printing Service ++ ++[Service] ++ExecStart=@sbindir@/cupsd -f ++PrivateTmp=true ++ ++[Install] ++Also=cups.socket cups.path ++WantedBy=printer.target +diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in +--- cups-1.5.2/data/cups.socket.in.systemd-socket 2012-03-16 14:50:57.150449788 +0000 ++++ cups-1.5.2/data/cups.socket.in 2012-03-16 14:50:57.150449788 +0000 +@@ -0,0 +1,11 @@ ++[Unit] ++Description=CUPS Printing Service Sockets ++ ++[Socket] ++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ ++ListenStream=631 ++ListenDatagram=0.0.0.0:631 ++BindIPv6Only=ipv6-only ++ ++[Install] ++WantedBy=sockets.target +diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile +--- cups-1.5.2/data/Makefile.systemd-socket 2011-05-12 06:21:56.000000000 +0100 ++++ cups-1.5.2/data/Makefile 2012-03-16 14:50:57.151449789 +0000 +@@ -112,6 +112,12 @@ install-data: + $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ + done + $(INSTALL_DIR) -m 755 $(DATADIR)/profiles ++ if test "x$(SYSTEMD_UNITS)" != "x" ; then \ ++ $(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \ ++ for file in $(SYSTEMD_UNITS); do \ ++ $(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \ ++ done; \ ++ fi + + + # +@@ -159,6 +165,9 @@ uninstall: + -$(RMDIR) $(DATADIR)/charsets + -$(RMDIR) $(DATADIR)/banners + -$(RMDIR) $(DATADIR) ++ for file in $(SYSTEMD_UNITS); do \ ++ $(RM) $(SYSTEMDUNITDIR)/$$file; \ ++ done + + + # +diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in +--- cups-1.5.2/Makedefs.in.systemd-socket 2012-03-16 14:50:57.081449751 +0000 ++++ cups-1.5.2/Makedefs.in 2012-03-16 14:50:57.152449790 +0000 +@@ -143,6 +143,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ + CXXLIBS = @CXXLIBS@ + DBUS_NOTIFIER = @DBUS_NOTIFIER@ + DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ ++SYSTEMD_UNITS = @SYSTEMD_UNITS@ + DNSSD_BACKEND = @DNSSD_BACKEND@ + DSOFLAGS = -L../cups @DSOFLAGS@ + DSOLIBS = @DSOLIBS@ $(COMMONLIBS) +@@ -151,6 +152,7 @@ FONTS = @FONTS@ + IMGLIBS = @IMGLIBS@ + IMGFILTERS = @IMGFILTERS@ + LAUNCHDLIBS = @LAUNCHDLIBS@ ++SDLIBS = @SDLIBS@ + LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ + -L../scheduler @LDARCHFLAGS@ \ + @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) +@@ -267,6 +269,7 @@ PAMFILE = @PAMFILE@ + + DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ + DBUSDIR = @DBUSDIR@ ++SYSTEMDUNITDIR = $(BUILDROOT)@systemdsystemunitdir@ + + + # +diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/client.h +--- cups-1.5.2/scheduler/client.h.systemd-socket 2011-03-25 21:25:38.000000000 +0000 ++++ cups-1.5.2/scheduler/client.h 2012-03-16 14:50:57.153449791 +0000 +@@ -75,6 +75,9 @@ typedef struct + int fd; /* File descriptor for this server */ + http_addr_t address; /* Bind address of socket */ + http_encryption_t encryption; /* To encrypt or not to encrypt... */ ++#ifdef HAVE_SYSTEMD ++ int is_systemd; /* Is this a systemd socket? */ ++#endif /* HAVE_SYSTEMD */ + } cupsd_listener_t; + + +diff -up cups-1.5.2/scheduler/dirsvc.c.systemd-socket cups-1.5.2/scheduler/dirsvc.c +--- cups-1.5.2/scheduler/dirsvc.c.systemd-socket 2012-03-16 14:50:57.112449768 +0000 ++++ cups-1.5.2/scheduler/dirsvc.c 2012-03-16 14:50:57.155449792 +0000 +@@ -1512,7 +1512,7 @@ cupsdStartBrowsing(void) + } + } + +- if (BrowseSocket >= 0) ++ if (BrowseSocket >= 0 && !BrowseSocketIsSystemd) + { + /* + * Bind the socket to browse port... +@@ -1556,13 +1556,17 @@ cupsdStartBrowsing(void) + cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.", + strerror(errno)); + ++ if (!BrowseSocketIsSystemd) ++ { + #ifdef WIN32 +- closesocket(BrowseSocket); ++ closesocket(BrowseSocket); + #else +- close(BrowseSocket); ++ close(BrowseSocket); + #endif /* WIN32 */ + +- BrowseSocket = -1; ++ BrowseSocket = -1; ++ } ++ + BrowseLocalProtocols &= ~BROWSE_CUPS; + BrowseRemoteProtocols &= ~BROWSE_CUPS; + +@@ -1885,15 +1889,22 @@ cupsdStopBrowsing(void) + if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) && + BrowseSocket >= 0) + { +- /* +- * Close the socket and remove it from the input selection set. +- */ ++ if (!BrowseSocketIsSystemd) ++ { ++ /* ++ * Close the socket. ++ */ + + #ifdef WIN32 +- closesocket(BrowseSocket); ++ closesocket(BrowseSocket); + #else +- close(BrowseSocket); ++ close(BrowseSocket); + #endif /* WIN32 */ ++ } ++ ++ /* ++ * Remove it from the input selection set. ++ */ + + cupsdRemoveSelect(BrowseSocket); + BrowseSocket = -1; +@@ -5693,11 +5704,14 @@ update_cups_browse(void) + strerror(errno)); + cupsdLogMessage(CUPSD_LOG_ERROR, "CUPS browsing turned off."); + ++ if (!BrowseSocketIsSystemd) ++ { + #ifdef WIN32 +- closesocket(BrowseSocket); ++ closesocket(BrowseSocket); + #else +- close(BrowseSocket); ++ close(BrowseSocket); + #endif /* WIN32 */ ++ } + + cupsdRemoveSelect(BrowseSocket); + BrowseSocket = -1; +diff -up cups-1.5.2/scheduler/dirsvc.h.systemd-socket cups-1.5.2/scheduler/dirsvc.h +--- cups-1.5.2/scheduler/dirsvc.h.systemd-socket 2012-03-16 14:50:57.113449769 +0000 ++++ cups-1.5.2/scheduler/dirsvc.h 2012-03-16 14:50:57.157449792 +0000 +@@ -100,6 +100,8 @@ VAR int Browsing VALUE(TRUE), + /* Short names for remote printers? */ + BrowseSocket VALUE(-1), + /* Socket for browsing */ ++ BrowseSocketIsSystemd VALUE(0), ++ /* BrowseSocket is systemd-provided? */ + BrowsePort VALUE(IPP_PORT), + /* Port number for broadcasts */ + BrowseInterval VALUE(DEFAULT_INTERVAL), +diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/listen.c +--- cups-1.5.2/scheduler/listen.c.systemd-socket 2011-04-16 00:38:13.000000000 +0100 ++++ cups-1.5.2/scheduler/listen.c 2012-03-16 14:50:57.158449792 +0000 +@@ -401,7 +401,11 @@ cupsdStopListening(void) + lis; + lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) + { +- if (lis->fd != -1) ++ if (lis->fd != -1 ++#ifdef HAVE_SYSTEMD ++ && !lis->is_systemd ++#endif /* HAVE_SYSTEMD */ ++ ) + { + #ifdef WIN32 + closesocket(lis->fd); +diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c +--- cups-1.5.2/scheduler/main.c.systemd-socket 2012-03-16 14:50:57.121449773 +0000 ++++ cups-1.5.2/scheduler/main.c 2012-03-16 14:51:55.409483636 +0000 +@@ -26,6 +26,8 @@ + * launchd_checkin() - Check-in with launchd and collect the listening + * fds. + * launchd_checkout() - Update the launchd KeepAlive file as needed. ++ * systemd_checkin() - Check-in with systemd and collect the ++ * listening fds. + * parent_handler() - Catch USR1/CHLD signals... + * process_children() - Process all dead children... + * select_timeout() - Calculate the select timeout value. +@@ -62,6 +64,10 @@ + # endif /* !LAUNCH_JOBKEY_SERVICEIPC */ + #endif /* HAVE_LAUNCH_H */ + ++#ifdef HAVE_SYSTEMD ++#include ++#endif /* HAVE_SYSTEMD */ ++ + #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) + # include + #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ +@@ -78,6 +84,9 @@ + static void launchd_checkin(void); + static void launchd_checkout(void); + #endif /* HAVE_LAUNCHD */ ++#ifdef HAVE_SYSTEMD ++static void systemd_checkin(void); ++#endif /* HAVE_SYSTEMD */ + static void parent_handler(int sig); + static void process_children(void); + static void sigchld_handler(int sig); +@@ -537,6 +546,13 @@ main(int argc, /* I - Number of comm + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++ /* ++ * If we were started by systemd get the listen sockets file descriptors... ++ */ ++ systemd_checkin(); ++#endif /* HAVE_SYSTEMD */ ++ + /* + * Startup the server... + */ +@@ -759,6 +775,15 @@ main(int argc, /* I - Number of comm + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++ /* ++ * If we were started by systemd get the listen sockets file ++ * descriptors... ++ */ ++ ++ systemd_checkin(); ++#endif /* HAVE_SYSTEMD */ ++ + /* + * Startup the server... + */ +@@ -1584,6 +1609,139 @@ launchd_checkout(void) + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++static void ++systemd_checkin(void) ++{ ++ int n, fd; ++ ++ n = sd_listen_fds(0); ++ if (n < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Failed to acquire sockets from systemd - %s", ++ strerror(-n)); ++ exit(EXIT_FAILURE); ++ return; ++ } ++ ++ if (n == 0) ++ return; ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) ++ { ++ http_addr_t addr; ++ socklen_t addrlen = sizeof (addr); ++ int r; ++ cupsd_listener_t *lis; ++ char s[256]; ++ ++ r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1); ++ if (r < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to verify socket type - %s", ++ strerror(-r)); ++ continue; ++ } ++ ++ if (!r) ++ { ++ if (Browsing && ++ ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS)) ++ { ++ r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, 0); ++ if (r < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to verify socket type - %s", ++ strerror(-r)); ++ continue; ++ } ++ ++ if (r) ++ { ++ /* ++ * This is the browse socket. ++ */ ++ ++ char addrstr[256]; ++ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to get local address - %s", ++ strerror(errno)); ++ continue; ++ } ++ ++ httpAddrString (&addr, addrstr, sizeof (addrstr)); ++ BrowseSocket = fd; ++ BrowseSocketIsSystemd = 1; ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "systemd_checkin: Matched browse (port %d) with fd %d:%s...", ++ BrowsePort, fd, addrstr); ++ continue; ++ } ++ ++ } ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Socket not of the right type"); ++ continue; ++ } ++ ++ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to get local address - %s", ++ strerror(errno)); ++ continue; ++ } ++ ++ /* ++ * Try to match the systemd socket address to one of the listeners... ++ */ ++ ++ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners); ++ lis; ++ lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) ++ if (httpAddrEqual(&lis->address, &addr)) ++ break; ++ ++ if (lis) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "systemd_checkin: Matched existing listener %s with fd %d...", ++ httpAddrString(&(lis->address), s, sizeof(s)), fd); ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "systemd_checkin: Adding new listener %s with fd %d...", ++ httpAddrString(&addr, s, sizeof(s)), fd); ++ ++ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to allocate listener - " ++ "%s.", strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ ++ cupsArrayAdd(Listeners, lis); ++ ++ memcpy(&lis->address, &addr, sizeof(lis->address)); ++ } ++ ++ lis->fd = fd; ++ lis->is_systemd = 1; ++ ++# ifdef HAVE_SSL ++ if (_httpAddrPort(&(lis->address)) == 443) ++ lis->encryption = HTTP_ENCRYPT_ALWAYS; ++# endif /* HAVE_SSL */ ++ } ++} ++#endif /* HAVE_SYSTEMD */ + + /* + * 'parent_handler()' - Catch USR1/CHLD signals... +diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makefile +--- cups-1.5.2/scheduler/Makefile.systemd-socket 2012-03-16 14:50:57.130449778 +0000 ++++ cups-1.5.2/scheduler/Makefile 2012-03-16 14:50:57.160449794 +0000 +@@ -382,7 +382,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu + $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ + $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ + $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ +- $(LIBGSSAPI) $(LIBWRAP) ++ $(LIBGSSAPI) $(LIBWRAP) $(SDLIBS) + + cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) + echo Linking $@... +@@ -390,7 +390,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a + $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ + $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ +- $(LIBWRAP) ++ $(LIBWRAP) $(SDLIBS) + + + # diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index ed2ec4c1e..1fd617dbe 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157810 2012-04-30 00:00:31Z dreisner $ +# $Id: PKGBUILD 160917 2012-06-07 00:05:24Z dreisner $ # Maintainer: Dave Reisner # Contributor: Paul Mattal # Contributor: Tom Newsom pkgname=dnsmasq -pkgver=2.61 +pkgver=2.62 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" @@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09' +md5sums=('f47e5cb8f5bac6343f24b2dbe317ab40' '66479e99123faeab83ebaed709ef95b5' '819fbdf6440d710616e6df5f8ca9cdba' '631d8349acbed1b01d4e11d9f42fdb7d') diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 8f0256e4f..447c5564a 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160790 2012-06-05 20:25:07Z andyrtr $ +# $Id: PKGBUILD 160808 2012-06-06 13:17:41Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) @@ -6,7 +6,7 @@ pkgname=dovecot pkgver=2.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" @@ -70,6 +70,6 @@ package() { rm ${pkgdir}/etc/dovecot/README # systemd tmpfile - install -d -m755 ${pkgdir}/etc/tmpfiles.d - install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/etc/tmpfiles.d/dovecot.conf + install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d + install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf } diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 7b1b688aa..fdd4caf00 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 158796 2012-05-10 06:10:24Z eric $ +# $Id: PKGBUILD 160913 2012-06-06 22:50:26Z eric $ # Maintainer: Andrea Scarpino # Contributor: csslayer pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.3 +pkgver=4.2.4 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') -makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu') +makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \ + 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) -sha1sums=('8cd33487d1d6ad9c9c63743af8d76e667de4b859') +sha1sums=('68aaf220d3f7e9bfe34062379e22388a44250fc2') build() { cd "${srcdir}" @@ -34,8 +35,8 @@ check() { package_fcitx() { pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system" - depends=('dbus-core' 'pango' 'libxinerama' 'gtk-update-icon-cache' \ - 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') + depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ + 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' 'enchant') install=fcitx.install cd "${srcdir}"/build diff --git a/extra/gnu-efi/PKGBUILD b/extra/gnu-efi/PKGBUILD new file mode 100644 index 000000000..35e433aaf --- /dev/null +++ b/extra/gnu-efi/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 160800 2012-06-06 10:29:37Z tpowa $ +# Maintainer: Tobias Powalowski +# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Alessio 'mOLOk' Bolognino + +_pkgname="gnu-efi" +_ver="3.0" +_pkgver="${_ver}q" +pkgname="${_pkgname}" +pkgver="${_pkgver}" +pkgrel=1 +pkgdesc="Library for building UEFI Applications using GNU toolchain" +url="http://sourceforge.net/projects/gnu-efi/" +license=('GPL') +arch=('i686' 'x86_64') +makedepends=() +depends=('pciutils') +source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz") +options=(!strip !makeflags) + +build() { + cd "${srcdir}/gnu-efi-${_ver}" + sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_ver}/Make.defaults" || true + CFLAGS="" make + make -C apps clean all +} + +package() { + cd "${srcdir}/gnu-efi-${_ver}" + make INSTALLROOT="${pkgdir}/usr/" install + install -d "${pkgdir}/usr/share/gnu-efi/" + install -D -m0644 "${srcdir}/gnu-efi-${_ver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/" +} +md5sums=('698d93490e0c0171aa0e2a8eda44209f') diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index f333c0aeb..dd9d26bc2 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160497 2012-06-02 10:26:43Z bluewind $ +# $Id: PKGBUILD 160911 2012-06-06 19:20:20Z foutrelis $ # Maintainer: # Contributor: Firmicus # Contributor: Tom K pkgname=mod_perl -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" arch=('i686' 'x86_64') @@ -13,11 +13,9 @@ license=('APACHE') depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') options=('!emptydirs') source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz - mod_perl-2.0.6-nolfs.patch - mod_perl-2.0.6-perl-5.16-fixes.patch) -sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc' - '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08' - 'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9') + mod_perl-2.0.6-nolfs.patch) +sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6' + '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,10 +26,6 @@ build() { # structures to be invalid if only the apache flags are used patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" - # Fix build with Perl 5.16 - # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached - patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch" - # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs make diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD index 380fe3732..176ca7f69 100644 --- a/extra/mx/PKGBUILD +++ b/extra/mx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156936 2012-04-23 09:09:25Z ibiru $ +# $Id: PKGBUILD 160919 2012-06-07 00:15:28Z heftig $ # Contributor: Andrea Scarpino # Contributor: Guenther Wutz pkgname=mx -pkgver=1.4.3 -pkgrel=2 +pkgver=1.4.6 +pkgrel=1 pkgdesc="A widget toolkit using Clutter" arch=('i686' 'x86_64') url="http://www.clutter-project.org" @@ -13,7 +13,7 @@ depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification') makedepends=('intltool' 'gobject-introspection' 'gtk-doc') options=('!libtool') source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5') +sha256sums=('20fd8e1463d84c791c20dd1e021bc18041b05ad095a1acbaace7bf0dd43d09f2') build() { cd ${pkgname}-${pkgver} diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD index c2341188c..c1dadacce 100644 --- a/extra/quodlibet/PKGBUILD +++ b/extra/quodlibet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153859 2012-03-20 06:20:55Z eric $ +# $Id: PKGBUILD 160925 2012-06-07 02:14:07Z eric $ # Maintainer: Eric Bélanger pkgname=quodlibet pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="An audio player written in pygtk" arch=('i686' 'x86_64') license=('GPL2') @@ -13,10 +13,10 @@ depends=('gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good makedepends=('intltool') optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'gstreamer0.10-bad-plugins: for MPEG-4 (AAC) and Musepack support' - 'dbus-python: for dbus support' + 'python2-dbus: for dbus support' 'notification-daemon: for notification support' 'libgpod: for ipod support' - 'python-feedparser: for audio feeds (podcast) support' + 'python2-feedparser: for audio feeds (podcast) support' 'udisks: for media devices support' 'media-player-info: for media devices support') options=('!makeflags') @@ -26,6 +26,7 @@ sha1sums=('7e11cda2827bb0d04b7d2b7854b8a2854ed074c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#env python#env python2#' *.py quodlibet/util/fmps.py + sed -i 's#libudev.so.0#libudev.so.1#' quodlibet/devices/__init__.py ./setup.py build } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index cbc430fb4..507eaed33 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160579 2012-06-02 10:29:06Z bluewind $ +# $Id: PKGBUILD 160931 2012-06-07 03:39:59Z tdziedzic $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -6,11 +6,11 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=515 -__hgrev=8201108e9cf0 +_patchlevel=547 +__hgrev=6f2497d0c277 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('10d7642d5062effdb51f53952622f9338003bbbf' - '0c1c584c1a2a2a279507f793cd5eff82863c625b' +sha1sums=('2c4f78a66b6ad7a759122d1f66c74079b678f39c' + '999f527d82a4c7818d017e3b8230e27950e87718' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' -- cgit v1.2.3-54-g00ecf