Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

8 files changed, 95 insertions, 164 deletions

diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 7da492643..0634f6f6c 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,24 +6,24 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=35.1
+pkgrel=42
 epoch=1
-_extramodules=extramodules-3.7-LIBRE
+_extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
         lircd-handle-large-config.patch
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
-	lirc.service lircm.service irexec.service
-	lirc.tmpfiles
-	)
+        linux-3.8.patch
+        lirc.logrotate
+        lirc.service lircm.service irexec.service
+        lirc.tmpfiles)
 
 build() {
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -32,12 +32,15 @@ build() {
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
   patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
   patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+  patch -Np1 -i "${srcdir}/linux-3.8.patch"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
       -e 's/@X_LIBS@//g' \
       -e 's/@X_PRE_LIBS@//g' \
       -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+  # fix for new automake #33497
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
   libtoolize
   autoreconf
 
@@ -55,8 +58,8 @@ build() {
 }
 
 package_lirc-libre() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) "
-  depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
+  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
+  depends=('lirc-utils-libre' 'linux-libre>=3.8' 'linux-libre<3.9')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
@@ -79,13 +82,10 @@ package_lirc-utils-libre() {
   replaces=('lirc-utils')
   conflicts=('lirc-utils')
   provides=("lirc-utils=$pkgver")
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
   install=lirc-utils.install
 
   cd "${srcdir}/lirc-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
   install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
   install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
   install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
@@ -96,12 +96,6 @@ package_lirc-utils-libre() {
   # install the logrotate config
   install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
     
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
   install -d "${pkgdir}/etc/lirc"
   
   # remove built modules
@@ -112,12 +106,8 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          'b70cc9640505205446ec47b7d4779f38'
          '1f8b104a2365d9f93404b143f499059b'
          '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
+         '9ee196bd03ea44af5a752fb0cc6ca96a'
          '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb'
          'dab8a73bcc5fd5479d8750493d8d97dc'
          'c2e20fe68b034df752dba2773db16ebe'
          '07131d117fcfe9dcd50c453c3a5e9531'
diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/libre/lirc-libre/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd
deleted file mode 100644
index a64b033a5..000000000
--- a/libre/lirc-libre/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch
new file mode 100644
index 000000000..7b6378a83
--- /dev/null
+++ b/libre/lirc-libre/linux-3.8.patch
@@ -0,0 +1,80 @@
+diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:39:55.000000000 +0200
+@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
+ 
+ static struct platform_device *lirc_serial_dev;
+ 
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
+ 
+ static struct platform_driver lirc_serial_driver = {
+ 	.probe		= lirc_serial_probe,
+-	.remove		= __devexit_p(lirc_serial_remove),
++	.remove		= lirc_serial_remove,
+ 	.suspend	= lirc_serial_suspend,
+ 	.resume		= lirc_serial_resume,
+ 	.driver		= {
+diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:38:24.000000000 +0200
+@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
+ 	return 0;
+ }
+ 
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+ static struct platform_driver lirc_sir_driver = {
+ 	.probe		= lirc_sir_probe,
+-	.remove		= __devexit_p(lirc_sir_remove),
++	.remove		= lirc_sir_remove,
+ 	.driver		=	{
+ 		.name	= "lirc_sir",
+ 		.owner	= THIS_MODULE,
+diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:39:39.000000000 +0200
+@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+ 
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ 	return 0;
+ }
+@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
+ 
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ 	.probe		= lirc_wpc8769l_probe,
+-	.remove		= __devexit_p(lirc_wpc8769l_remove),
++	.remove		= lirc_wpc8769l_remove,
+ 	.suspend	= lirc_wpc8769l_suspend,
+ 	.resume		= lirc_wpc8769l_resume,
+ 	.driver		= {
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index a6694836f..49a9dc601 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.7-LIBRE
+EXTRAMODULES=extramodules-3.8-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd
deleted file mode 100644
index e9739b36e..000000000
--- a/libre/lirc-libre/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/libre/lirc-libre/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd
deleted file mode 100644
index 220c47c9c..000000000
--- a/libre/lirc-libre/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0