Thu Jun 9 22:46:45 UTC 2011

6 files changed, 82 insertions, 3 deletions

diff --git a/libre/hardinfo/ChangeLog b/libre/hardinfo/ChangeLog
new file mode 100644
index 000000000..faf242a7b
--- /dev/null
+++ b/libre/hardinfo/ChangeLog
@@ -0,0 +1,20 @@
+2009-04-06  Eric Belanger  <eric@archlinux.org>
+
+	* hardinfo 0.5.1-1
+	* Upstream update
+
+2009-03-29  Eric Belanger  <eric@archlinux.org>
+
+	* hardinfo 0.5c-1
+	* Upstream update
+
+2008-08-13  Eric Belanger  <eric@archlinux.org>
+
+	* hardinfo 0.4.2.3-3
+	* Rebuilt against gnutls 2.4.1
+
+2008-04-06  Eric Belanger  <eric@archlinux.org>
+
+	* hardinfo 0.4.2.3-2
+	* Rebuilt against libsoup 2.4
+        * Added ChangeLog
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
new file mode 100644
index 000000000..869d2f52a
--- /dev/null
+++ b/libre/hardinfo/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+
+pkgname=hardinfo
+pkgver=0.5.1
+pkgrel=2.1
+pkgdesc="A system information and benchmark tool."
+arch=('i686' 'x86_64')
+url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
+license=('GPL2')
+depends=('gtk2' 'libsoup' 'gnutls')
+options=('!emptydirs')
+source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
+        fixsensors.patch hardinfo.distro)
+md5sums=('6fb38992e140f2fab16518ae1f38e188'
+         '05c212db07b9f152cdea052ff7bb28fa'
+         '2c609f4b3c7f202d043bdef082c2bef0')
+sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
+          'd2151dce76dca238102937d0e15541f172bca530'
+          '9425e09191cd3a365a3afce57ca1973a6439fa57')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../fixsensors.patch 
+  sed -i 's|/usr/lib64|/usr/lib|' configure 
+  ./configure --prefix=/usr 
+  sed -i 's|lib64|lib|' binreloc.c 
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h 
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h 
+  sed -i 's|{ DB_PREFIX "debian_version",	"deb"  },|{ DB_PREFIX "hardinfo.distro",       "parabola"  },{ DB_PREFIX "debian_version",	"deb"  },|' computer.h 
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
+  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" 
+}
diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch
new file mode 100644
index 000000000..812c29458
--- /dev/null
+++ b/libre/hardinfo/fixsensors.patch
@@ -0,0 +1,13 @@
+ diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
+--- hardinfo-0.4.2.2.orign/util.c	2007-07-20 16:45:08.000000000 +0200
++++ hardinfo-0.4.2.2/util.c	2007-07-26 10:15:32.000000000 +0200
+@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
+     if (source) {
+ 	retn = g_strconcat(source, buffer, NULL);
+ 	g_free(buffer);
+-        g_free(source);
++        if(strlen(source))
++		 g_free(source);
+     } else {
+ 	retn = buffer;
+     }
diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro
new file mode 100644
index 000000000..cf378523a
--- /dev/null
+++ b/libre/hardinfo/hardinfo.distro
@@ -0,0 +1 @@
+Parabola GNU/Linux-Libre
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 5fe5f654f..dd0d5b045 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.06.1
+pkgver=2011.06.3
 pkgrel=1.1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
@@ -13,10 +13,11 @@ url="http://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('bash' 'grep' 'coreutils' 'udev>=167'
-         'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2'
+         'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
+            'net-tools: legacy network support'
             'wireless_tools: Wireless networking')
 install=initscripts.install
 source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
@@ -27,3 +28,5 @@ package() {
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
+md5sums=('cbd4320b6b1790f8c1fd80917650a566'
+         '027576534885b8d5dded9be546057b12')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
index 360101c10..56f69248a 100644
--- a/libre/initscripts/initscripts.install
+++ b/libre/initscripts/initscripts.install
@@ -4,4 +4,8 @@ post_upgrade() {
     echo "==> Original file saved as /etc/inittab.pacsave"
     sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
   fi
+  if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
+    echo "Blacklisting of modules is no longer supported in rc.conf,"
+    echo "please add blacklist entries to /etc/modprobe.d/ instead."
+  fi
 }