Wed May 11 22:34:25 UTC 2011

8 files changed, 72 insertions, 67 deletions

diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 55cde1f43..f3588dc77 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,30 +7,22 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 _preset=kernel26-lts.preset
-pkgver=${_basekernel}.39
+pkgver=${_basekernel}.40
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://linux-libre.fsfla.org"
 source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2
-        libata-alignment.patch
 	# the main kernel config files
         config.i686 config.x86_64
         # standard config files for mkinitcpio ramdisk
         ${_preset}
-        ${pkgname}.install
-        buildfix-gcc46.diff)
+        ${pkgname}.install)
 options=(!strip)
 
 build() {
   cd ${srcdir}/linux-$pkgver
 
-  # fix 22343 udev crashes
-  patch -Np1 -i ${srcdir}/libata-alignment.patch
-
-  # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1
-  patch -Np1 -i ${srcdir}/buildfix-gcc46.diff
-
   cat ../config.$CARCH >./.config
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -219,10 +211,8 @@ package_kernel26-libre-lts-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-md5sums=('9502a2248b2024da4f30a5d52a90322d'
-         '30851deee235a7486bd408cbe8eb2d71'
+md5sums=('eabd563bea84785dd74f3f694162ca69'
          '3298f542840c52a8b8abc1b3795e455b'
-         'cd1a62e81eb9e910779f3eb18a6e28c6'
+         'f0fcf2ca389e8997a88963d70153a479'
          '2cbfeb3e2a18d45f82f613e97fc23355'
-         'fbfc7a1af3208c7b729055d91e1c149a'
-         'bb7410d7b740dfad0385a07b66e6621f')
+         'fbfc7a1af3208c7b729055d91e1c149a')
diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff
new file mode 100644
index 000000000..595f97d66
--- /dev/null
+++ b/libre/kernel26-libre-lts/buildfix-gcc46.diff
@@ -0,0 +1,32 @@
+From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001
+From: Greg Rose <gregory.v.rose@intel.com>
+Date: Tue, 16 Nov 2010 19:41:36 -0800
+Subject: [PATCH] Remove extra struct page member from the buffer info
+ structure
+
+declaration.
+
+Reported-by: Andi Kleen <andi@firstfloor.org>
+Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
+Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+---
+ drivers/net/igbvf/igbvf.h |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
+index 63284e3..9d4d63e 100644
+--- a/drivers/net/igbvf/igbvf.h
++++ b/drivers/net/igbvf/igbvf.h
+@@ -126,7 +126,6 @@ struct igbvf_buffer {
+ 			unsigned int page_offset;
+ 		};
+ 	};
+-	struct page *page;
+ };
+ 
+ union igbvf_desc {
+-- 
+1.7.4.5
+
+
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config
index d2bba6bee..fa7600cfb 100644
--- a/libre/kernel26-libre-lts/config
+++ b/libre/kernel26-libre-lts/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Fri Feb 18 17:22:19 2011
+# Mon Apr 18 12:31:05 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2308,9 +2308,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2324,10 +2324,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
@@ -4457,7 +4457,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -4567,7 +4567,8 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_4KSTACKS is not set
 CONFIG_DOUBLEFAULT=y
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64
index 30cc5aefa..b0aadff4e 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre/kernel26-libre-lts/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Mon Apr 18 14:25:56 2011
+# Tue May 10 08:27:04 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -4378,7 +4378,8 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index a0d3f1497..29e055afe 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libretools
 pkgver=$(date -u +%Y%m%d)
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
 url="http://parabolagnulinux.org"
@@ -35,6 +35,7 @@ build() {
 
 package() {
   install -d ${pkgdir}/usr/bin
+  install -d ${pkgdir}/usr/sbin
   install -d ${pkgdir}/etc
 
   install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
@@ -47,7 +48,6 @@ package() {
   install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
@@ -56,5 +56,7 @@ package() {
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
+
+  install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
   
 } 
\ No newline at end of file
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 2657f5208..8eea37689 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -2,25 +2,8 @@
 # arg 1:  the new package version
 post_install() {
   cat <<EOF
-
-For using libremakepkg /etc/libretools.conf to fit your needs.
-
-For the scripts that can be run as normal user you can make
-custom configuration by copying /etc/libretools.conf to
-\$XDG_CONFIG_HOME/libretools/libretools.conf
-     
-You should add this to your ~/.ssh/config file:
-
-# Parabola Host
-Host parabola
-   Port 22
-   HostName repo.parabolagnulinux.org
-   User parabolavnx
-   IdentityFile ~/.ssh/id_rsa
-# End Parabola Host
-
-Edit IdentityFile as needed.
-
+Please check http://wiki.parabolagnulinux.org/hacking:packagers
+and follow instructions there before using libretools.
 EOF
 }
 
@@ -30,6 +13,7 @@ post_upgrade() {
   cat <<EOF
 Check your /etc/libretools.conf
 
+Make sure LIBREDESTDIR finish with "repo" instead of "free"
 EOF
 }
 
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index eacbfdbb4..dcab9e342 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 pkgname=unarchiver
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686')
 url="http://wakaba.c3.cx/s/apps/unarchiver.html"
@@ -12,18 +12,20 @@ source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip
 md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41')
 replaces=('unrar')
 conflicts=('unrar')
+provides=('unrar')
 
 build() {
   cd "$srcdir/The Unarchiver/XADMaster"
 
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
+  make -f Makefile.linux unar lsar
 }
 
 package() {
   cd "$srcdir/The Unarchiver/XADMaster"
   install -d "$pkgdir/usr/bin/"
-  cp unar lsar "$pkgdir/usr/bin/"
+  install -m755 unar ${pkgdir}/usr/bin
+  install -m755 lsar ${pkgdir}/usr/bin
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 26df281b6..83f9070fc 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
 pkgname=your-freedom
-pkgver=$(LC_ALL=C date +%Y%m%d)
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
 pkgdesc="This package conflicts with every unfree package known to date."
 arch=('any')
@@ -8,25 +8,18 @@ url="http://parabolagnulinux.org"
 license=('GPL')
 groups=('base')
 install=${pkgname}.install
-source=(http://repo.parabolagnulinux.org/docs/blacklist.txt
-        http://repo.parabolagnulinux.org/docs/whitelist.txt)
+source=()
+md5sums=()
 noextract=()
-md5sums=() #generate with 'makepkg -g'
-
-get_blacklist() {
-    unfree=($(wget -q -O - ${source[0]} | \
-        cut -d':' -f1,2 | \
-        sed "s/:$//" | \
-        grep -v ":" | \
-        sort -u))
-    echo "conflicts=(${unfree[@]})"
-}
 
 build() {
-    install -d $pkgdir/usr/share/doc/${pkgname}
-    install -m644 $srcdir/{black,white}list.txt
+    cd ${srcdir}
+    wget http://repo.parabolagnulinux.org/docs/blacklist.txt
+    wget http://repo.parabolagnulinux.org/docs/whitelist.txt
+    install -d ${pkgdir}/usr/share/doc/${pkgname}
+    install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/
 }
 
-md5sums=('2637ca96bd9e39dacd452bec01307345'
-         '98d40d324ed474a9b2a222432fb97f02')
-conflicts=(abyssws aqua-data-studio arch-artwork arch-firefox-search archlinux-artwork archlinux-menus archlinux-themes-kde archlinux-themes-kdm archlinux-themes-slim archlinux-wallpaper arch-wiki-docs b43-fwcutter bass blobwars boinc boinc-nox chromium-bsu crafty d4x dina-font dosemu faac firefox-i18n firefox-spell-pt-br firefox-spell-ru flashplugin fmodex font-mathematica foomatic-db-nonfree gstreamer0.10-bad ipw2100-fw ipw2200-fw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode java-sun jdk jre kernel26-firmware lha lib32-libflashsupport lib32-nvidia-utils libflashsupport linux-firmware mac martian martian-utils mesa-demos mod_fastcgi monaco-linux-font ndiswrapper ndiswrapper-utils netperf nouveau-firmware nvidia nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils nvidia-cg-toolkit nvidia-lts nvidia-utils nxclient openttd-opensfx opera povray profont pypy qingy-theme-arch qstat rt2870usb-fw rt2x00-rt61-fw rt2x00-rt71w-fw sdlmame sfarkxtc skype skype-oss skype-staticqt slim-themes snes9x sopcast sqlite3-doc tarsnap ttf-hannom ttf-ms-fonts urbanterror urbanterror-data vbaexpress virtualbox-additions virtualbox-additions-modules visualboyadvance warsow-data xdm-archlinux xf86-input-vmmouse xf86-video-vmware xorg-xlsfonts xpdf-chinese-simplified xpdf-chinese-traditional xpdf-japanese xpdf-korean xsnow xv zd1211-firmware)
+package() {
+    conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt))
+}