From 4de1f7cfdca3531b7324f72b2f109384b2a3a856 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 9 Apr 2012 00:01:09 +0000
Subject: Mon Apr  9 00:01:09 UTC 2012

---
 libre/linux-libre/.directory          |  5 ++++-
 libre/linux-libre/ChangeLog           |  8 ++++++++
 libre/linux-libre/PKGBUILD            |  6 +++---
 libre/linux-libre/config.i686         | 13 ++-----------
 libre/linux-libre/config.x86_64       | 13 ++-----------
 libre/linux-libre/linux-libre.install |  2 +-
 6 files changed, 20 insertions(+), 27 deletions(-)
 create mode 100644 libre/linux-libre/ChangeLog

(limited to 'libre')

diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
index 73b1767da..f39ceed05 100644
--- a/libre/linux-libre/.directory
+++ b/libre/linux-libre/.directory
@@ -1,2 +1,5 @@
 [Dolphin]
-Timestamp=2012,3,19,13,36,16
+Timestamp=2012,4,8,18,21,16
+
+[Settings]
+HiddenFilesShown=true
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
new file mode 100644
index 000000000..219120618
--- /dev/null
+++ b/libre/linux-libre/ChangeLog
@@ -0,0 +1,8 @@
+2012-04-08  André Silva  <andre.paulista@adinet.com.uy>
+
+	* linux-libre 3.3.1-1.1
+	* Disable CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+
+2012-03-03  André Silva  <andre.paulista@adinet.com.uy>
+	* linux-libre-2.3.9-2
+	* Enable CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 30110e728..8dff63ec7 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -15,7 +15,7 @@ _basekernel=3.3
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -36,8 +36,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5487da14ca81715a469c7594d39722fa'
          '58799da6f62daf1e54a256d02792b91f'
-         '8af46c6b0758fcbaf0c5f8b5c6735b29'
-         '5c19e820ab8a7fc0dcb7a8222ceb2974'
+         '559487f3e438ad95f1c80aa11abf2ed0'
+         'f3749180b53d042091a483300ef04f8d'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 38312a3d2..718c4f3b6 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -2351,17 +2351,8 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
 
 #
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index f36dc8cf5..454a61b84 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -2237,17 +2237,8 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
 
 #
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index b733c1dc0..6f0d7a347 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.3.1-1-LIBRE
+KERNEL_VERSION=3.3.1-1.1-LIBRE
 
 post_install () {
   # updating module dependencies
-- 
cgit v1.2.3-54-g00ecf