rpmfusion-commits
October 2008
rpmfusion-commits@lists.rpmfusion.org
- 18 participants
- 749 discussions
rpms/mplayer/F-9 mplayer-nodvdcss.patch,NONE,1.1
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8936
Added Files:
mplayer-nodvdcss.patch
Log Message:
add forgotten patch
mplayer-nodvdcss.patch:
--- NEW FILE mplayer-nodvdcss.patch ---
diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/configure
--- mplayer-export-2008-09-03/configure.nodvdcss 2008-10-16 21:22:23.000000000 +0200
+++ mplayer-export-2008-09-03/configure 2008-10-16 21:30:47.000000000 +0200
@@ -589,7 +589,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
-_libdvdcss_internal=auto
+_libdvdcss_internal=no
_xanim=auto
_real=auto
_live=auto
diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/Makefile
--- mplayer-export-2008-09-03/Makefile.nodvdcss 2008-10-16 21:22:23.000000000 +0200
+++ mplayer-export-2008-09-03/Makefile 2008-10-16 21:27:12.000000000 +0200
@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
- libdvdcss/device.c \
- libdvdcss/error.c \
- libdvdcss/ioctl.c \
- libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
@@ -677,7 +672,6 @@ DIRS = . \
libavcodec/sparc \
libavformat \
libavutil \
- libdvdcss \
libdvdread \
libfaad2 \
libmenu \
@@ -783,7 +777,6 @@ codec-cfg.d: codecs.conf.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
16 years
- 1
- 0
rpms/slmodem/F-8 README.fedora, NONE, 1.1 slmodem-2.9.11-create.patch, NONE, 1.1 slmodem-2.9.11-daemon.patch, NONE, 1.1 slmodem.init, NONE, 1.1 slmodem.spec, NONE, 1.1 slmodem.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/slmodem/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8791
Modified Files:
.cvsignore sources
Added Files:
README.fedora slmodem-2.9.11-create.patch
slmodem-2.9.11-daemon.patch slmodem.init slmodem.spec
slmodem.sysconfig
Log Message:
Initial branch for F-8
--- NEW FILE README.fedora ---
Smart Link Soft Modem for Fedora
********************************
Introduction
============
The slmodem package available from http://rpm.livna.org is consisting of
two RPM packages, the slmodem package containing the needed userspace
daemon to control the modem-chipset and the slmodem-kmod package.
slmodem-kmod provides proprietary kernel modules for certain PCI and USB
modems as well as several integrated modem chipsets in notebooks.
Most Smart Link based modems integrated into today's notebooks however
do work without a proprietary kernel module. These chips are wired into
the sound codecs on the mainboard and can thus be controlled via the
alsa sound system in userspace.
This results in a non-tainted kernel and less hassle when upgrading the
kernel and is thus to be prefered.
Hardware Support
================
Proprietary Kernel Module (bad!)
--------------------------------
The following SmartLink modems should be supported by the slamr
kernel-module:
* HAMR5600 based AMR/CNR/MDC/ACR modem cards
* SmartPCI56/561/562/563 based PCI modem cards
* Southbridge based chipsets
- Intel ICH0,ICH2, ICH3, ICH4
- Via 686A, 686B, 8231, 8233
- SiS 630
- ALI 1535.
The slusb kernel modul supports the following modem chipsets:
* SmartUSB56 based USB modems
Userspace Hardware Support with ALSA (good)
-------------------------------------------
The slmodemd userspace application is also able to control the following
modem chipsets without having to access proprietary kernel modules.
* intel8x0m (snd-intel8x0m) based chipsets
- ICH based AC97 Modems (MC97)
- SiS 630 Modems
- NVidia NForce Integrated Modem
* VIA686 (snd-via82xx-modem) based chipsets
* ATI IXP (snd-atiixp-modem) based chipsets
Installation and Configuration
==============================
Depending on your hardware, you should first try installing slmodem and
running the slmodemd daemon in ALSA-mode.
If this does not work, install the slmodem-kmod package and configure
the initscript to either load the slamr or the slusb kernel module.
This can be achieved by editing /etc/sysconfig/slmodemd and setting the
INTERFACE variable to either alsa, slamr or slusb accordingly.
Restarting the slmodemd by calling service slmodem restart or rebooting
will then load the correct module, initialise the device files and load
the userspace daemon.
If your modem is supported by the driver, it can be accessed by using
/dev/ttySL0 as the modem device. This device can then be used to dial
out with the internal softmodem.
Problems
========
Please keep in mind that this is not a fedora supplied package, and thus
you won't receive any support on any of the fedora or Red Hat
mailinglists. If your modem does somehow not work, please take a look at
<http://linmodems.technion.ac.il/> for more information.
<http://www.linmodems.org/> contains a mailinglist and a mailinglist
archive should be able to answer your questions.
In case there is a bug related to the RPM-package from livna, please
file a bug at <http://bugzilla.livna.org>.
slmodem-2.9.11-create.patch:
--- NEW FILE slmodem-2.9.11-create.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_datafile.c.create slmodem-2.9.11-20080817/modem/modem_datafile.c
--- slmodem-2.9.11-20080817/modem/modem_datafile.c.create 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_datafile.c 2008-10-15 23:45:26.000000000 +0200
@@ -48,6 +48,7 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include <modem_defs.h>
#include <modem_debug.h>
@@ -111,7 +112,7 @@ int datafile_save_info(char *file_name,s
int ret = -1;
int fd;
- fd = open(file_name,O_CREAT|O_WRONLY);
+ fd = open(file_name,O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
if(fd < 0)
return -errno;
slmodem-2.9.11-daemon.patch:
--- NEW FILE slmodem-2.9.11-daemon.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon slmodem-2.9.11-20080817/modem/modem_cmdline.c
--- slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_cmdline.c 2008-10-15 23:45:38.000000000 +0200
@@ -74,6 +74,7 @@ unsigned int need_realtime = 1;
unsigned int ring_detector = 0;
#endif
unsigned int use_alsa = 0;
+unsigned int daemonize = 0;
unsigned int use_short_buffer = 0;
const char *modem_group = "uucp";
mode_t modem_perm = 0660;
@@ -86,6 +87,7 @@ enum {
OPT_COUNTRY,
OPT_COUNTRYLIST,
OPT_ALSA,
+ OPT_DAEMON,
OPT_GROUP,
OPT_PERM,
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -113,6 +115,7 @@ static struct opt {
{'c',"country","default modem country name",MANDATORY,STRING,"USA"},
{ 0 ,"countrylist","show list of supported countries"},
{'a',"alsa","ALSA mode (see README for howto)"},
+ {'d',"daemon","Daemon mode"},
{'g',"group","Modem TTY group",MANDATORY,STRING,"uucp"},
{'p',"perm","Modem TTY permission",MANDATORY,INTEGER,"0660"},
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -252,6 +255,8 @@ void modem_cmdline(int argc, char *argv[
#endif
use_alsa = 1;
}
+ if(opt_list[OPT_DAEMON].found)
+ daemonize = 1;
if(opt_list[OPT_GROUP].found)
modem_group = opt_list[OPT_GROUP].arg_val;
if(opt_list[OPT_PERM].found) {
diff -up slmodem-2.9.11-20080817/modem/modem_main.c.daemon slmodem-2.9.11-20080817/modem/modem_main.c
--- slmodem-2.9.11-20080817/modem/modem_main.c.daemon 2008-08-04 03:40:13.000000000 +0200
+++ slmodem-2.9.11-20080817/modem/modem_main.c 2008-10-15 23:49:00.000000000 +0200
@@ -57,6 +57,7 @@
#include <signal.h>
#include <limits.h>
#include <grp.h>
+#include <syslog.h>
#ifdef SUPPORT_ALSA
#define ALSA_PCM_NEW_HW_PARAMS_API 1
@@ -70,8 +71,8 @@
#include <modem.h>
#include <modem_debug.h>
-#define INFO(fmt,args...) fprintf(stderr, fmt , ##args );
-#define ERR(fmt,args...) fprintf(stderr, "error: " fmt , ##args );
+#define INFO(fmt,args...) (daemonize) ? syslog(LOG_INFO, fmt, ##args) : fprintf(stderr, fmt , ##args );
+#define ERR(fmt,args...) (daemonize) ? syslog(LOG_ERR, "error: " fmt, ##args) : fprintf(stderr, "error: " fmt , ##args );
#define DBG(fmt,args...) dprintf("main: " fmt, ##args)
@@ -131,6 +132,7 @@ static char outbuf[4096];
#define INTERNAL_DELAY 40 /* internal device tx/rx delay: should be selfdetectible */
extern unsigned use_alsa;
+extern unsigned daemonize;
static snd_output_t *dbg_out = NULL;
static int alsa_mixer_setup(struct device_struct *dev, const char *dev_name)
@@ -966,6 +968,11 @@ int modem_main(const char *dev_name)
INFO("modem `%s' created. TTY is `%s'\n",
m->name, m->pty_name);
+ // daemonize
+ if (daemonize)
+ if (!daemon(0, 0))
+ ERR("slmodemd could not daemonize");
+
sprintf(path_name,"/var/lib/slmodem/data.%s",basename(dev_name));
datafile_load_info(path_name,&m->dsp_info);
@@ -984,7 +991,7 @@ int modem_main(const char *dev_name)
signal(SIGINT, mark_termination);
signal(SIGTERM, mark_termination);
- INFO("Use `%s' as modem device, Ctrl+C for termination.\n",
+ INFO("Modem device: `%s'\n",
*link_name ? link_name : m->pty_name);
/* main loop here */
--- NEW FILE slmodem.init ---
#!/bin/sh
#
# slmodem This shell script takes care of starting and stopping
# the SmartLink modem userspace daemon.
#
# chkconfig: 2345 50 50
# description: slmodemd is a daemon which is needed to use the SmartLink \
# softmodem.
# processname: slmodemd
# Source function library.
. /etc/rc.d/init.d/functions
[ -x /usr/sbin/slmodemd ] || exit 0
if [ -f /etc/sysconfig/slmodem ]; then
. /etc/sysconfig/slmodem
fi
if [ $COUNTRY ]; then
COUNTRYARG="-c $COUNTRY"
fi
if [ "$INTERFACE" == "alsa" ] && [ "$ALSA_DEVICE" != "" ]; then
DEVICE=$ALSA_DEVICE
fi
modules_load() {
case "$INTERFACE" in
alsa)
ALSA="--alsa"
;;
slamr)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slamr.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slamr
[ -e /dev/slamr ] || mknod /dev/slamr c 242 0
DEVICE=/dev/slamr
fi
;;
slusb)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slusb.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slusb
[ -e /dev/slusb ] || mknod /dev/slusb c 243 0
DEVICE=/dev/slusb
fi
;;
*)
echo "Please edit /etc/sysconfig/slmodem"
echo_failure
echo
exit 1
;;
esac
}
modules_unload() {
case "$INTERFACE" in
slamr)
rmmod slamr > /dev/null
[ -c /dev/slamr ] && rm -f /dev/slamr > /dev/null
;;
slusb)
rmmod slusb > /dev/null
[ -c /dev/slusb ] && rm -f /dev/slusb > /dev/null
;;
*)
;;
esac
}
# See how we were called.
case "$1" in
start)
# Start daemon.
echo -n $"Starting SmartLink modem daemon: "
modules_load
daemon /usr/sbin/slmodemd ${ALSA} ${COUNTRYARG} ${ARGS} --daemon ${DEVICE}
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/slmodem
;;
stop)
# Stop daemon.
echo -n $"Shutting SmartLink modem daemon: "
killproc slmodemd
RETVAL=$?
modules_unload
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/slmodem
;;
status)
status slmodemd
RETVAL=$?
;;
restart|reload)
$0 stop
$0 start
;;
condrestart)
[ -f /var/lock/subsys/slmodem ] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload}"
RETVAL=1
;;
esac
exit $RETVAL
--- NEW FILE slmodem.spec ---
%define filever 2.9.11-20080817
%define relver 2.9.11
%define datetag 20080817
Summary: Userspace application for smartLink softmodems
Name: slmodem
Version: %{relver}
Release: 5.%{datetag}%{?dist}
Group: System Environment/Daemons
License: BSD w/binary object
# Outdated
# URL: http://www.smlink.com/content.aspx?id=132
URL: http://linmodems.technion.ac.il/packages/smartlink/
Source0: http://linmodems.technion.ac.il/packages/smartlink/slmodem-%{filever}.tar.gz
Source1: slmodem.init
Source2: slmodem.sysconfig
Source3: README.fedora
Patch0: slmodem-2.9.11-daemon.patch
Patch1: slmodem-2.9.11-create.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: alsa-lib-devel
ExclusiveArch: i386
Provides: slmodem-alsa = %{version}, slmodem-kmod-common = %{version}
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%description
This package contains the userspace application to control several
SmartLink based modems.
More information about installation and configuration of the slmodem
package can be found at %{_docdir}/%{name}-%{version}/README.fedora
after installation.
%prep
%setup -q -n slmodem-%{filever}
%patch0 -p1 -b .daemon
%patch1 -p1 -b .create
%build
pushd modem
make %{?_smp_mflags} SUPPORT_ALSA=1 EXTRA_CFLAGS="$RPM_OPT_FLAGS"
popd
%install
rm -rf %{buildroot}
install -D -m 755 modem/slmodemd %{buildroot}%{_sbindir}/slmodemd
install -d -m 755 %{buildroot}%{_localstatedir}/lib/slmodem
install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/slmodem
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/slmodem
cp %{SOURCE3} .
%post
/sbin/chkconfig --add slmodem
%preun
if [ $1 = 0 ]; then
/sbin/service slmodem stop >/dev/null 2>&1
/sbin/chkconfig --del slmodem
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service slmodem condrestart >/dev/null 2>&1
fi
%clean
rm -rf %{buildroot}
%files
%defattr (-,root,root)
%doc README.fedora README Changes COPYING Documentation/Smartlink.txt
%{_sbindir}/slmodemd
%{_sysconfdir}/init.d/slmodem
%config(noreplace) %{_sysconfdir}/sysconfig/slmodem
%{_localstatedir}/lib/slmodem/
%changelog
* Sat Sep 08 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-4.20070813
- Updated to recent slmodem package
* Wed Feb 07 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-3.20070204
- Updated to recent slmodem package
- Added README.fedora, explaining some configuration and hardware support details
* Fri Apr 28 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-2
- Modified .spec to coexist with slmodem and kmod-slmodem.
- Updated description
- Changed name of initscripts
* Wed Mar 29 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-1
- Updated to 2.9.11 snapshot.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Jul 10 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.2
- Only builds on x86
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.1
- Repackaged for rpm.livna.org
- Added daemonize patch, cleaned up init file
- Added %%pre and %%post scriptlets
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-1
- Initial package
--- NEW FILE slmodem.sysconfig ---
# Country you are in
# Possible values can be gotten from calling slmodemd --countrylist
# e.g. COUNTRY=USA or COUNTRY=GERMANY
COUNTRY=
#
# Interface the userspace daemon should use to communicate with the modem
# alsa: For SmartLink Modems, supported by the alsa sound system.
# slamr: For PCI and Integrated SmartLink Modems
# slusb: For USB based SmartLink Modems
#
INTERFACE=
#
# If you are using the alsa sound system to drive the modem and you need too
# specify a special alsa device, as the slmodem daemon does not autodetect
# the correct sound device, please specify it here as "hw:0,6" or similar
# value.
# If you do not use the alsa interface, this value is being ignored.
ALSA_DEVICE=
#
# Any other arguments passed to the slmodem daemon
#
ARGS=
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:02:54 -0000 1.1
+++ .cvsignore 16 Oct 2008 20:24:54 -0000 1.2
@@ -0,0 +1 @@
+slmodem-2.9.11-20080817.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:02:54 -0000 1.1
+++ sources 16 Oct 2008 20:24:54 -0000 1.2
@@ -0,0 +1 @@
+37da7d0fe98f1a51adbbc8b81b0981a4 slmodem-2.9.11-20080817.tar.gz
16 years
- 1
- 0
rpms/slmodem/F-9 README.fedora, NONE, 1.1 slmodem-2.9.11-create.patch, NONE, 1.1 slmodem-2.9.11-daemon.patch, NONE, 1.1 slmodem.init, NONE, 1.1 slmodem.spec, NONE, 1.1 slmodem.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/slmodem/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8736
Modified Files:
.cvsignore sources
Added Files:
README.fedora slmodem-2.9.11-create.patch
slmodem-2.9.11-daemon.patch slmodem.init slmodem.spec
slmodem.sysconfig
Log Message:
Initial branch for F-9
--- NEW FILE README.fedora ---
Smart Link Soft Modem for Fedora
********************************
Introduction
============
The slmodem package available from http://rpm.livna.org is consisting of
two RPM packages, the slmodem package containing the needed userspace
daemon to control the modem-chipset and the slmodem-kmod package.
slmodem-kmod provides proprietary kernel modules for certain PCI and USB
modems as well as several integrated modem chipsets in notebooks.
Most Smart Link based modems integrated into today's notebooks however
do work without a proprietary kernel module. These chips are wired into
the sound codecs on the mainboard and can thus be controlled via the
alsa sound system in userspace.
This results in a non-tainted kernel and less hassle when upgrading the
kernel and is thus to be prefered.
Hardware Support
================
Proprietary Kernel Module (bad!)
--------------------------------
The following SmartLink modems should be supported by the slamr
kernel-module:
* HAMR5600 based AMR/CNR/MDC/ACR modem cards
* SmartPCI56/561/562/563 based PCI modem cards
* Southbridge based chipsets
- Intel ICH0,ICH2, ICH3, ICH4
- Via 686A, 686B, 8231, 8233
- SiS 630
- ALI 1535.
The slusb kernel modul supports the following modem chipsets:
* SmartUSB56 based USB modems
Userspace Hardware Support with ALSA (good)
-------------------------------------------
The slmodemd userspace application is also able to control the following
modem chipsets without having to access proprietary kernel modules.
* intel8x0m (snd-intel8x0m) based chipsets
- ICH based AC97 Modems (MC97)
- SiS 630 Modems
- NVidia NForce Integrated Modem
* VIA686 (snd-via82xx-modem) based chipsets
* ATI IXP (snd-atiixp-modem) based chipsets
Installation and Configuration
==============================
Depending on your hardware, you should first try installing slmodem and
running the slmodemd daemon in ALSA-mode.
If this does not work, install the slmodem-kmod package and configure
the initscript to either load the slamr or the slusb kernel module.
This can be achieved by editing /etc/sysconfig/slmodemd and setting the
INTERFACE variable to either alsa, slamr or slusb accordingly.
Restarting the slmodemd by calling service slmodem restart or rebooting
will then load the correct module, initialise the device files and load
the userspace daemon.
If your modem is supported by the driver, it can be accessed by using
/dev/ttySL0 as the modem device. This device can then be used to dial
out with the internal softmodem.
Problems
========
Please keep in mind that this is not a fedora supplied package, and thus
you won't receive any support on any of the fedora or Red Hat
mailinglists. If your modem does somehow not work, please take a look at
<http://linmodems.technion.ac.il/> for more information.
<http://www.linmodems.org/> contains a mailinglist and a mailinglist
archive should be able to answer your questions.
In case there is a bug related to the RPM-package from livna, please
file a bug at <http://bugzilla.livna.org>.
slmodem-2.9.11-create.patch:
--- NEW FILE slmodem-2.9.11-create.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_datafile.c.create slmodem-2.9.11-20080817/modem/modem_datafile.c
--- slmodem-2.9.11-20080817/modem/modem_datafile.c.create 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_datafile.c 2008-10-15 23:45:26.000000000 +0200
@@ -48,6 +48,7 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include <modem_defs.h>
#include <modem_debug.h>
@@ -111,7 +112,7 @@ int datafile_save_info(char *file_name,s
int ret = -1;
int fd;
- fd = open(file_name,O_CREAT|O_WRONLY);
+ fd = open(file_name,O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
if(fd < 0)
return -errno;
slmodem-2.9.11-daemon.patch:
--- NEW FILE slmodem-2.9.11-daemon.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon slmodem-2.9.11-20080817/modem/modem_cmdline.c
--- slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_cmdline.c 2008-10-15 23:45:38.000000000 +0200
@@ -74,6 +74,7 @@ unsigned int need_realtime = 1;
unsigned int ring_detector = 0;
#endif
unsigned int use_alsa = 0;
+unsigned int daemonize = 0;
unsigned int use_short_buffer = 0;
const char *modem_group = "uucp";
mode_t modem_perm = 0660;
@@ -86,6 +87,7 @@ enum {
OPT_COUNTRY,
OPT_COUNTRYLIST,
OPT_ALSA,
+ OPT_DAEMON,
OPT_GROUP,
OPT_PERM,
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -113,6 +115,7 @@ static struct opt {
{'c',"country","default modem country name",MANDATORY,STRING,"USA"},
{ 0 ,"countrylist","show list of supported countries"},
{'a',"alsa","ALSA mode (see README for howto)"},
+ {'d',"daemon","Daemon mode"},
{'g',"group","Modem TTY group",MANDATORY,STRING,"uucp"},
{'p',"perm","Modem TTY permission",MANDATORY,INTEGER,"0660"},
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -252,6 +255,8 @@ void modem_cmdline(int argc, char *argv[
#endif
use_alsa = 1;
}
+ if(opt_list[OPT_DAEMON].found)
+ daemonize = 1;
if(opt_list[OPT_GROUP].found)
modem_group = opt_list[OPT_GROUP].arg_val;
if(opt_list[OPT_PERM].found) {
diff -up slmodem-2.9.11-20080817/modem/modem_main.c.daemon slmodem-2.9.11-20080817/modem/modem_main.c
--- slmodem-2.9.11-20080817/modem/modem_main.c.daemon 2008-08-04 03:40:13.000000000 +0200
+++ slmodem-2.9.11-20080817/modem/modem_main.c 2008-10-15 23:49:00.000000000 +0200
@@ -57,6 +57,7 @@
#include <signal.h>
#include <limits.h>
#include <grp.h>
+#include <syslog.h>
#ifdef SUPPORT_ALSA
#define ALSA_PCM_NEW_HW_PARAMS_API 1
@@ -70,8 +71,8 @@
#include <modem.h>
#include <modem_debug.h>
-#define INFO(fmt,args...) fprintf(stderr, fmt , ##args );
-#define ERR(fmt,args...) fprintf(stderr, "error: " fmt , ##args );
+#define INFO(fmt,args...) (daemonize) ? syslog(LOG_INFO, fmt, ##args) : fprintf(stderr, fmt , ##args );
+#define ERR(fmt,args...) (daemonize) ? syslog(LOG_ERR, "error: " fmt, ##args) : fprintf(stderr, "error: " fmt , ##args );
#define DBG(fmt,args...) dprintf("main: " fmt, ##args)
@@ -131,6 +132,7 @@ static char outbuf[4096];
#define INTERNAL_DELAY 40 /* internal device tx/rx delay: should be selfdetectible */
extern unsigned use_alsa;
+extern unsigned daemonize;
static snd_output_t *dbg_out = NULL;
static int alsa_mixer_setup(struct device_struct *dev, const char *dev_name)
@@ -966,6 +968,11 @@ int modem_main(const char *dev_name)
INFO("modem `%s' created. TTY is `%s'\n",
m->name, m->pty_name);
+ // daemonize
+ if (daemonize)
+ if (!daemon(0, 0))
+ ERR("slmodemd could not daemonize");
+
sprintf(path_name,"/var/lib/slmodem/data.%s",basename(dev_name));
datafile_load_info(path_name,&m->dsp_info);
@@ -984,7 +991,7 @@ int modem_main(const char *dev_name)
signal(SIGINT, mark_termination);
signal(SIGTERM, mark_termination);
- INFO("Use `%s' as modem device, Ctrl+C for termination.\n",
+ INFO("Modem device: `%s'\n",
*link_name ? link_name : m->pty_name);
/* main loop here */
--- NEW FILE slmodem.init ---
#!/bin/sh
#
# slmodem This shell script takes care of starting and stopping
# the SmartLink modem userspace daemon.
#
# chkconfig: 2345 50 50
# description: slmodemd is a daemon which is needed to use the SmartLink \
# softmodem.
# processname: slmodemd
# Source function library.
. /etc/rc.d/init.d/functions
[ -x /usr/sbin/slmodemd ] || exit 0
if [ -f /etc/sysconfig/slmodem ]; then
. /etc/sysconfig/slmodem
fi
if [ $COUNTRY ]; then
COUNTRYARG="-c $COUNTRY"
fi
if [ "$INTERFACE" == "alsa" ] && [ "$ALSA_DEVICE" != "" ]; then
DEVICE=$ALSA_DEVICE
fi
modules_load() {
case "$INTERFACE" in
alsa)
ALSA="--alsa"
;;
slamr)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slamr.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slamr
[ -e /dev/slamr ] || mknod /dev/slamr c 242 0
DEVICE=/dev/slamr
fi
;;
slusb)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slusb.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slusb
[ -e /dev/slusb ] || mknod /dev/slusb c 243 0
DEVICE=/dev/slusb
fi
;;
*)
echo "Please edit /etc/sysconfig/slmodem"
echo_failure
echo
exit 1
;;
esac
}
modules_unload() {
case "$INTERFACE" in
slamr)
rmmod slamr > /dev/null
[ -c /dev/slamr ] && rm -f /dev/slamr > /dev/null
;;
slusb)
rmmod slusb > /dev/null
[ -c /dev/slusb ] && rm -f /dev/slusb > /dev/null
;;
*)
;;
esac
}
# See how we were called.
case "$1" in
start)
# Start daemon.
echo -n $"Starting SmartLink modem daemon: "
modules_load
daemon /usr/sbin/slmodemd ${ALSA} ${COUNTRYARG} ${ARGS} --daemon ${DEVICE}
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/slmodem
;;
stop)
# Stop daemon.
echo -n $"Shutting SmartLink modem daemon: "
killproc slmodemd
RETVAL=$?
modules_unload
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/slmodem
;;
status)
status slmodemd
RETVAL=$?
;;
restart|reload)
$0 stop
$0 start
;;
condrestart)
[ -f /var/lock/subsys/slmodem ] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload}"
RETVAL=1
;;
esac
exit $RETVAL
--- NEW FILE slmodem.spec ---
%define filever 2.9.11-20080817
%define relver 2.9.11
%define datetag 20080817
Summary: Userspace application for smartLink softmodems
Name: slmodem
Version: %{relver}
Release: 5.%{datetag}%{?dist}
Group: System Environment/Daemons
License: BSD w/binary object
# Outdated
# URL: http://www.smlink.com/content.aspx?id=132
URL: http://linmodems.technion.ac.il/packages/smartlink/
Source0: http://linmodems.technion.ac.il/packages/smartlink/slmodem-%{filever}.tar.gz
Source1: slmodem.init
Source2: slmodem.sysconfig
Source3: README.fedora
Patch0: slmodem-2.9.11-daemon.patch
Patch1: slmodem-2.9.11-create.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: alsa-lib-devel
ExclusiveArch: i386
Provides: slmodem-alsa = %{version}, slmodem-kmod-common = %{version}
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%description
This package contains the userspace application to control several
SmartLink based modems.
More information about installation and configuration of the slmodem
package can be found at %{_docdir}/%{name}-%{version}/README.fedora
after installation.
%prep
%setup -q -n slmodem-%{filever}
%patch0 -p1 -b .daemon
%patch1 -p1 -b .create
%build
pushd modem
make %{?_smp_mflags} SUPPORT_ALSA=1 EXTRA_CFLAGS="$RPM_OPT_FLAGS"
popd
%install
rm -rf %{buildroot}
install -D -m 755 modem/slmodemd %{buildroot}%{_sbindir}/slmodemd
install -d -m 755 %{buildroot}%{_localstatedir}/lib/slmodem
install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/slmodem
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/slmodem
cp %{SOURCE3} .
%post
/sbin/chkconfig --add slmodem
%preun
if [ $1 = 0 ]; then
/sbin/service slmodem stop >/dev/null 2>&1
/sbin/chkconfig --del slmodem
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service slmodem condrestart >/dev/null 2>&1
fi
%clean
rm -rf %{buildroot}
%files
%defattr (-,root,root)
%doc README.fedora README Changes COPYING Documentation/Smartlink.txt
%{_sbindir}/slmodemd
%{_sysconfdir}/init.d/slmodem
%config(noreplace) %{_sysconfdir}/sysconfig/slmodem
%{_localstatedir}/lib/slmodem/
%changelog
* Sat Sep 08 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-4.20070813
- Updated to recent slmodem package
* Wed Feb 07 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-3.20070204
- Updated to recent slmodem package
- Added README.fedora, explaining some configuration and hardware support details
* Fri Apr 28 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-2
- Modified .spec to coexist with slmodem and kmod-slmodem.
- Updated description
- Changed name of initscripts
* Wed Mar 29 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-1
- Updated to 2.9.11 snapshot.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Jul 10 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.2
- Only builds on x86
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.1
- Repackaged for rpm.livna.org
- Added daemonize patch, cleaned up init file
- Added %%pre and %%post scriptlets
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-1
- Initial package
--- NEW FILE slmodem.sysconfig ---
# Country you are in
# Possible values can be gotten from calling slmodemd --countrylist
# e.g. COUNTRY=USA or COUNTRY=GERMANY
COUNTRY=
#
# Interface the userspace daemon should use to communicate with the modem
# alsa: For SmartLink Modems, supported by the alsa sound system.
# slamr: For PCI and Integrated SmartLink Modems
# slusb: For USB based SmartLink Modems
#
INTERFACE=
#
# If you are using the alsa sound system to drive the modem and you need too
# specify a special alsa device, as the slmodem daemon does not autodetect
# the correct sound device, please specify it here as "hw:0,6" or similar
# value.
# If you do not use the alsa interface, this value is being ignored.
ALSA_DEVICE=
#
# Any other arguments passed to the slmodem daemon
#
ARGS=
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:02:54 -0000 1.1
+++ .cvsignore 16 Oct 2008 20:24:34 -0000 1.2
@@ -0,0 +1 @@
+slmodem-2.9.11-20080817.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:02:54 -0000 1.1
+++ sources 16 Oct 2008 20:24:34 -0000 1.2
@@ -0,0 +1 @@
+37da7d0fe98f1a51adbbc8b81b0981a4 slmodem-2.9.11-20080817.tar.gz
16 years
- 1
- 0
rpms/slmodem/devel README.fedora, NONE, 1.1 slmodem-2.9.11-create.patch, NONE, 1.1 slmodem-2.9.11-daemon.patch, NONE, 1.1 slmodem.init, NONE, 1.1 slmodem.spec, NONE, 1.1 slmodem.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/slmodem/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8331/devel
Modified Files:
.cvsignore sources
Added Files:
README.fedora slmodem-2.9.11-create.patch
slmodem-2.9.11-daemon.patch slmodem.init slmodem.spec
slmodem.sysconfig
Log Message:
Initial package import
--- NEW FILE README.fedora ---
Smart Link Soft Modem for Fedora
********************************
Introduction
============
The slmodem package available from http://rpm.livna.org is consisting of
two RPM packages, the slmodem package containing the needed userspace
daemon to control the modem-chipset and the slmodem-kmod package.
slmodem-kmod provides proprietary kernel modules for certain PCI and USB
modems as well as several integrated modem chipsets in notebooks.
Most Smart Link based modems integrated into today's notebooks however
do work without a proprietary kernel module. These chips are wired into
the sound codecs on the mainboard and can thus be controlled via the
alsa sound system in userspace.
This results in a non-tainted kernel and less hassle when upgrading the
kernel and is thus to be prefered.
Hardware Support
================
Proprietary Kernel Module (bad!)
--------------------------------
The following SmartLink modems should be supported by the slamr
kernel-module:
* HAMR5600 based AMR/CNR/MDC/ACR modem cards
* SmartPCI56/561/562/563 based PCI modem cards
* Southbridge based chipsets
- Intel ICH0,ICH2, ICH3, ICH4
- Via 686A, 686B, 8231, 8233
- SiS 630
- ALI 1535.
The slusb kernel modul supports the following modem chipsets:
* SmartUSB56 based USB modems
Userspace Hardware Support with ALSA (good)
-------------------------------------------
The slmodemd userspace application is also able to control the following
modem chipsets without having to access proprietary kernel modules.
* intel8x0m (snd-intel8x0m) based chipsets
- ICH based AC97 Modems (MC97)
- SiS 630 Modems
- NVidia NForce Integrated Modem
* VIA686 (snd-via82xx-modem) based chipsets
* ATI IXP (snd-atiixp-modem) based chipsets
Installation and Configuration
==============================
Depending on your hardware, you should first try installing slmodem and
running the slmodemd daemon in ALSA-mode.
If this does not work, install the slmodem-kmod package and configure
the initscript to either load the slamr or the slusb kernel module.
This can be achieved by editing /etc/sysconfig/slmodemd and setting the
INTERFACE variable to either alsa, slamr or slusb accordingly.
Restarting the slmodemd by calling service slmodem restart or rebooting
will then load the correct module, initialise the device files and load
the userspace daemon.
If your modem is supported by the driver, it can be accessed by using
/dev/ttySL0 as the modem device. This device can then be used to dial
out with the internal softmodem.
Problems
========
Please keep in mind that this is not a fedora supplied package, and thus
you won't receive any support on any of the fedora or Red Hat
mailinglists. If your modem does somehow not work, please take a look at
<http://linmodems.technion.ac.il/> for more information.
<http://www.linmodems.org/> contains a mailinglist and a mailinglist
archive should be able to answer your questions.
In case there is a bug related to the RPM-package from livna, please
file a bug at <http://bugzilla.livna.org>.
slmodem-2.9.11-create.patch:
--- NEW FILE slmodem-2.9.11-create.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_datafile.c.create slmodem-2.9.11-20080817/modem/modem_datafile.c
--- slmodem-2.9.11-20080817/modem/modem_datafile.c.create 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_datafile.c 2008-10-15 23:45:26.000000000 +0200
@@ -48,6 +48,7 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include <modem_defs.h>
#include <modem_debug.h>
@@ -111,7 +112,7 @@ int datafile_save_info(char *file_name,s
int ret = -1;
int fd;
- fd = open(file_name,O_CREAT|O_WRONLY);
+ fd = open(file_name,O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
if(fd < 0)
return -errno;
slmodem-2.9.11-daemon.patch:
--- NEW FILE slmodem-2.9.11-daemon.patch ---
diff -up slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon slmodem-2.9.11-20080817/modem/modem_cmdline.c
--- slmodem-2.9.11-20080817/modem/modem_cmdline.c.daemon 2008-03-29 13:04:16.000000000 +0100
+++ slmodem-2.9.11-20080817/modem/modem_cmdline.c 2008-10-15 23:45:38.000000000 +0200
@@ -74,6 +74,7 @@ unsigned int need_realtime = 1;
unsigned int ring_detector = 0;
#endif
unsigned int use_alsa = 0;
+unsigned int daemonize = 0;
unsigned int use_short_buffer = 0;
const char *modem_group = "uucp";
mode_t modem_perm = 0660;
@@ -86,6 +87,7 @@ enum {
OPT_COUNTRY,
OPT_COUNTRYLIST,
OPT_ALSA,
+ OPT_DAEMON,
OPT_GROUP,
OPT_PERM,
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -113,6 +115,7 @@ static struct opt {
{'c',"country","default modem country name",MANDATORY,STRING,"USA"},
{ 0 ,"countrylist","show list of supported countries"},
{'a',"alsa","ALSA mode (see README for howto)"},
+ {'d',"daemon","Daemon mode"},
{'g',"group","Modem TTY group",MANDATORY,STRING,"uucp"},
{'p',"perm","Modem TTY permission",MANDATORY,INTEGER,"0660"},
#ifdef MODEM_CONFIG_RING_DETECTOR
@@ -252,6 +255,8 @@ void modem_cmdline(int argc, char *argv[
#endif
use_alsa = 1;
}
+ if(opt_list[OPT_DAEMON].found)
+ daemonize = 1;
if(opt_list[OPT_GROUP].found)
modem_group = opt_list[OPT_GROUP].arg_val;
if(opt_list[OPT_PERM].found) {
diff -up slmodem-2.9.11-20080817/modem/modem_main.c.daemon slmodem-2.9.11-20080817/modem/modem_main.c
--- slmodem-2.9.11-20080817/modem/modem_main.c.daemon 2008-08-04 03:40:13.000000000 +0200
+++ slmodem-2.9.11-20080817/modem/modem_main.c 2008-10-15 23:49:00.000000000 +0200
@@ -57,6 +57,7 @@
#include <signal.h>
#include <limits.h>
#include <grp.h>
+#include <syslog.h>
#ifdef SUPPORT_ALSA
#define ALSA_PCM_NEW_HW_PARAMS_API 1
@@ -70,8 +71,8 @@
#include <modem.h>
#include <modem_debug.h>
-#define INFO(fmt,args...) fprintf(stderr, fmt , ##args );
-#define ERR(fmt,args...) fprintf(stderr, "error: " fmt , ##args );
+#define INFO(fmt,args...) (daemonize) ? syslog(LOG_INFO, fmt, ##args) : fprintf(stderr, fmt , ##args );
+#define ERR(fmt,args...) (daemonize) ? syslog(LOG_ERR, "error: " fmt, ##args) : fprintf(stderr, "error: " fmt , ##args );
#define DBG(fmt,args...) dprintf("main: " fmt, ##args)
@@ -131,6 +132,7 @@ static char outbuf[4096];
#define INTERNAL_DELAY 40 /* internal device tx/rx delay: should be selfdetectible */
extern unsigned use_alsa;
+extern unsigned daemonize;
static snd_output_t *dbg_out = NULL;
static int alsa_mixer_setup(struct device_struct *dev, const char *dev_name)
@@ -966,6 +968,11 @@ int modem_main(const char *dev_name)
INFO("modem `%s' created. TTY is `%s'\n",
m->name, m->pty_name);
+ // daemonize
+ if (daemonize)
+ if (!daemon(0, 0))
+ ERR("slmodemd could not daemonize");
+
sprintf(path_name,"/var/lib/slmodem/data.%s",basename(dev_name));
datafile_load_info(path_name,&m->dsp_info);
@@ -984,7 +991,7 @@ int modem_main(const char *dev_name)
signal(SIGINT, mark_termination);
signal(SIGTERM, mark_termination);
- INFO("Use `%s' as modem device, Ctrl+C for termination.\n",
+ INFO("Modem device: `%s'\n",
*link_name ? link_name : m->pty_name);
/* main loop here */
--- NEW FILE slmodem.init ---
#!/bin/sh
#
# slmodem This shell script takes care of starting and stopping
# the SmartLink modem userspace daemon.
#
# chkconfig: 2345 50 50
# description: slmodemd is a daemon which is needed to use the SmartLink \
# softmodem.
# processname: slmodemd
# Source function library.
. /etc/rc.d/init.d/functions
[ -x /usr/sbin/slmodemd ] || exit 0
if [ -f /etc/sysconfig/slmodem ]; then
. /etc/sysconfig/slmodem
fi
if [ $COUNTRY ]; then
COUNTRYARG="-c $COUNTRY"
fi
if [ "$INTERFACE" == "alsa" ] && [ "$ALSA_DEVICE" != "" ]; then
DEVICE=$ALSA_DEVICE
fi
modules_load() {
case "$INTERFACE" in
alsa)
ALSA="--alsa"
;;
slamr)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slamr.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slamr
[ -e /dev/slamr ] || mknod /dev/slamr c 242 0
DEVICE=/dev/slamr
fi
;;
slusb)
if [ ! -f /lib/modules/$(uname -r)/extra/slmodem/slusb.ko ]; then
echo "Please install the slmodem-kmod package for your kernel"
exit 1
else
modprobe slusb
[ -e /dev/slusb ] || mknod /dev/slusb c 243 0
DEVICE=/dev/slusb
fi
;;
*)
echo "Please edit /etc/sysconfig/slmodem"
echo_failure
echo
exit 1
;;
esac
}
modules_unload() {
case "$INTERFACE" in
slamr)
rmmod slamr > /dev/null
[ -c /dev/slamr ] && rm -f /dev/slamr > /dev/null
;;
slusb)
rmmod slusb > /dev/null
[ -c /dev/slusb ] && rm -f /dev/slusb > /dev/null
;;
*)
;;
esac
}
# See how we were called.
case "$1" in
start)
# Start daemon.
echo -n $"Starting SmartLink modem daemon: "
modules_load
daemon /usr/sbin/slmodemd ${ALSA} ${COUNTRYARG} ${ARGS} --daemon ${DEVICE}
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/slmodem
;;
stop)
# Stop daemon.
echo -n $"Shutting SmartLink modem daemon: "
killproc slmodemd
RETVAL=$?
modules_unload
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/slmodem
;;
status)
status slmodemd
RETVAL=$?
;;
restart|reload)
$0 stop
$0 start
;;
condrestart)
[ -f /var/lock/subsys/slmodem ] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload}"
RETVAL=1
;;
esac
exit $RETVAL
--- NEW FILE slmodem.spec ---
%define filever 2.9.11-20080817
%define relver 2.9.11
%define datetag 20080817
Summary: Userspace application for smartLink softmodems
Name: slmodem
Version: %{relver}
Release: 5.%{datetag}%{?dist}
Group: System Environment/Daemons
License: BSD w/binary object
# Outdated
# URL: http://www.smlink.com/content.aspx?id=132
URL: http://linmodems.technion.ac.il/packages/smartlink/
Source0: http://linmodems.technion.ac.il/packages/smartlink/slmodem-%{filever}.tar.gz
Source1: slmodem.init
Source2: slmodem.sysconfig
Source3: README.fedora
Patch0: slmodem-2.9.11-daemon.patch
Patch1: slmodem-2.9.11-create.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRequires: alsa-lib-devel
ExclusiveArch: i386
Provides: slmodem-alsa = %{version}, slmodem-kmod-common = %{version}
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%description
This package contains the userspace application to control several
SmartLink based modems.
More information about installation and configuration of the slmodem
package can be found at %{_docdir}/%{name}-%{version}/README.fedora
after installation.
%prep
%setup -q -n slmodem-%{filever}
%patch0 -p1 -b .daemon
%patch1 -p1 -b .create
%build
pushd modem
make %{?_smp_mflags} SUPPORT_ALSA=1 EXTRA_CFLAGS="$RPM_OPT_FLAGS"
popd
%install
rm -rf %{buildroot}
install -D -m 755 modem/slmodemd %{buildroot}%{_sbindir}/slmodemd
install -d -m 755 %{buildroot}%{_localstatedir}/lib/slmodem
install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/slmodem
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/slmodem
cp %{SOURCE3} .
%post
/sbin/chkconfig --add slmodem
%preun
if [ $1 = 0 ]; then
/sbin/service slmodem stop >/dev/null 2>&1
/sbin/chkconfig --del slmodem
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service slmodem condrestart >/dev/null 2>&1
fi
%clean
rm -rf %{buildroot}
%files
%defattr (-,root,root)
%doc README.fedora README Changes COPYING Documentation/Smartlink.txt
%{_sbindir}/slmodemd
%{_sysconfdir}/init.d/slmodem
%config(noreplace) %{_sysconfdir}/sysconfig/slmodem
%{_localstatedir}/lib/slmodem/
%changelog
* Sat Sep 08 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-4.20070813
- Updated to recent slmodem package
* Wed Feb 07 2007 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-3.20070204
- Updated to recent slmodem package
- Added README.fedora, explaining some configuration and hardware support details
* Fri Apr 28 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-2
- Modified .spec to coexist with slmodem and kmod-slmodem.
- Updated description
- Changed name of initscripts
* Wed Mar 29 2006 Andreas Thienemann <andreas(a)bawue.net> 2.9.11-1
- Updated to 2.9.11 snapshot.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Jul 10 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.2
- Only builds on x86
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-0.lvn.1
- Repackaged for rpm.livna.org
- Added daemonize patch, cleaned up init file
- Added %%pre and %%post scriptlets
* Tue Jun 28 2005 Andreas Thienemann <andreas(a)bawue.net> 2.9.9d-1
- Initial package
--- NEW FILE slmodem.sysconfig ---
# Country you are in
# Possible values can be gotten from calling slmodemd --countrylist
# e.g. COUNTRY=USA or COUNTRY=GERMANY
COUNTRY=
#
# Interface the userspace daemon should use to communicate with the modem
# alsa: For SmartLink Modems, supported by the alsa sound system.
# slamr: For PCI and Integrated SmartLink Modems
# slusb: For USB based SmartLink Modems
#
INTERFACE=
#
# If you are using the alsa sound system to drive the modem and you need too
# specify a special alsa device, as the slmodem daemon does not autodetect
# the correct sound device, please specify it here as "hw:0,6" or similar
# value.
# If you do not use the alsa interface, this value is being ignored.
ALSA_DEVICE=
#
# Any other arguments passed to the slmodem daemon
#
ARGS=
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:02:54 -0000 1.1
+++ .cvsignore 16 Oct 2008 20:23:00 -0000 1.2
@@ -0,0 +1 @@
+slmodem-2.9.11-20080817.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:02:54 -0000 1.1
+++ sources 16 Oct 2008 20:23:00 -0000 1.2
@@ -0,0 +1 @@
+37da7d0fe98f1a51adbbc8b81b0981a4 slmodem-2.9.11-20080817.tar.gz
16 years
- 1
- 0
rpms/mplayer/F-9 mplayer-snapshot.sh, 1.1, 1.2 mplayer.spec, 1.2, 1.3 sources, 1.3, 1.4
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7161
Modified Files:
mplayer-snapshot.sh mplayer.spec sources
Log Message:
- remove libdvdcss copy from the source tarball
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-9/mplayer-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-snapshot.sh 14 Oct 2008 21:10:22 -0000 1.1
+++ mplayer-snapshot.sh 16 Oct 2008 20:05:59 -0000 1.2
@@ -18,6 +18,7 @@
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
cd $dirname
+rm -rf libdvdcss
for dir in libav* libpostproc ; do
cd $dir
svn update -r {$svn}
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-9/mplayer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer.spec 12 Oct 2008 20:52:06 -0000 1.2
+++ mplayer.spec 16 Oct 2008 20:05:59 -0000 1.3
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.97.%{pre}%{?dist}
+Release: 0.97.%{pre}%{?dist}.1
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -26,6 +26,7 @@
Patch10: %{name}-qcelp.patch
Patch12: %{name}-man-zh_CN.patch
Patch13: %{name}-CVE-2008-3827.patch
+Patch14: %{name}-nodvdcss.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -147,6 +148,7 @@
%patch10 -p1 -b .qclp
%patch12 -p1 -b .man-zh_CN
%patch13 -p0 -b .cve
+%patch14 -p1 -b .nodvdcss
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -388,6 +390,9 @@
%changelog
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080903svn.1
+- remove libdvdcss copy from the source tarball
+
* Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080903svn
- backport the fix for CVE-2008-3827
- updated to 20080903 SVN snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 Oct 2008 20:52:06 -0000 1.3
+++ sources 16 Oct 2008 20:05:59 -0000 1.4
@@ -1,2 +1,2 @@
-65263306ab6ea771758a9dbeabeb2773 mplayer-export-2008-09-03.tar.bz2
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
+756a884bb62230cdc7a0736b5c60d723 mplayer-export-2008-09-03.tar.bz2
16 years
- 1
- 0
rpms/mplayer/devel mplayer-nodvdcss.patch, NONE, 1.1 mplayer-snapshot.sh, 1.2, 1.3 mplayer.spec, 1.6, 1.7 sources, 1.6, 1.7
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7061
Modified Files:
mplayer-snapshot.sh mplayer.spec sources
Added Files:
mplayer-nodvdcss.patch
Log Message:
- remove libdvdcss copy from the source tarball
mplayer-nodvdcss.patch:
--- NEW FILE mplayer-nodvdcss.patch ---
diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/configure
--- mplayer-export-2008-09-03/configure.nodvdcss 2008-10-16 21:22:23.000000000 +0200
+++ mplayer-export-2008-09-03/configure 2008-10-16 21:30:47.000000000 +0200
@@ -589,7 +589,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
-_libdvdcss_internal=auto
+_libdvdcss_internal=no
_xanim=auto
_real=auto
_live=auto
diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/Makefile
--- mplayer-export-2008-09-03/Makefile.nodvdcss 2008-10-16 21:22:23.000000000 +0200
+++ mplayer-export-2008-09-03/Makefile 2008-10-16 21:27:12.000000000 +0200
@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
- libdvdcss/device.c \
- libdvdcss/error.c \
- libdvdcss/ioctl.c \
- libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
@@ -677,7 +672,6 @@ DIRS = . \
libavcodec/sparc \
libavformat \
libavutil \
- libdvdcss \
libdvdread \
libfaad2 \
libmenu \
@@ -783,7 +777,6 @@ codec-cfg.d: codecs.conf.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-snapshot.sh 10 Sep 2008 18:58:49 -0000 1.2
+++ mplayer-snapshot.sh 16 Oct 2008 20:03:52 -0000 1.3
@@ -18,6 +18,7 @@
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
cd $dirname
+rm -rf libdvdcss
for dir in libav* libpostproc ; do
cd $dir
svn update -r {$svn}
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer.spec 12 Oct 2008 20:52:06 -0000 1.6
+++ mplayer.spec 16 Oct 2008 20:03:52 -0000 1.7
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.100.%{pre}%{?dist}
+Release: 0.101.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -26,6 +26,7 @@
Patch10: %{name}-qcelp.patch
Patch12: %{name}-man-zh_CN.patch
Patch13: %{name}-CVE-2008-3827.patch
+Patch14: %{name}-nodvdcss.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -147,6 +148,7 @@
%patch10 -p1 -b .qclp
%patch12 -p1 -b .man-zh_CN
%patch13 -p0 -b .cve
+%patch14 -p1 -b .nodvdcss
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -388,6 +390,9 @@
%changelog
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.101.20080903svn
+- remove libdvdcss copy from the source tarball
+
* Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.100.20080903svn
- backport the fix for CVE-2008-3827
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Sep 2008 19:37:04 -0000 1.6
+++ sources 16 Oct 2008 20:03:52 -0000 1.7
@@ -1,2 +1,2 @@
-65263306ab6ea771758a9dbeabeb2773 mplayer-export-2008-09-03.tar.bz2
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
+756a884bb62230cdc7a0736b5c60d723 mplayer-export-2008-09-03.tar.bz2
16 years
- 1
- 0
rpms/slmodem-kmod/devel slmodem-kmod.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5833
Modified Files:
slmodem-kmod.spec
Log Message:
* Thu Oct 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-26
- small adjustments for the kmod stuff
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/slmodem-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slmodem-kmod.spec 16 Oct 2008 19:21:33 -0000 1.1
+++ slmodem-kmod.spec 16 Oct 2008 19:47:43 -0000 1.2
@@ -1,7 +1,9 @@
-# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels newest
+# buildforkernels macro hint: when you build a new version or a new release
+# that contains bugfixes or other improvements then you must disable the
+# "buildforkernels newest" macro for just that build; immediately after
+# queuing that build enable the macro again for subsequent builds; that way
+# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
-#define buildforkernels akmod
%define filever 2.9.11-20080817
%define datetag 20080817
@@ -10,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 25%{?dist}
+Release: 26%{?dist}.1
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -33,7 +35,6 @@
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
-
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
@@ -45,9 +46,8 @@
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
-
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo %{repo} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
%setup -q -D -T -a 1
@@ -102,6 +102,9 @@
%changelog
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-26
+- small adjustments for the kmod stuff
+
* Thu Oct 16 2008 Andreas Thienemann <andreas(a)bawue.net> - 2.9.11-25
- Updated to recent upstream kernel
- Prevent build failure on kernels > 2.6.24
16 years
- 1
- 0
rpms/slmodem-kmod/devel slmodem-kmod-Makefile.patch, NONE, 1.1 slmodem-kmod-ungrab.patch, NONE, 1.1 slmodem-kmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2969/devel
Modified Files:
.cvsignore sources
Added Files:
slmodem-kmod-Makefile.patch slmodem-kmod-ungrab.patch
slmodem-kmod.spec
Log Message:
Initial package import
slmodem-kmod-Makefile.patch:
--- NEW FILE slmodem-kmod-Makefile.patch ---
diff -up slmodem-2.9.11-20080817/drivers/Makefile.orig slmodem-2.9.11-20080817/drivers/Makefile
--- slmodem-2.9.11-20080817/drivers/Makefile.orig 2008-10-15 22:22:57.000000000 +0200
+++ slmodem-2.9.11-20080817/drivers/Makefile 2008-10-15 22:45:25.000000000 +0200
@@ -16,7 +16,7 @@
#KBUILD_VERBOSE=1
#export KBUILD_VERBOSE
-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
+KERNEL_DIR:=$(KSRC)
SUBLEVEL:=$(shell echo $(KERNEL_DIR) | cut -d. -f3 | cut -d. -f1 | cut -d- -f1)
# slusb support ends at 2.6.24
AGE:=$(shell if [ "$(SUBLEVEL)" -gt 24 ] ;then echo NEW;fi)
slmodem-kmod-ungrab.patch:
--- NEW FILE slmodem-kmod-ungrab.patch ---
diff -up ungrab-winmodem-20080126/Makefile.orig ungrab-winmodem-20080126/Makefile
--- ungrab-winmodem-20080126/Makefile.orig 2008-10-15 22:11:12.000000000 +0200
+++ ungrab-winmodem-20080126/Makefile 2008-10-15 22:11:38.000000000 +0200
@@ -1,23 +1,10 @@
-
-KERNEL_VER:=$(shell uname -r)
-KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-INSTALL_DIR:=/lib/modules/$(KERNEL_VER)/extra
-
obj-m := ungrab-winmodem.o
all:
- $(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
+ $(MAKE) modules -C $(KSRC) SUBDIRS=$(shell pwd)
clean:
$(RM) *.o *.ko *.mod.* .*.cmd *~
$(RM) -r .tmp_versions
-install: all
- install -D -m 644 ungrab-winmodem.ko $(INSTALL_DIR)/ungrab-winmodem.ko
- /sbin/depmod -a
-uninstall:
- modprobe -r ungrab-winmodem ; echo -n
- $(RM) $(INSTALL_DIR)/ungrab-winmodem.ko
- /sbin/depmod -a
-
--- NEW FILE slmodem-kmod.spec ---
# (un)define the next line to either build for the newest or all current kernels
%define buildforkernels newest
#define buildforkernels newest
#define buildforkernels akmod
%define filever 2.9.11-20080817
%define datetag 20080817
%define ungrab_datetag 20080126
Name: slmodem-kmod
Version: 2.9.11
Release: 25%{?dist}
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
License: Distributable
# Outdated
# URL: http://www.smlink.com/content.aspx?id=132
URL: http://linmodems.technion.ac.il/packages/smartlink/
Source0: http://linmodems.technion.ac.il/packages/smartlink/slmodem-%{filever}.tar.gz
Source1: http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-%{ungr...
Patch0: slmodem-kmod-Makefile.patch
Patch10: slmodem-kmod-ungrab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# ppc and ppc64 disabled -- upstream package only contains 32bit-x86 blob
# Kernel module can be built for x86_64 but a 32bit userland is necessary
# This is not done though, as it is rather hackish.
ExclusiveArch: i586 i686
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
%{summary}
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo %{repo} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
%setup -q -D -T -a 1
# apply patches and do other stuff here
# pushd foo-%{version}
# #patch0 -p1 -b .suffix
# popd
pushd slmodem-%{filever}
%patch0 -p 1 -b .Make
popd
pushd ungrab-winmodem-%{ungrab_datetag}
%patch10 -p 1 -b .Make
popd
for kernel_version in %{?kernel_versions} ; do
cp -a slmodem-%{filever} _kmod_build_${kernel_version%%___*}
cp -a ungrab-winmodem-%{ungrab_datetag} _kmod_build_${kernel_version%%___*}/ungrab-winmodem
done
%build
for kernel_version in %{?kernel_versions} ; do
pushd _kmod_build_${kernel_version%%___*}/drivers
make %{?_smp_mflags} \
KSRC=${kernel_version##*___} \
KVERS=${kernel_version%%___*}
popd
pushd _kmod_build_${kernel_version%%___*}/ungrab-winmodem
make %{?_smp_mflags} \
KSRC="${kernel_version##*___}" \
KVERS=%${kernel_version%%___*}
popd
done
%install
rm -rf %{buildroot}
for kernel_version in %{?kernel_versions} ; do
install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/drivers/slamr.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/slamr.ko
test -f _kmod_build_${kernel_version%%___*}/drivers/slusb.ko && install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/drivers/slusb.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/slusb.ko
install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/ungrab-winmodem/ungrab-winmodem.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ungrab-winmodem.ko
done
%{?akmod_install}
%clean
rm -rf %{buildroot}
%changelog
* Thu Oct 16 2008 Andreas Thienemann <andreas(a)bawue.net> - 2.9.11-25
- Updated to recent upstream kernel
- Prevent build failure on kernels > 2.6.24
* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-24
- rebuild for new kmodtools, akmod adjustments
* Mon Jan 21 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-23
- build akmods package
* Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-22
- rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8
* Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-21
- rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen
* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-20
- rebuilt for 2.6.23.1-49.fc8
* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-19
- rebuilt for F8 kernels
* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-18
- rebuilt for latest kernels
* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-17
- rebuilt for latest kernels
* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-16
- rebuilt for latest kernels
- adjust to rpmfusion and new kmodtool
* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-15
- rebuilt for latest kernels
* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-14
- rebuilt for latest kernels
* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-13
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-12
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-11
- rebuilt for latest kernels
* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-10
- rebuilt for latest kernels
* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-9
- rebuilt for latest kernels
* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-8
- rebuilt for latest kernels
* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.9.11-7
- rebuilt for latest kernels
* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info>
- build for rawhide kernels as of today
* Wed Oct 03 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.9.11-5.20070813
- update for new kmod-helper stuff
- build for newest kernels
* Sun Sep 09 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.9.11-4.20070813
- Convert to new kmods stuff from livna for testing it
- Rebuild for F8T2 and rawhide
* Sat Sep 08 2007 Andreas Thienemann <andreas(a)bawue.net> - 2.9.11-3.20070813
- Updated to the newest snapshot
* Wed Feb 07 2007 Andreas Thienemann <andreas(a)bawue.net> - 2.9.11-2.20070204
- Updated to the newest snapshot
- Cleaned up the .spec and incorporated some changes from thl
- Used new kmodtool script as suggested by thl
* Fri Apr 28 2006 Andreas Thienemann <andreas(a)bawue.net> - 2.9.11-1
- Initial Package, inspired by fglrx-kmod
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:03:02 -0000 1.1
+++ .cvsignore 16 Oct 2008 19:21:33 -0000 1.2
@@ -0,0 +1,2 @@
+slmodem-2.9.11-20080817.tar.gz
+ungrab-winmodem-20080126.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:03:02 -0000 1.1
+++ sources 16 Oct 2008 19:21:33 -0000 1.2
@@ -0,0 +1,2 @@
+37da7d0fe98f1a51adbbc8b81b0981a4 slmodem-2.9.11-20080817.tar.gz
+25244ef3924566866f4fae2feca78218 ungrab-winmodem-20080126.tar.gz
16 years
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-8 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 xorg-x11-drv-fglrx.spec, 1.2, 1.3
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32059
Modified Files:
.cvsignore sources xorg-x11-drv-fglrx.spec
Log Message:
Retag with correct sources and cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Oct 2008 13:24:45 -0000 1.2
+++ .cvsignore 16 Oct 2008 18:34:32 -0000 1.3
@@ -1 +1 @@
-ati-driver-installer-8-9-x86.x86_64.run
+ati-driver-installer-8-10-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Oct 2008 16:20:01 -0000 1.3
+++ sources 16 Oct 2008 18:34:32 -0000 1.4
@@ -1 +1 @@
-9d1870c13bc9d7e5dccfcc62376828ff28471f0a ati-driver-installer-8-10-x86.x86_64.run
+4eed6f50089856a4c600a200914d5a55 ati-driver-installer-8-10-x86.x86_64.run
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-fglrx.spec 16 Oct 2008 16:20:01 -0000 1.2
+++ xorg-x11-drv-fglrx.spec 16 Oct 2008 18:34:32 -0000 1.3
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.542
-Release: 1.%{ativersion}%{?dist}
+Release: 2.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -301,6 +301,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-2.8.10
+- Retag.
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10
- Update to 8.10
16 years
- 1
- 0
rpms/fglrx-kmod/F-9 fglrx-kmod.spec, NONE, 1.1 fglrx-kmodtool-excludekernel-filterfile, NONE, 1.1 fglrx-makefile.diff, NONE, 1.1 fglrx-makesh.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31753/F-9
Modified Files:
.cvsignore sources
Added Files:
fglrx-kmod.spec fglrx-kmodtool-excludekernel-filterfile
fglrx-makefile.diff fglrx-makesh.diff
Log Message:
Update to Catalyst 8.10 for F-8, 8.11beta for devel and F-9
--- NEW FILE fglrx-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
%define ativersion 8.11beta
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
%endif
Name: fglrx-kmod
Version: 8.543
Release: 0.1.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Source0: http://www.diffingo.com/downloads/livna/kmod-data/fglrx-kmod-data-%{versi...
Source11: fglrx-kmodtool-excludekernel-filterfile
# These control kernel version detection
Patch1: fglrx-makefile.diff
Patch2: fglrx-makesh.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i586 i686 x86_64
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
The fglrx %{version} display driver kernel module.
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
# Tweak to have debuginfo - part 2/2
%if 0%{?fedora} > 7
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
cp -r fglrx/common/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# proper permissions
find fglrxpkg/lib/modules/fglrx/build_mod/ usr/share/doc -type d -print0 | xargs -0 chmod 0755
find fglrxpkg/lib/modules/fglrx/build_mod/ -type f -print0 | xargs -0 chmod 0644
# debuginfo fix
#sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh
# These control kernel version detection
pushd fglrxpkg/lib/modules/fglrx/build_mod/
%patch1 -b .patch1
%patch2 -b .patch2
popd
for kernel_version in %{?kernel_versions} ; do
cp -a fglrxpkg/ _kmod_build_${kernel_version%%___*}
done
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/
export AS_USER=y
export KERNEL_PATH="${kernel_version##*___}"
export FEDORA_UNAME_R="${kernel_version%%___*}"
export FEDORA_UNAME_M="%{_target_cpu}"
export CC="gcc"
bash make.sh verbose
popd
done
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
install -D -m 0755 _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/fglrx.ko
done
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-0.1.8.11beta.1
- Update to 8.53.4 (Catalyst 8.11beta)
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10.1
- Update to 8.10
* Wed Oct 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 8.532-2.8.09
- rebuild for new kernels
* Sat Sep 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.532-1.8.09
- Update to 8.09
* Thu Aug 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.522-1.8.08
- Update to 8.08
* Thu Jul 24 2008 Stewart Adam <s.adam at diffingo.com> - 8.512-1.8.07
- Update to 8.07
* Thu Jul 10 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - - 8.501-2.8.06
- only akmods as long as its in testing
* Wed Jun 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.501-1.8.06
- Update to 8.06
- Build for current kernels
* Thu May 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.493-1.8.05
- Update to 8.05
- Remove obsolete 2.6.25 capt patch
- Update debuginfo fix
* Fri Apr 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.476-1.8.04
- Update to 8.04
- Add capt patch to fix compiling against 2.6.25 kernels
- Fix license tag
* Wed Mar 5 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.471-1.8.03
- Update to 8.03
* Wed Feb 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.455.2-1.8.02
- Update to 8.02
* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.452.1-3.8.01
- rebuild for new kmodtools, akmod adjustments
* Sun Jan 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.452.1-2.8.01
- build akmods package
* Sat Jan 19 2008 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.452.1-1.8.01
- Update to Catalyst 8.01
- Fix License tag according to rpmlint
* Sat Dec 22 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.443.1-1.7.12
- Update to Catalyst 7.12
- Drop obsolete suspend patch
* Sat Dec 8 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-3.7.11
- Rebuild for latest kernels
* Wed Nov 21 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-2.7.11
- Fix stupid mistake in patch version
* Wed Nov 21 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-1.7.11
- Update to Catalyst 7.11
* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-8
- rebuilt for 2.6.23.1-49.fc8
* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-7
- rebuilt for F8 kernels
* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-6
- rebuilt for latest kernels
* Tue Oct 30 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.42.3-5
- Add suspend patch (fixes bz#1691)
* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-4
- rebuilt for latest kernels
* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-3
- rebuilt for latest kernels
- adjust to rpmfusion and new kmodtool
* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-2
- rebuilt for latest kernels
* Tue Oct 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.42.3-1
- Update to 8.42.3
- Update 2.6.23 patch
* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-13
- rebuilt for latest kernels
* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-12
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-11
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-10
- rebuilt for latest kernels
* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-9
- rebuilt for latest kernels
* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-8
- rebuilt for latest kernels
* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-7
- rebuilt for latest kernels
* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 8.40.4-6
- rebuilt for latest kernels
* Sun Oct 7 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.40.4-5
- update for new kmod-helper stuff
- build for newest kernels
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-4
- 2.6.23 patch
* Sun Sep 09 2007 Thorsten Leemhuis < fedora AT leemhuis DOT info > - 8.40.4-3
- Convert to new kmods stuff from livna
- Rebuild for F8T2 and rawhide
* Sun Aug 19 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-2
- Don't use testing kernel
* Thu Aug 16 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-1
- Update to 8.40.4
* Sun Jul 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.39.4-2
- Update ATI's fixed 8.39.4
* Thu Jul 19 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.39.4-1
- Update to 8.39.4
* Sun Jul 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.38.7-2
- Bump
* Sat Jun 30 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.7-1
- Update to 8.38.7
* Tue Jun 26 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.6-1
- corrected version update in changelog
- removed sed edit for past releases on 2.6.2x.x kernel
* Mon Jun 25 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.6-1
- Update to 8.38.6
- removed agpgart patch. agpgart_be.c no longer exists
* Sun Jun 03 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.37.6-2
- Updated URL field to current address.
* Thu May 31 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.37.6-1
- Update to 8.37.6
* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-3
- Rebuild for F7T4
* Wed Apr 19 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-2
- Just because it builds without the patches doesn't mean the patches are useless...
* Wed Apr 18 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-1
- Update to new 8.36.5 release
- Remove old patches
* Tue Apr 17 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.35.5-2
- Testing deemed this safe and working, so bump for official build
- Do a little spec cleanup
* Fri Mar 30 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.35.5-1
- Update to 8.35.5
- Copy 'official' 2.6.20 patch from fglrxpkg
- Remove old patches
* Mon Mar 26 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-6
- Ville Skyttä's patch for debuginfo packages (#1459)
* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-5
- kdump for non-i686...
- Fix changelog date
* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-4
- No kdump
- New kernel
* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-3
- New kernel
- Make Source0 a URL
* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-2
- Standardize all summaries and descriptions with other nvidia and fglrx
packages
- Kernel bump
* Sun Feb 21 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-1
- Update to 8.34.8
- Move paths and names to plain fglrx, not ati-fglrx, the driver's name's
long changed!
- Product support in %%description...
- Conditional patch for 2.6.20
* Sat Feb 17 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-2
- Change descriptions to more informative, easy-to-understand ones
* Fri Jan 12 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-1
- Update to 8.33.6
* Fri Nov 17 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.31.5-1
- Update to 8.31.5, patch from Edgan in #livna
* Sat Oct 14 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.29.6-1
- Update to 8.29.6 (needed for 2.6.18 suppport/FC6)
* Fri Aug 18 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.28.8-1
- Update to 8.28.8
- refactored %%prep now that ATi's installer has merged arches
* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-3
- update for kernel 2.6.17-1.2174_FC5
* Sat Aug 05 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-2
- no i586 on fc5
* Sun Jul 30 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-1
- Update to 8.27.10
- removal of random tabs
* Tue Jun 27 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.26.18-1
- Update to 8.26.18
* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.25.18-2
- Invoke kmodtool with bash instead of sh.
* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.25.18-1
- Update to 8.25.18
- drop patch25
* Thu May 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.24.8-3
- Require version >= of fglrx-kmod-common.
- Provide fglrx-kmod instead of kmod-fglrx to fix upgrade woes (#970).
* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.24.8-2
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
* Sat Apr 15 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.24.8-1
- Update to 8.24.8
- Remove old patches, x86_64 patch still needed
* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-4
- apply patches that might fix x86_64 at least for some people
* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-3
- disable xen0, too
* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-2
- allow to pass kversion and kvariants via command line
- disable x86_64 (build problem)
* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7.1-1
- drop 0.lvn
- drop ati-fglrx-get_page.patch patch
- update to 8.23.7
- hardcode kversion and kvariants
* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.2
- add ati-fglrx-accessok.patch
* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1
- split into packages for userland and kmod
- rename to fglrx-kmod
* Mon Dec 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.3
- Add patch for kernel 2.6.15
* Tue Dec 13 2005 Dams <anvil[AT]livna.org> - 8.20.8.1-0.lvn.2
- Really dropped Epoch
* Sat Dec 10 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1
- Update to 8.20.8-1
- Drop Epoch
* Sun Nov 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.19.10.1-0.lvn.2
- Patch for 2.6.14 still needed on x86_64 (thx Ryo Dairiki for noticing)
* Sat Nov 12 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.19.10.1-0.lvn.1
- Update to 8.19.10-1
- Remove patches for 2.6.14
- Add fresh translation to desktop-file
* Wed Nov 09 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.2
- Patch kernel-module source to compile with 2.6.14
* Thu Oct 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.1
- Update to 8.18.6-1
- Conflict with nvidia-glx{,-legacy) (#627)
- Fix moduleline.split in ati-fglrx-config-display (#582)
- Unload drm in ati-fglrx-config-display, too
- Only ship self compiled fireglcontrolpanel
* Fri Aug 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.16.20.1-0.lvn.1
- Update to 8.16.20-1
- Update patch1, fireglcontrol.desktop
- Don't strip kernel-module for now
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.5
- Update fglrx-2.6.12-inter_module_get.patch (thx to Mike Duigou)
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.4
- Add patches from http://ati.cchtml.com/show_bug.cgi?id=136 and some tricks
to built with 2.6.12 -- fixes building for FC4
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.3
- Missed one thing during reword of kernel-module-build-stuff
- Both x86_64 and x86 in the same package now
* Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.2
- Fix thinko
* Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.1
- Rework kernel-module-build-stuff for FC3 kmd and FC4 and new livna scheme
- Simplify the install; Lowers risk to miss files and is easier to maintain
- Remove dep on fedora-rpmdevtools
- Use modules and userland rpmbuild parameter to not build kernel- or driver-package
* Wed May 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.2
- Add fix for kernel 2.6.11
* Fri Apr 08 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.1
- Update to 8.12.10-1
- mod 0755 dri.so to let rpm detect require libstdc++.so.5
* Thu Mar 06 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.2
- Add patch for via agpgart (#355)
* Thu Feb 17 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.1
- Update to 8.10.19-1
- Remove patch for 2.6.10 kernel
- require libstdc++.so.5
* Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.4
- fix x86-64 in spec-file and in ati-fglrx-config-display
- Fix by Ville Skyttä: ldconfig on upgrades
* Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.3
- Package library links
* Wed Jan 19 2005 Dams <anvil[AT]livna.org> - 0:8.8.25.1-0.lvn.2
- Urlized ati rpm source
* Sat Jan 15 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.1
- Update to 8.8.25
- Remove workaround from last version
- Remove special drm includes
- Prepare package for 64-bit version; But untested ATM
- Update patches
* Tue Jan 11 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.3
- add patch10 -- allows building on 2.6.10; Found:
http://www.rage3d.com/board/showthread.php?t=33798874&highlight=2.6.10
- update drm-includes
- temporary for kernel-module: Requires: ati-fglrx >= %%{epoch}:%%{version}-0.lvn.2
so we don't have to rebuild the driver package
* Sun Nov 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.2
- Use kernelp and driverp rpmbuild parameter to not build kernel- or
driver-package
- Trim doc in header
* Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.1
- Update to 3.14.6
* Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.7
- Build per default without kmoddev
- Rename --without tools to --without dirverp
- Update dri-headers to 2.6.9 version
- update building documentation in header
* Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.6
- Some small cleanups to various parts of the package as suggested by Dams
* Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.5
- Enhance makefile patch so building with different uname should work correctly
- Build verbose
* Thu Oct 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.4
- Update fedora-unrpm usage to work with newer version
- Update one para in README and ati-fglrx-config-display output
* Fri Oct 15 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.3
- Change the enabling/disabling methode again -- driver is changed now
directly. DRI is enabled when fglrx is enabled, but try to unload/warn if
radeon kernel-module is loaded. DRI will be disabled and reenabled on the
when next restart when disableing fglrx driver.
- Update README.fglrx.Fedora
* Mon Oct 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.2
- Let new version of ati-flrx-config-display change default depth to 24
- Updated Spec-File bits: fedora-kmodhelper usage and building description
* Thu Sep 30 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.1
- Update to 3.14.1
- In expectation of missing kernel-sourcecode package in FC3 remove the BR
on it and include the neccessary header-files in the package. Will
integrate more packages if there are API changes. But for now I
think this is the easiest methode.
- Let ati-flrx-config-display handle /etc/ld.so.conf.d/ati-fglrx.conf
- Update ati-flrx-config-display; it adds a VideoOverlay Option now
so xv works out of the box
- Don't (de)activate driver if DRI-Kernel-Modules are loaded; Let the
init script to that during restart
- Update README.fglrx.Fedora
* Wed Sep 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.12.0-0.lvn.2
- Allow rpm to strip the kernel module.
- Fix shared library permissions.
- Split Requires(post,postun) to two to work around a bug in rpm.
- Fix -devel dependencies and kernel module package provisions.
- Improve summary and description, remove misleading comments.
* Sat Sep 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.12.0-0.lvn.1
- Update to 3.12.0
- Fix some fedora-kmodhelper/kernel-module related bits in spec
- Clean up install part a bit more
* Sun Sep 05 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.6
- Add stupid ati-fglrx.profile.d workaround for systems that had the
original fglrx drivers installed before
- Conflict with fglrx -- the package should be removed so it can clean up
the mess it did itself.
- Clean up desktop file
* Tue Aug 24 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.5
- Add ifdefs so building tools and kernel-module can be separated
- BuildRequire kernel-sourcecode kverrel, not kernel
* Wed Aug 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.4
- Fixed double release in Requires of devel-package
- Building against custom kernels now should work using rhkernel-macro
- Updated fedora-kmodhelper to 0.9.10
- Add 'include ld.so.conf.d/*.conf' before /usr/lib/X11 in /etc/ld.so.conf if
it does not exists
* Wed Aug 10 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.3
- small fixes for dump issues
* Thu Aug 09 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.2
- BuildRequire fedora-rpmdevtools
- Use KERNEL_PATH correctly, needs updated patch1
* Sat Aug 07 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.1
- Update to 3.11.1
- Minor fixes
* Fri Aug 6 2004 Dams <anvil[AT]livna.org> 0:3.9.0-0.lvn.4
- .a files are 0644 moded. tgz files too.
- Added missing BuildReq: desktop-file-utils, qt-devel, fedora-rpmdevtools
* Mon Jul 19 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.3
- Update Patches to a working solution
- Modify start-script-- fglrx can also work without kernel-module (no DRI then)
* Sun Jul 18 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.2
- intergrate Readme, init-script and ati-fglrx-config-display (stolen from
nvidia package)
* Sat Jul 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.1
- Initial RPM release.
--- NEW FILE fglrx-kmodtool-excludekernel-filterfile ---
xen$
fglrx-makefile.diff:
--- NEW FILE fglrx-makefile.diff ---
--- 2.6.x/Makefile.old 2005-01-13 19:43:14.938719720 +0100
+++ 2.6.x/Makefile 2005-01-13 19:40:13.825253152 +0100
@@ -27,11 +27,7 @@
KVER = $(shell uname -r)
# KVER = 2.6.0-0.test1.1.26custom
-ifeq (1,1)
-KDIR = /lib/modules/$(KVER)/build
-else
-KDIR = /usr/src/linux-$(KVER)
-endif
+KDIR = $(KERNEL_PATH)
PWD = $(shell pwd)
fglrx-cfiles = ${fglrx-c-objs:.o=.c}
fglrx-makesh.diff:
--- NEW FILE fglrx-makesh.diff ---
--- make.sh.old 2005-01-13 19:41:53.485102552 +0100
+++ make.sh 2005-01-13 19:40:01.866071224 +0100
@@ -75,10 +75,10 @@
# ==============================================================
# system/kernel identification
-uname_r=`uname -r`
-uname_v=`uname -v`
+uname_r="${FEDORA_UNAME_R}"
+uname_v="$(grep UTS_VERSION ${KERNEL_PATH}/include/linux/compile.h | cut -d'"' -f2)"
uname_s=`uname -s`
-uname_m=`uname -m`
+uname_m="${FEDORA_UNAME_M}"
uname_a=`uname -a`
# if you want to overload the current settings then please enter 1 below
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:02:14 -0000 1.1
+++ .cvsignore 16 Oct 2008 18:32:09 -0000 1.2
@@ -0,0 +1 @@
+fglrx-kmod-data-8.543.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:02:14 -0000 1.1
+++ sources 16 Oct 2008 18:32:09 -0000 1.2
@@ -0,0 +1 @@
+f3f08c9f33f45a0b5be7f55a81aee9dd fglrx-kmod-data-8.543.tar.bz2
16 years
- 1
- 0