From 594b847b5585209e16c8b19b429945175ccb5df6 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Thu, 13 May 2010 00:39:38 +0200 Subject: [PATCH] system/atarisio: Updated for version 20100113 --- system/atarisio/README.Slackware | 55 +++++++++++++++++------------ system/atarisio/atarisio.SlackBuild | 21 +++++------ system/atarisio/atarisio.info | 8 +++-- system/atarisio/doinst.sh | 12 +++---- system/atarisio/man/atpdump.1 | 18 ---------- system/atarisio/man/atr2atp.1 | 19 ---------- 6 files changed, 54 insertions(+), 79 deletions(-) delete mode 100644 system/atarisio/man/atpdump.1 delete mode 100644 system/atarisio/man/atr2atp.1 diff --git a/system/atarisio/README.Slackware b/system/atarisio/README.Slackware index 4cda49fe00..aabe7090a4 100644 --- a/system/atarisio/README.Slackware +++ b/system/atarisio/README.Slackware @@ -15,35 +15,44 @@ you're using FujiChat on your Atari, etc etc). #### READ THIS! #### -# By default, atariserver and atarixfer are installed setuid root, -# group owner "users". This is done for two reasons: (a) so the programs -# can access the /dev/atarisio* devices, and (b) so they can set POSIX -# realtime scheduling mode, which prevents timing issues that can cause -# SIO frames to be retransmitted or (on a loaded system) dropped. +By default, atariserver and atarixfer are installed setuid root, +group owner "users". This is done for two reasons: (a) so the programs +can access the /dev/atarisio* devices, and (b) so they can set POSIX +realtime scheduling mode, which prevents timing issues that can cause +SIO frames to be retransmitted or (on a loaded system) dropped. -# If run setuid root, atariserver and atarixfer will drop their root -# privileges after setting realtime mode and opening the device. -# There are no currently known exploits against atarisio, but the code -# hasn't exactly been audited by the NSA either. +If run setuid root, atariserver and atarixfer will drop their root +privileges after setting realtime mode and opening the device. +There are no currently known exploits against atarisio, but the code +hasn't exactly been audited by the NSA either. -# You have several options here: +You have several options here: -# 1. The default. Simply run this script. On a single-user system, this -# is reasonable, though it's the least secure. atariserver and atarixfer -# will be setuid root, and runnable by anyone in the users group. +1. The default. Simply run the script. On a single-user system, this is +reasonable, though it's the least secure. atariserver and atarixfer will +be setuid root, and runnable by anyone in the users group. + +2. Run atariserver and atarixfer setuid root, but restrict access to +some group other than "users". To do this, run the script as: -# 2. Run atariserver and atarixfer setuid root, but restrict access to -# some group other than "users". To do this, run the script as: # SETUID=yes GROUP=wheel ./atarisio.SlackBuild -# (replace "wheel" with any other group, as you prefer). -# This option is more secure than option 1 and outperforms option 3. -# 3. Run atariserver and atarixfer as a normal user. This can cause -# performance problems, but on most setups it works OK. To do this, -# run the script as: +(replace "wheel" with any other group, as you prefer). +This option is more secure than option 1 and outperforms option 3. + +3. Run atariserver and atarixfer as a normal user. This can cause +performance problems, but on most setups it works OK (on some systems, +it may not work at all). To do this, run the script as: + # SETUID=no ./atarisio.SlackBuild -# This should be more secure than 1 or 2. -# 4. Same as 3, but extra paranoid: use a group other than "users" (I like -# "wheel"), and be very picky about who you add to the group. +This should be more secure than 1 or 2. + +4. Same as 3, but extra paranoid: use a group other than "users" (I like +"wheel", but you could create your own "atarisio" group if you really +want), and be very picky about who you add to the group. + # SETUID=no GROUP=wheel ./atarisio.SlackBuild + +Like option 3, this may cause performance problems or prevent the app +from working at all. diff --git a/system/atarisio/atarisio.SlackBuild b/system/atarisio/atarisio.SlackBuild index 9d96a861c6..63e3d11b75 100644 --- a/system/atarisio/atarisio.SlackBuild +++ b/system/atarisio/atarisio.SlackBuild @@ -3,10 +3,9 @@ # Slackware build script for atarisio # Written by B. Watson (yalhcru@gmail.com) -# Modified by the SlackBuilds.org project. PRGNAM=atarisio -VERSION=20080714 +VERSION=20100113 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -20,11 +19,12 @@ KERNEL=${KERNEL:-$(uname -r)} KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build} PKG_VERS=${VERSION}_$(echo $KERNEL | tr - _) -SRCVER=${SRCVER:-080714} +SRCVER=$( echo $VERSION | sed 's/^..//' ) SETUID=${SETUID:-yes} GROUP=${GROUP:-users} +# No need for LIBDIRSUFFIX here, no /usr/lib dir in package. if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then @@ -51,7 +51,7 @@ mkdir -p $PKG/usr/{include,bin} $PKG/lib/modules/$KERNEL/misc make install INST_DIR=$PKG/usr MDIR=$PKG/lib/modules/$KERNEL/misc # Hias forgot to add a couple of useful tools to his "make install" rule: -cp tools/{ataricom,atpdump,atr2atp,casinfo} $PKG/usr/bin +cp tools/casinfo $PKG/usr/bin strip $PKG/usr/bin/* chown -R root:root $PKG/usr/bin @@ -64,16 +64,17 @@ else fi -# Doing it this way allows this script to work on 12.0 and 12.1 also. -mkdir -p $PKG/etc/udev/rules.d -sed 's/@GROUP@/'$GROUP'/g' < $CWD/999-$PRGNAM.rules.in > $PKG/etc/udev/rules.d/999-$PRGNAM.rules +mkdir -p $PKG/lib/udev/rules.d +sed 's/@GROUP@/'$GROUP'/g' \ + < $CWD/999-$PRGNAM.rules.in \ + > $PKG/lib/udev/rules.d/999-$PRGNAM.rules mkdir -p $PKG/usr/man/man1 -( cd $CWD/man +cd $CWD/man for i in *.1; do gzip -9c $i > $PKG/usr/man/man1/$i.gz done -) +cd - mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS cp $CWD/README.Slackware README LICENSE Changelog $PKG/usr/doc/$PRGNAM-$PKG_VERS @@ -84,4 +85,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/atarisio/atarisio.info b/system/atarisio/atarisio.info index 5d11206990..c17018141e 100644 --- a/system/atarisio/atarisio.info +++ b/system/atarisio/atarisio.info @@ -1,8 +1,10 @@ PRGNAM="atarisio" -VERSION="20080714" +VERSION="20100113" HOMEPAGE="http://www.horus.com/~hias/atari/" -DOWNLOAD="http://www.horus.com/~hias/atari/atarisio/atarisio-080714.tar.gz" -MD5SUM="b2005038734f48a843796a75c57df528" +DOWNLOAD="http://www.horus.com/~hias/atari/atarisio/atarisio-100113.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="9c57517620ddac22f9e750678a0e72ee" +MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" APPROVED="dsomero" diff --git a/system/atarisio/doinst.sh b/system/atarisio/doinst.sh index df3b7f1024..d3b55d1299 100644 --- a/system/atarisio/doinst.sh +++ b/system/atarisio/doinst.sh @@ -1,13 +1,13 @@ #!/bin/sh -chroot . /sbin/depmod -a +if [ -x sbin/depmod ]; then + chroot . /sbin/depmod -a +fi # Ensure that udevd knows what's up with the atarisio device(s)... -# Redirect stderr to /dev/null to avoid Slack 12.2 warning: -# Older (Slack 12.0/12.1) udevadm doesn't recognize the new form -# (--reload-rules is an error). For now, I want the package to -# work on at least 12.1 and 12.2. +# If you're on Slack 12.1 or older, the --reload-rules needs to be +# replaced with --reload_rules below. if [ -x sbin/udevadm ]; then - sbin/udevadm control --reload_rules 2>/dev/null + sbin/udevadm control --reload-rules 2>/dev/null fi diff --git a/system/atarisio/man/atpdump.1 b/system/atarisio/man/atpdump.1 deleted file mode 100644 index e993fad673..0000000000 --- a/system/atarisio/man/atpdump.1 +++ /dev/null @@ -1,18 +0,0 @@ -.TH ATPDUMP "1" "April 2009" "atpdump (atarisio 0.30)" "HiassofT Atari 8-bit Tools" -.SH NAME -atpdump \- Display the structure of an ATP format Atari 8\-bit disk image. -.SH SYNOPSIS -atpdump [file] -.SH DESCRIPTION -The ATP format is intended as an open source replacement for the proprietary -APE PRO and VAPI formats. Currently, ATP is very limited in its capabilities. -atpdump is primarily useful for testing, and for development of the ATP -format itself. -.SH AUTHOR -Matthias Reichl <\fBhias@horus.com\fR> -.PP -Man page by B. Watson <\fBurchlay@urchlay.com\fB> -.SH SEE ALSO -\&\fIatariserver\fR\|(1), \&\fIdir2atr\fR\|(1), \&\fIadir\fR\|(1), \&\fIatr2atp\fR\|(1). -.PP -AtariSIO home page: \fBhttp://www.horus.com/~hias/atari/\fR diff --git a/system/atarisio/man/atr2atp.1 b/system/atarisio/man/atr2atp.1 deleted file mode 100644 index 57d0d9090a..0000000000 --- a/system/atarisio/man/atr2atp.1 +++ /dev/null @@ -1,19 +0,0 @@ -.TH ATR2ATP "1" "April 2009" "atr2atp (atarisio 0.30)" "HiassofT Atari 8-bit Tools" -.SH NAME -atr2atp \- converts a ATR\-format Atari 8\-bit disk image to the experimental -ATP format supported by atariserver. -.SH SYNOPSIS -atr2atp [input-file] [output-file] -.SH DESCRIPTION -The ATP format is intended as an open source replacement for the proprietary -APE PRO and VAPI formats. Currently, ATP is very limited in its capabilities. -atr2atp is primarily useful for testing, and for development of the ATP -format itself. -.SH AUTHOR -Matthias Reichl <\fBhias@horus.com\fR> -.PP -Man page by B. Watson <\fBurchlay@urchlay.com\fB> -.SH SEE ALSO -\&\fIatariserver\fR\|(1), \&\fIdir2atr\fR\|(1), \&\fIadir\fR\|(1), \&\fIatpdump\fR\|(1). -.PP -AtariSIO home page: \fBhttp://www.horus.com/~hias/atari/\fR