diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-03-01 20:39:05 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-03-01 20:39:05 (GMT) |
| commit | f2f661dad3f31c477f51d0165f29d9ba19a411c3 (patch) | |
| tree | 40128952f2c5e445fb7a556279f630a06eb1c7e0 /abs/core-testing | |
| parent | 58048a619b315549848b0676431729dc78dc499f (diff) | |
| parent | c00e83b16e3dd048c2396b57531a7cec40189a39 (diff) | |
| download | linhes_pkgbuild-f2f661dad3f31c477f51d0165f29d9ba19a411c3.zip linhes_pkgbuild-f2f661dad3f31c477f51d0165f29d9ba19a411c3.tar.gz linhes_pkgbuild-f2f661dad3f31c477f51d0165f29d9ba19a411c3.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Diffstat (limited to 'abs/core-testing')
| -rw-r--r-- | abs/core-testing/LinHES-system/bin/backupcommon | 3 | ||||
| -rw-r--r-- | abs/core-testing/linhes-scripts/PKGBUILD | 4 | ||||
| -rw-r--r-- | abs/core-testing/lirc/PKGBUILD | 3 | ||||
| -rw-r--r-- | abs/core-testing/local-website/htdocs/index.html | 64 | ||||
| -rw-r--r-- | abs/core-testing/openssh/PKGBUILD | 8 | ||||
| -rw-r--r-- | abs/core-testing/openssh/sshd.patch | 35 | ||||
| -rw-r--r-- | abs/core-testing/openssh/sshd_config.diff | 0 |
7 files changed, 64 insertions, 53 deletions
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" diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD index 761c740..d29721e 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') @@ -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/ 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' 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> 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> A web based virtual remote control for MythTV. @@ -50,38 +32,32 @@ <b>Utilities/Setup -> Setup -> General -> Fourth Page</b>. </p> - <p><a href="mythtv-doc/mythtv-HOWTO.html"><b>MythTV Documentation</b></a>: <br> The MythTV Installation / User's Guide. </p> - <p><a href="mythtv-doc/keys.txt"><b>MythTV Keybindings</b></a>: <br> The keybindings for the normal MythTV interface. </p> - <p><a href="linhes.html"><b>LinHES</b></a>: <br> 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> 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&teamnum=50975"><b>Folding@home</b></a>: <br> KnoppMyth Team status for the folding@home effort. </p> - <p><a href="ipodfeed/"><b>iPod Feeds</b></a> <br> Transcodes ready for the ipod (if any).</p> @@ -91,44 +67,42 @@ FUPPES - Free UPnP Entertainment Service. A UPnP to be used inplace of the UPnP server that comes with MythTV. If the UPnP that comes with MythTV doesn't work for you, you can -try FUPPES. Edit /etc/init.d/mythtv-backend, comment -EXTRA_ARGS="" and uncomment #EXTRA_ARGS="--noupnp". 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. Edit <i>/etc/sv/mythtvbackend/run</i>, and add "<i>--noupnp</i>" +to the command line for <i>/usr/bin/mythbackend</i>. 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> - Motion is a software motion detector. The configuration file for + 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> + + 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> - 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> - - 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> Hardware status graphs. </p> - <p><a href="vlc_control.php"><b>VLC HTTP Interface</b></a>: <br> 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> 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> diff --git a/abs/core-testing/openssh/PKGBUILD b/abs/core-testing/openssh/PKGBUILD index 3313676..ade755f 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=4 #_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.patch) #http://www.sxw.org.uk/computing/patches/$pkgname-$pkgver-gsskex-$_gsskexver.patch md5sums=('03f2d0c1b5ec60d4ac9997a146d2faec' 'd9ee5e0a0d143689b3d6f11454a2a892' - 'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a') + 'e2cea70ac13af7e63d40eb04415eacd5' '1c7c2ea8734ec7e3ca58d820634dc73a' + 'd5e6ef9fd6126f6a560e402561f5be6e') build() { cd $startdir/src/$pkgname-$pkgver + 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 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 --- /dev/null +++ b/abs/core-testing/openssh/sshd_config.diff |