From 240fef715c025abf872f7f3e8b9a99e0d987953d Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 15:46:11 -0800
Subject: Let's not load lirc_mceusb2.

---
 abs/core-testing/lirc/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index f6fff65..eb62b7d 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.5CVS
-pkgrel=2
+pkgrel=3
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -57,6 +57,7 @@ build() {
 	patch -p1 < ../lirc_mod_mce.patch
 	make KDIR=/usr/src/linux-2.6.28-LinHES/
 	cp lirc_mod_mce.ko $startdir/pkg/lib/modules/2.6.28-LinHES/kernel/drivers/misc/
+	mv $startdir/pkg/lib/modules/2.6.28-LinHES/kernel/drivers/misc/lirc_mceusb2.ko $startdir/pkg/lib/modules/2.6.28-LinHES/kernel/drivers/misc/lirc_mceusb2.ko.not
 }
 md5sums=('8f3ba7eb57529992f3991d6981a3feb6'
          '1753acd774f50b638e6173d364de53fd'
-- 
cgit v0.12


From 05a91fff085a94534d9096986d058a0b52af0849 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 15:46:36 -0800
Subject: Modifications for deps.

---
 abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD b/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD
index c97b160..881b636 100644
--- a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD
+++ b/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD
@@ -1,13 +1,13 @@
 # Contributor: Dennis Brendel <buddabrod@gmail.com>
 
 pkgname=xine-lib-vdpau-svn
-pkgver=222
+pkgver=240
 pkgrel=1
 pkgdesc="A free video player library for Unix with support for vdpau"
 arch=('i686' 'x86_64')
 url="http://xinehq.de/"
 license=('GPL')
-depends=('libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' 'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1' 'nvidia-utils>=180.16' 'nvidia>=180.16')
+depends=('libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' 'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1' 'nvidia-utils-beta>=180.16' 'nvidia-beta>=180.16')
 optdepends=('codecs')
 makedepends=('subversion' 'pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 'vcdimager' 'jack-audio-connection-kit' 'cvs')
 conflicts=('xine-lib')
-- 
cgit v0.12


From 5bc6b96828aa91b7c49fb278da35628a599469cf Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 16:02:28 -0800
Subject: Added mplayer-resume.pl.

---
 abs/core-testing/linhes-scripts/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 761c740..9543ba4 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
-- 
cgit v0.12


From 6c79234ec48557423f59d62a6e00b00e0c140af4 Mon Sep 17 00:00:00 2001
From: Tom Culliton <culliton@x2.(none)>
Date: Fri, 27 Feb 2009 23:10:41 -0500
Subject: Make the backup utilities check that they are being run by the root
 user and quit with an obvious error message otherwise.

---
 abs/core-testing/LinHES-system/bin/backupcommon | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/abs/core-testing/LinHES-system/bin/backupcommon b/abs/core-testing/LinHES-system/bin/backupcommon
index 39a62e9..3491b2a 100644
--- a/abs/core-testing/LinHES-system/bin/backupcommon
+++ b/abs/core-testing/LinHES-system/bin/backupcommon
@@ -5,6 +5,9 @@
     exit 1
 }
 
+# You need to be root at least via sudo for the backup utilities to work.
+must_be_root
+
 #----------------------------------------------------------------------------
 DATABASE="mythconverg"
 DATABASE_DIR="/data/srv/mysql/$DATABASE"
-- 
cgit v0.12


From e42bd847fc96c103b7e2d958b77339a6ae4cf310 Mon Sep 17 00:00:00 2001
From: Tom Culliton <culliton@x2.(none)>
Date: Fri, 27 Feb 2009 23:13:14 -0500
Subject: Attempt to make this more correct for an Arch system using runit.

---
 abs/core-testing/local-website/htdocs/index.html | 64 +++++++-----------------
 1 file changed, 17 insertions(+), 47 deletions(-)

diff --git a/abs/core-testing/local-website/htdocs/index.html b/abs/core-testing/local-website/htdocs/index.html
index c5ae009..661f673 100644
--- a/abs/core-testing/local-website/htdocs/index.html
+++ b/abs/core-testing/local-website/htdocs/index.html
@@ -1,39 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-
-  
   <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-
-  
   <meta content="Cecil Watson" name="author">
-
-  
- 
-  
   <title>LinHES R6</title>
   <link href="KnoppMyth.css" rel="stylesheet" type="text/css">
 </head>
-
-
 <body>
 <p align="center"><a href="http://www.mysettopbox.tv">
       <img src="header.png" alt="Tux with a Remote" align="middle" border="0"></a>
   </p>
-
-	
-  
 <table align="center" border="0" cellpadding="5">
 
     <tbody>
-
       <tr>
-
 	<td style="vertical-align: top;">
-	  
       <p class="headerimage" align="center"><b>The Linux Home Entertainment System Release 6</b></p>
 
-	  
       <p><a href="mythweb/mythweb.php"><b>MythWeb</b></a>: <br>
 
 		&nbsp; &nbsp; The MythWeb allows you to use a web page to control
@@ -41,7 +24,6 @@
 		but it is dependent upon MythTV being installed and operational."
 	  </p>
 
-	  
       <p><a href="remote/index.html"><b>MythTV Web Virtual Remote</b></a>: <br>
 
 		&nbsp; &nbsp; A web based virtual remote control for MythTV.
@@ -50,38 +32,32 @@
 		<b>Utilities/Setup -&gt; Setup -&gt; General -&gt; Fourth Page</b>.
 	  </p>
 
-	  
       <p><a href="mythtv-doc/mythtv-HOWTO.html"><b>MythTV Documentation</b></a>: <br>
 
 		&nbsp; &nbsp; The MythTV Installation / User's Guide.
 	  </p>
 
-	  
       <p><a href="mythtv-doc/keys.txt"><b>MythTV Keybindings</b></a>: <br>
 
 		&nbsp; &nbsp; The keybindings for the normal MythTV interface.
 	  </p>
 
-	  
       <p><a href="linhes.html"><b>LinHES</b></a>: <br>
 
 		&nbsp; &nbsp; Describes how "The Project Leader" setup multiple systems
 		to form a <b>Lin</b>ux <b>H</b>ome <b>E</b>ntertainment <b>S</b>ystem.
 	  </p>
 
-	  
       <p><a href="folding@home/"><b>My Folding Status</b></a>: <br>
 
 		&nbsp; &nbsp; Status of the folding@home work for the local user.
 	  </p>
 
-	  
       <p><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&amp;teamnum=50975"><b>Folding@home</b></a>: <br>
 
 		&nbsp; &nbsp; KnoppMyth Team status for the folding@home effort.
 	  </p>
 
-	  
       <p><a href="ipodfeed/"><b>iPod Feeds</b></a> <br>
 
 		&nbsp; &nbsp; Transcodes ready for the ipod (if any).</p>
@@ -91,44 +67,42 @@
 &nbsp;&nbsp;&nbsp; FUPPES - Free UPnP Entertainment Service. &nbsp;A
 UPnP to be used inplace of the UPnP server that comes with MythTV.
 &nbsp;If the UPnP that comes with MythTV doesn't work for you, you can
-try FUPPES. &nbsp;Edit /etc/init.d/mythtv-backend, comment
-EXTRA_ARGS="" and uncomment #EXTRA_ARGS="--noupnp". &nbsp;Then restart
-the backend and start FUPPES.</p>
-      <p style="font-weight: bold;">/etc/init.d/mythtv-backend restart<br>
-/etc/init.d/fuppes start</p>
-      <p>If you want FUPPES to start on boot:</p>
-      <p><b>update-rc.d fuppes defaults 80</b></p>
+try FUPPES. &nbsp;Edit <i>/etc/sv/mythtvbackend/run</i>, and add "<i>--noupnp</i>"
+to the command line for <i>/usr/bin/mythbackend</i>. &nbsp;Then restart the
+backend and start FUPPES.</p>
+      <p style="font-weight: bold;">sv restart mythtvbackend fuppes</p>
+      <p>If you want FUPPES to start on boot add a link to the
+      <i>/etc/sv/fuppes</i> directory under <i>/var/service</i>.</p>
+      <p><b>ln -s /etc/sv/fuppes /var/service</b></p>
       <p></p>
 
-	  
       <p><a href="motion/index.html"><b>Motion</b></a>: <br>
 
-		&nbsp; &nbsp; Motion is a software motion detector. The configuration file for 
+		&nbsp; &nbsp; Motion is a software motion detector. The configuration file for
 		motion is <i>/etc/motion/motion.conf</i>. All you should have to do is edit
 		"videodevice" to point to your webcam or capture device. You'll also
 		need to change the IP in <i>/var/www/motion/index.html</i> to the IP of your
 		backend.
-		<br>
+		<br><br>
+
+		&nbsp; &nbsp; As root: <b>sv start motion</b> will start motion.
+		To have it start automatically add a link to the
+                <i>/etc/sv/motion</i> directory under <i>/var/service</i>.</p>
+                <p><b>ln -s /etc/sv/motion /var/service</b></p>
+		<p>Images and video are stored in <i>/myth/motion</i>.
+		Symlinks to <i>/myth/gallery</i> and <i>/myth/video</i> exist.
+                <br><br>
 
 		For further detail on configuring Motion, please read the
 		<a href="http://www.lavrsen.dk/twiki/bin/view/Motion/MotionGuide">Motion Guide</a>.
-		<br>
 
-		&nbsp; &nbsp; As root: <b>/etc/init.d/motion start</b> will start motion.
-		To have it start automatically, <b>update-rc.d motion defaults 80</b>.
-		Images and video are stored in <i>/myth/motion</i>.
-		Symlinks to <i>/myth/gallery</i> and <i>/myth/video</i> exist. <br>
-
-		&nbsp; &nbsp; Hover on the left side of the video feed in your web browser.
 	  </p>
 
-	  
       <p><a href="rrd/index.html"><b>RRDTool</b></a>: <br>
 
 		&nbsp; &nbsp; Hardware status graphs.
 	  </p>
 
-	  
       <p><a href="vlc_control.php"><b>VLC HTTP Interface</b></a>: <br>
 
 		&nbsp; &nbsp; Web interface for VideoLan Client.
@@ -143,16 +117,12 @@ the backend and start FUPPES.</p>
       <p><a href="javascript:void(0)"onclick="window.open('mythweb/data/mp3player.html','linkname','height=100, width=260,scrollbars=no')"><b>KnoppMyth Radio</b></a>: <br>
 
                 &nbsp; &nbsp; Your music must be encoded as MP3 in MythMusic for this to work.</p>
-	  
         </td>
-
       </tr>
-
     <tr>
       <td style="vertical-align: top;"></td>
     </tr>
   </tbody>
-  
 </table>
 
 </body>
-- 
cgit v0.12


From a2800b8b4932abb6c8d5b0c32c1f9ba76adc4508 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 21:18:04 -0800
Subject: Added mplayer-resume.

---
 abs/core-testing/linhes-scripts/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 9543ba4..d29721e 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -14,7 +14,7 @@ source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-scripts.tar.bz2)
 build() {
   cd $startdir/src/
   mkdir -p $startdir/pkg/usr/LH/bin
-  cp imp* myth* shoo* pau*sh  $startdir/pkg/usr/LH/bin
+  cp imp* myth* shoo* pau*sh mplayer* $startdir/pkg/usr/LH/bin
   mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise
   cp run $startdir/pkg/etc/sv/pause-mythcommflag/
   mkdir -p $startdir/pkg/etc/logrotate.d/
-- 
cgit v0.12


From f8ed07d415ace905fe7bf99717c53275e04a42be Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 21:18:20 -0800
Subject: Requested by the community.

---
 abs/extra-testing/community/libelf/PKGBUILD        | 22 ++++++++++++
 abs/extra-testing/community/libstdc++5/PKGBUILD    | 41 ++++++++++++++++++++++
 .../libstdc++5/gcc-3.4.3-no_multilib_amd64.patch   | 11 ++++++
 abs/extra-testing/community/screen/PKGBUILD        | 41 ++++++++++++++++++++++
 abs/extra-testing/community/screen/screen.install  | 27 ++++++++++++++
 abs/extra-testing/community/screen/screen.pam      |  1 +
 6 files changed, 143 insertions(+)
 create mode 100644 abs/extra-testing/community/libelf/PKGBUILD
 create mode 100644 abs/extra-testing/community/libstdc++5/PKGBUILD
 create mode 100644 abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
 create mode 100644 abs/extra-testing/community/screen/PKGBUILD
 create mode 100644 abs/extra-testing/community/screen/screen.install
 create mode 100644 abs/extra-testing/community/screen/screen.pam

diff --git a/abs/extra-testing/community/libelf/PKGBUILD b/abs/extra-testing/community/libelf/PKGBUILD
new file mode 100644
index 0000000..0cf517b
--- /dev/null
+++ b/abs/extra-testing/community/libelf/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 20525 2008-12-05 13:31:11Z jgc $
+# Maintainer: arjan <arjan@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=libelf
+pkgver=0.8.10
+pkgrel=3
+pkgdesc="libelf is a free ELF object file access library"
+arch=(i686 x86_64)
+license=('GPL')
+source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
+url="http://directory.fsf.org/libs/misc/libelf.html"
+depends=('glibc')
+md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr --enable-shared \
+      --enable-gnu-names --enable-compat || return 1
+    make || return 1
+    make prefix="${pkgdir}/usr" install || return 1
+}
diff --git a/abs/extra-testing/community/libstdc++5/PKGBUILD b/abs/extra-testing/community/libstdc++5/PKGBUILD
new file mode 100644
index 0000000..00bee17
--- /dev/null
+++ b/abs/extra-testing/community/libstdc++5/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libstdc++5
+pkgver=3.3.6
+pkgrel=2
+pkgdesc="GNU Standard C++ library version 3"
+arch=(i686 x86_64)
+url="http://gcc.gnu.org"
+depends=('gcc-libs')
+makedepends=('binutils' 'gcc')
+options=(!libtool)
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch)
+md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \
+         088e0807e677010cafe4e590e8711be1)
+
+build(){
+  export MAKEFLAGS="-j1"
+  export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||')
+  export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||')
+  cd ${startdir}/src/gcc-${pkgver}
+
+  if [ "$CARCH" = "x86_64" ]; then
+    patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1
+  fi
+
+  # No fixincludes
+  sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+  mkdir ../gcc-build
+  cd ../gcc-build
+  ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
+      --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
+      --disable-multilib --libdir=/usr/lib
+  make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1
+  make DESTDIR=${startdir}/pkg install-target-libstdc++-v3 || return 1
+
+  # Remove includefiles and libs provided by gcc
+  rm -rf ${startdir}/pkg/usr/{include,share/locale}
+  rm -f ${startdir}/pkg/usr/lib/*.a
+  rm -f ${startdir}/pkg/usr/lib/libstdc++.so
+}
diff --git a/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
new file mode 100644
index 0000000..dce10d4
--- /dev/null
+++ b/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
@@ -0,0 +1,11 @@
+--- gcc/config/i386/t-linux64.orig	2003-06-28 00:19:59.000000000 +0000
++++ gcc/config/i386/t-linux64	2003-06-28 00:20:07.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = . ../lib
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/abs/extra-testing/community/screen/PKGBUILD b/abs/extra-testing/community/screen/PKGBUILD
new file mode 100644
index 0000000..f97df4b
--- /dev/null
+++ b/abs/extra-testing/community/screen/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 9361 2008-08-17 06:28:44Z allan $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Committer: dorphell <dorphell@gmx.net>
+
+pkgname=screen
+pkgver=4.0.3
+pkgrel=6
+_ptygroup=5 #the UID of our PTY/TTY group
+pkgdesc="Full-screen window manager that multiplexes a physical terminal"
+license=('GPL')
+arch=('i686' 'x86_64')
+install=screen.install
+depends=(ncurses libelf shadow gpm)
+backup=('etc/screenrc' 'etc/pam.d/screen')
+url="ftp://ftp.uni-erlangen.de/pub/utilities/screen"
+source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz \
+        screen.pam)
+md5sums=('8506fd205028a96c741e4037de6e3c42' '74f7919d7b65436cc2ea5341fa8ca374')
+
+build() {
+  export MAKEFLAGS="-j1"
+  cd ${startdir}/src/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --enable-pam \
+        --with-sys-screenrc=/etc/screenrc --enable-colors256 \
+       --enable-rxvt_osc --with-pty-group=$_ptygroup \
+       --mandir=/usr/share/man
+  make || return 1
+  make DESTDIR=${startdir}/pkg install || return 1
+  mkdir -p ${startdir}/pkg/etc/pam.d 
+  install -m644 ${startdir}/src/screen.pam ${startdir}/pkg/etc/pam.d/screen
+
+  cd etc/
+  mkdir -p ${startdir}/pkg/usr/share/zsh/site-functions/
+  install -m644 completer.zsh ${startdir}/pkg/usr/share/zsh/site-functions/screen
+  mkdir -p ${startdir}/pkg/etc/skel/
+  install -m644 etcscreenrc ${startdir}/pkg/etc/screenrc
+  install -m644 screenrc ${startdir}/pkg/etc/skel/.screenrc
+
+  rm -rf ${startdir}/pkg/usr/info
+}
diff --git a/abs/extra-testing/community/screen/screen.install b/abs/extra-testing/community/screen/screen.install
new file mode 100644
index 0000000..51bd6a7
--- /dev/null
+++ b/abs/extra-testing/community/screen/screen.install
@@ -0,0 +1,27 @@
+
+pre_upgrade() {
+    pre_remove $*
+}
+
+pre_remove() {
+    compiled="/usr/share/terminfo/s/screen-256color"
+    if [ -e $compiled ]; then
+        if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
+            echo -n "removing compiled terminfo..."
+            rm -f $compiled
+            echo "done."
+        fi
+    fi
+    compiled="/usr/share/terminfo/s/screen-256color-bce"
+    if [ -e $compiled ]; then
+        if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
+            echo -n "removing compiled terminfo..."
+            rm -f $compiled
+            echo "done."
+        fi
+    fi
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/extra-testing/community/screen/screen.pam b/abs/extra-testing/community/screen/screen.pam
new file mode 100644
index 0000000..07c42ad
--- /dev/null
+++ b/abs/extra-testing/community/screen/screen.pam
@@ -0,0 +1 @@
+auth		required	pam_unix.so
-- 
cgit v0.12


From d089f6a6e210a4b4dfbcb435c94200171c28423e Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 21:31:46 -0800
Subject: Protect users from themselves.

---
 abs/core-testing/openssh/PKGBUILD         | 8 +++++---
 abs/core-testing/openssh/sshd_config.diff | 0
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 abs/core-testing/openssh/sshd_config.diff

diff --git a/abs/core-testing/openssh/PKGBUILD b/abs/core-testing/openssh/PKGBUILD
index 3313676..81bc2a0 100644
--- a/abs/core-testing/openssh/PKGBUILD
+++ b/abs/core-testing/openssh/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=5.1p1
-pkgrel=2
+pkgrel=3
 #_gsskexver=20080404
 pkgdesc='A Secure SHell server/client'
 arch=(i686 x86_64)
@@ -13,13 +13,15 @@ url="http://www.openssh.org/portable.html"
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 depends=('openssl>=0.9.8g' 'zlib' 'pam' 'tcp_wrappers' 'heimdal>=1.2-1')
 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz
-        sshd sshd.confd sshd.pam)
+        sshd sshd.confd sshd.pam sshd_config.diff)
         #http://www.sxw.org.uk/computing/patches/$pkgname-$pkgver-gsskex-$_gsskexver.patch
 md5sums=('03f2d0c1b5ec60d4ac9997a146d2faec' 'd9ee5e0a0d143689b3d6f11454a2a892'
-         'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a')
+         'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a'
+	 'd41d8cd98f00b204e9800998ecf8427e')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -p1 < ../sshd_config.diff
   #patch -up0 < $startdir/src/$pkgname-$pkgver-gsskex-$_gsskexver.patch
 
   #NOTE we disable-strip so that makepkg can decide whether to strip or not
diff --git a/abs/core-testing/openssh/sshd_config.diff b/abs/core-testing/openssh/sshd_config.diff
new file mode 100644
index 0000000..e69de29
-- 
cgit v0.12


From c00e83b16e3dd048c2396b57531a7cec40189a39 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 27 Feb 2009 21:44:42 -0800
Subject: Really protect users from themselves.

---
 abs/core-testing/openssh/PKGBUILD   |  8 ++++----
 abs/core-testing/openssh/sshd.patch | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 abs/core-testing/openssh/sshd.patch

diff --git a/abs/core-testing/openssh/PKGBUILD b/abs/core-testing/openssh/PKGBUILD
index 81bc2a0..ade755f 100644
--- a/abs/core-testing/openssh/PKGBUILD
+++ b/abs/core-testing/openssh/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=5.1p1
-pkgrel=3
+pkgrel=4
 #_gsskexver=20080404
 pkgdesc='A Secure SHell server/client'
 arch=(i686 x86_64)
@@ -13,15 +13,15 @@ url="http://www.openssh.org/portable.html"
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 depends=('openssl>=0.9.8g' 'zlib' 'pam' 'tcp_wrappers' 'heimdal>=1.2-1')
 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz
-        sshd sshd.confd sshd.pam sshd_config.diff)
+        sshd sshd.confd sshd.pam sshd.patch)
         #http://www.sxw.org.uk/computing/patches/$pkgname-$pkgver-gsskex-$_gsskexver.patch
 md5sums=('03f2d0c1b5ec60d4ac9997a146d2faec' 'd9ee5e0a0d143689b3d6f11454a2a892'
          'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a'
-	 'd41d8cd98f00b204e9800998ecf8427e')
+	 'd5e6ef9fd6126f6a560e402561f5be6e')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../sshd_config.diff
+  patch -p1 < ../sshd.patch
   #patch -up0 < $startdir/src/$pkgname-$pkgver-gsskex-$_gsskexver.patch
 
   #NOTE we disable-strip so that makepkg can decide whether to strip or not
diff --git a/abs/core-testing/openssh/sshd.patch b/abs/core-testing/openssh/sshd.patch
new file mode 100644
index 0000000..e883a4c
--- /dev/null
+++ b/abs/core-testing/openssh/sshd.patch
@@ -0,0 +1,35 @@
+diff -ruaN openssh-5.1p1.orig/sshd_config openssh-5.1p1/sshd_config
+--- openssh-5.1p1.orig/sshd_config	2008-07-02 12:35:43.000000000 +0000
++++ openssh-5.1p1/sshd_config	2009-02-28 05:40:09.000000000 +0000
+@@ -38,14 +38,14 @@
+ # Authentication:
+ 
+ #LoginGraceTime 2m
+-#PermitRootLogin yes
++PermitRootLogin no
+ #StrictModes yes
+ #MaxAuthTries 6
+ #MaxSessions 10
+ 
+ #RSAAuthentication yes
+-#PubkeyAuthentication yes
+-#AuthorizedKeysFile	.ssh/authorized_keys
++PubkeyAuthentication yes
++AuthorizedKeysFile	.ssh/authorized_keys
+ 
+ # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+ #RhostsRSAAuthentication no
+@@ -88,7 +88,7 @@
+ #AllowAgentForwarding yes
+ #AllowTcpForwarding yes
+ #GatewayPorts no
+-#X11Forwarding no
++X11Forwarding yes
+ #X11DisplayOffset 10
+ #X11UseLocalhost yes
+ #PrintMotd yes
+@@ -117,3 +117,4 @@
+ #	X11Forwarding no
+ #	AllowTcpForwarding no
+ #	ForceCommand cvs server
++DenyUsers mythtv
-- 
cgit v0.12

