Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

9 files changed, 32 insertions, 83 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index ebc35f9..3821d1b 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=26
+pkgrel=27
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -106,7 +106,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837'
          'e36da536dd651ef182e7642337889e77'
          '985891a43f7c4c983eb2a362162f1a0f'
          'd7a8cd4a0060399ae22e69f74e04eb07'
-         '7a45287a07145fde5aa664583d4f6fba'
+         'd705eb26cd25862bf0e84cc9964bd3db'
          'c20f73d4da5d7e15e1f3eb85c7dcb49a'
          '8ac1cfd2eca0f641737da0d0aca416a7'
          '9ae8d79f620c6d19973c55c32a921874'
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index 83a2bed..8f24835 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -148,11 +148,11 @@ if [ $found_remote -eq 1 ]
 then
     scan_for_hpg_receiver
 fi
-printhl "   Scanning for TatIR"
-if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null
-then
-	/usr/bin/PyroUsb.py > /dev/null 2>&1 &
-fi
+# printhl "   Scanning for TatIR"
+# if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null
+# then
+# 	/usr/bin/PyroUsb.py > /dev/null 2>&1 &
+# fi
 
 if [ $found_remote -eq 1  ]
 then
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index 0e07da3..98f7856 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=initscripts
 pkgver=2011.06.4
-pkgrel=3
+pkgrel=4
 pkgdesc="System initialization/bootup scripts"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org"
@@ -20,7 +20,7 @@ optdepends=('bridge-utils: Network bridging support'
             'wireless_tools: Wireless networking')
 install=initscripts.install
 source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
-        'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch')
+        'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch' 'inittab.patch')
 
 
 
@@ -31,6 +31,7 @@ package() {
   patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1
   patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
   patch -p0 < ${srcdir}/rc.multi.patch || exit 1
+  patch -p0 < ${srcdir}/inittab.patch || exit 1
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example
 }
@@ -38,4 +39,5 @@ md5sums=('34cbe55f3f42069c59237db935d0511b'
          '027576534885b8d5dded9be546057b12'
          'eaa31b96513d834b50d116cb51f9ebbe'
          '73abaf06450104bddf16d409015f81ab'
-         'a166ea014a1c75860b14fc98825686cc')
+         'a166ea014a1c75860b14fc98825686cc'
+         '521bbd001633d14b08e5471bea584ee4')
diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog
index 58bfd36..52f3642 100644
--- a/abs/core/initscripts/__changelog
+++ b/abs/core/initscripts/__changelog
@@ -1,7 +1,8 @@
-Patch init scripts
+Patch init scripts (remove tty1, linhes header)
   patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1
   patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
   patch -p0 < ${srcdir}/rc.multi.patch || exit 1
+  patch -p0 < ${srcdir}/inittab.patch || exit 1
 
 
 rename wireless.conf -> wireless.conf.example
diff --git a/abs/core/initscripts/inittab.patch b/abs/core/initscripts/inittab.patch
new file mode 100644
index 0000000..d92bfed
--- /dev/null
+++ b/abs/core/initscripts/inittab.patch
@@ -0,0 +1,10 @@
+--- inittab.orig	2011-08-06 17:44:17.563781289 +0000
++++ inittab	2011-08-06 17:44:36.440448743 +0000
+@@ -24,7 +24,6 @@
+ su:S:wait:/sbin/sulogin -p
+ 
+ # -8 options fixes umlauts problem on login
+-c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux
+ c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux
+ c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux
+ c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux
diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD
index 66f4cae..69be999 100644
--- a/abs/core/mkinitcpio/PKGBUILD
+++ b/abs/core/mkinitcpio/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=mkinitcpio
 pkgver=0.7.2
-pkgrel=6
+pkgrel=8
 pkgdesc="Modular initramfs image creation utility"
 arch=(any)
 url="http://www.archlinux.org/"
 license=('GPL')
-depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
+depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils=>0.2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
          'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip'
          'which')
 optdepends=('xz: Use lzma or xz compression for the initramfs image'
diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD
index 17d0d3c..dcedbd5 100644
--- a/abs/core/tzdata/PKGBUILD
+++ b/abs/core/tzdata/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $
+# $Id: PKGBUILD 130868 2011-07-08 14:35:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tzdata
 pkgver=2011h
-pkgrel=1
+pkgrel=2
 _tzcode=2011g
 _tzdata=2011h
 pkgdesc="Sources for time zone and daylight saving time data"
@@ -17,6 +17,9 @@ options=('!emptydirs')
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
         ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
         Makefile.patch)
+md5sums=('ecb564279b28c5b184421c525d997d6c'
+         '546d27b6c1e5e1097bd512651815017f'
+         'a64ed97d1fc03c66ee8612c0d9f40507')
 
 build() {
   cd ${srcdir}
@@ -40,6 +43,3 @@ package() {
 
   rm "${pkgdir}/usr/share/zoneinfo/localtime"
 }
-md5sums=('ecb564279b28c5b184421c525d997d6c'
-         '546d27b6c1e5e1097bd512651815017f'
-         'a64ed97d1fc03c66ee8612c0d9f40507')
diff --git a/abs/core/tzdata/chile.patch b/abs/core/tzdata/chile.patch
deleted file mode 100644
index 38c389c..0000000
--- a/abs/core/tzdata/chile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-------- southamerica -------
-*** southamerica	Wed Mar  5 14:40:25 2008
---- southamerica	Wed Mar  5 14:40:25 2008
-***************
-*** 1,4 ****
-! # @(#)southamerica	8.15
-  # <pre>
-
-  # This data is by no means authoritative; if you think you know better,
---- 1,4 ----
-! # @(#)southamerica	8.18
-  # <pre>
-
-  # This data is by no means authoritative; if you think you know better,
-***************
-*** 759,764 ****
---- 759,784 ----
-  # America/Santiago.  The pre-1980 Pacific/Easter data are dubious,
-  # but we have no other source.
-
-+ # From German Poo-Caaman~o (2008-03-03):
-+ # Due to drought, Chile extends Daylight Time in three weeks.  This
-+ # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
-+ # and Saturday 3/29 at 22:00 for Pacific/Easter)
-+ # The Supreme Decree is located at 
-+ # <a href="http://www.shoa.cl/servicios/supremo316.pdf">
-+ # http://www.shoa.cl/servicios/supremo316.pdf
-+ # </a>
-+ # and the instructions for 2008 are located in:
-+ # <a href="http://www.horaoficial.cl/cambio.htm">
-+ # http://www.horaoficial.cl/cambio.htm
-+ # </a>.
-+ 
-+ # From José Miguel Garrido (2008-03-05):
-+ # ...
-+ # You could see the announces of the change on 
-+ # <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
-+ # http://www.shoa.cl/noticias/2008/04hora/hora.htm
-+ # </a>.
-+ 
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 789,795 ****
-  Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
-  Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-  Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-! Rule	Chile	2000	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 809,819 ----
-  Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
-  Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-  Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-! Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
-! # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-! # which is used below in specifying the transition.
-! Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-! Rule	Chile	2009	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-
diff --git a/abs/extra/tatir/__delete b/abs/extra/tatir/__delete
new file mode 100644
index 0000000..61aca57
--- /dev/null
+++ b/abs/extra/tatir/__delete
@@ -0,0 +1 @@
+this pkg is marked to be removed