diff options
Diffstat (limited to 'mandriva/2010.2/dependencies/resmgr')
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/desktopdev | 17 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch | 10 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 | bin | 0 -> 34945 bytes | |||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff | 10 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff | 33 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff | 23 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch | 12 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr.conf | 69 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr.init | 56 | ||||
-rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr.spec | 212 |
10 files changed, 442 insertions, 0 deletions
diff --git a/mandriva/2010.2/dependencies/resmgr/desktopdev b/mandriva/2010.2/dependencies/resmgr/desktopdev new file mode 100644 index 000000000..3a66e2cf8 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/desktopdev @@ -0,0 +1,17 @@ +#!/bin/bash +# This adds a USB device to the "desktop usb" group. +# You just need to create an entry "desktopdev ..." in a usermap file +# and it will be picked up automatically. + +# Mandriva uses udev, you don't have to create a usermap +# If you want this script to be called, you have to create an udev +# rule in /etc/udev/rules.d/ that starts it, using +# RUN+="/etc/udev/agents.d/usb/desktopdev" + +if [ -x /sbin/resmgr ]; then + if [ "${ACTION}" = "add" ]; then + /sbin/resmgr ${ACTION} ${DEVICE} desktop usb && exit 0 + else + /sbin/resmgr ${ACTION} ${DEVICE} desktop && exit 0 + fi +fi diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch new file mode 100644 index 000000000..5ad0a4971 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch @@ -0,0 +1,10 @@ +--- resmgr-1.0/pam_resmgr.c 2003-03-05 14:32:19.000000000 +0100 ++++ resmgr-1.0.patched/pam_resmgr.c 2006-07-26 02:22:59.000000000 +0200 +@@ -9,6 +9,7 @@ + #include <string.h> + #include <unistd.h> + #include <ctype.h> ++#include <syslog.h> + + #include <security/pam_modules.h> + #include "protocol.h" diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 Binary files differnew file mode 100644 index 000000000..a064ace5d --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff new file mode 100644 index 000000000..96bb34c2b --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff @@ -0,0 +1,10 @@ +--- class.c 2002-11-11 05:31:46.000000000 -0500 ++++ class.c.oden 2008-07-18 07:26:19.000000000 -0400 +@@ -11,6 +11,7 @@ + #include <unistd.h> + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> + #include "resmgrd.h" + + res_class_t * res_classes; diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff new file mode 100644 index 000000000..6cf062d51 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff @@ -0,0 +1,33 @@ +--- Makefile 2003-04-10 10:21:01.000000000 +0200 ++++ Makefile.oden 2008-07-18 21:41:19.000000000 +0200 +@@ -23,6 +23,8 @@ + LIBBASE = libresmgr.so + LIB = $(LIBBASE).$(VERSION) + LIBOBJS = $(addprefix .lobjs/,conn.o client.o glob.o) ++LDFLAGS = ++PAMLIBS = -lpam + + ALL = $(SRV) $(CLT) $(LIB) $(PAM) tester + +@@ -46,17 +48,17 @@ + rm -rf $(ALL) $(LIBBASE) .objs .lobjs + + $(SRV): $(SRVOBJS) $(LIB) +- $(CC) -o $@ $(SRVOBJS) -L. -lresmgr ++ $(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr + + $(CLT): $(CLTOBJS) $(LIB) +- $(CC) -o $@ $(CLTOBJS) -L. -lresmgr ++ $(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr + + $(LIB): $(LIBOBJS) +- $(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS) ++ $(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS) + ln -sf $(LIB) $(LIBBASE) + + $(PAM): $(PAMOBJS) $(LIB) +- $(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr ++ $(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr + + tester: .objs/tester.o $(LIB) + $(CC) -o $@ .objs/tester.o -L. -lresmgr diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff new file mode 100644 index 000000000..8f409cf39 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff @@ -0,0 +1,23 @@ +--- Makefile 2008-07-18 21:48:27.000000000 +0200 ++++ Makefile.oden 2008-07-18 21:49:27.000000000 +0200 +@@ -33,15 +33,15 @@ + install: $(ALL) + mkdir -p $(SBINDIR) $(LIBDIR) $(MANDIR)/man{1,3,5,8} \ + $(ETCDIR) $(PAMDIR) $(INCDIR) +- install -m 555 $(LIB) $(LIBDIR) +- install -m 555 $(PAM) $(PAMDIR) ++ install -m 755 $(LIB) $(LIBDIR) ++ install -m 755 $(PAM) $(PAMDIR) + if [ ! -f $(ETCDIR)/resmgr.conf ]; then \ + install -m 644 etc/resmgr.conf $(ETCDIR); \ + fi +- install -m 444 resmgr.h $(INCDIR) +- install -m 555 -s $(CLT) $(SRV) $(SBINDIR) ++ install -m 644 resmgr.h $(INCDIR) ++ install -m 755 -s $(CLT) $(SRV) $(SBINDIR) + for x in 1 3 5 8; do \ +- install -m 444 doc/*.$$x $(MANDIR)/man$$x; \ ++ install -m 644 doc/*.$$x $(MANDIR)/man$$x; \ + done + + clean distclean: diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch new file mode 100644 index 000000000..4c45e8b86 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch @@ -0,0 +1,12 @@ +diff -ur resmgr-1.0.orig/utils.c resmgr-1.0/utils.c +--- resmgr-1.0.orig/utils.c 2003-03-05 14:32:19.000000000 +0100 ++++ resmgr-1.0/utils.c 2005-03-16 11:47:58.000000000 +0100 +@@ -101,7 +101,7 @@ + sprintf(buffer, "%03d ", code); + n = strlen(buffer); + vsnprintf(buffer+n, sizeof(buffer)-n, fmt, ap); +- vlog(LOG_INFO, "%s", buffer); ++ def_log("%s", buffer); + va_end(ap); + } + diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.conf b/mandriva/2010.2/dependencies/resmgr/resmgr.conf new file mode 100644 index 000000000..a6294c709 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr.conf @@ -0,0 +1,69 @@ +# This is the default set of devices people logged in on the desktop get +# access to: +class desktop +# +# Standard multimedia devices +add /dev/audio desktop +add /dev/mixer desktop +add /dev/dsp desktop +add /dev/sequencer desktop +add /dev/video desktop +# +# Modem device +add /dev/modem desktop +# +# CD-ROMs - giving permission to open the corresponding SCSI +# device is highly useful for CD writers such as cdrecord. +add /dev/cdrom desktop scsi paride +add /dev/cdrom1 desktop scsi paride +add /dev/cdrecorder desktop scsi +add /dev/dvd desktop scsi paride +add /dev/dvd1 desktop scsi paride +add /dev/sr0 desktop scsi +add /dev/sr1 desktop scsi +add /dev/sr2 desktop scsi +add /dev/sr3 desktop scsi +# +# Dito for SCSI scanners, which all use /dev/scanner symlink. +add /dev/scanner desktop scsi +# +# And USB scanners. +add /dev/usbscanner desktop +add /dev/usb/scanner desktop +add /dev/usb/scanner0 desktop +add /dev/usb/scanner1 desktop +add /dev/usb/scanner2 desktop +add /dev/usb/scanner3 desktop +add /dev/usb/scanner4 desktop +add /dev/usb/scanner5 desktop +add /dev/usb/scanner6 desktop +add /dev/usb/scanner7 desktop +# +# make /dev/console accessible read-only +add /dev/console desktop read-only + +# +# This rule grants access to users logged in locally +# +allow desktop tty=/dev/tty[1-9]* || tty=tty[1-9]* || tty=:0 + +# For serial gphoto cameras. +# add /dev/ttyS0 desktop +# add /dev/ttyS1 desktop +# +# Sample rules, do not enable by default: +# +# This rule denies access to users uucp and news +# +# deny desktop user=uucp || user=news +# +# This rule gives access to all members of group wheel +# +# allow desktop group=wheel +# +# To make resmgr work with ssh, for instance, add the following +# line to /etc/pam.d/ssh: +# session optional pam_resmgr.so fake_ttyname +# When a user logs in, a resmgr session will be opened, and +# access will be granted automaticially to all resource classes +# matched via access control statements in resmgr.conf. diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.init b/mandriva/2010.2/dependencies/resmgr/resmgr.init new file mode 100644 index 000000000..815931a09 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr.init @@ -0,0 +1,56 @@ +#!/bin/bash +# +# chkconfig: 2345 15 15 +# description: The resource manager is a framework to give user applications +# access to certain device files. The resource manager daemon can be configured +# to give certain users access to different resource classes. +# processname: resmgr +# pidfile: /var/run/resmgr.pid +# +### BEGIN INIT INFO +# Provides: resmgr +# Default-Start: 2 3 4 5 +# Short-Description: A program to allow arbitrary access to device files +# Description: The resource manager is a framework to give user applications \ +# access to certain device files. The resource manager daemon can be configured \ +# to give certain users access to different resource classes. +### END INIT INFO + +# source function library +. /etc/rc.d/init.d/functions + +RETVAL=0 + +RESMGR_BIN=/sbin/resmgrd + +case "$1" in + start) + gprintf "Starting resource manager services: " + daemon $RESMGR_BIN + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/resmgr + ;; + stop) + gprintf "Shutting down resmgr services: " + killproc resmgr + RETVAL=$? + + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/resmgr + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + status) + status resmgr + RETVAL=$? + ;; + *) + gprintf "Usage: resmgr {start|stop|status|restart|reload}\n" + exit 1 +esac + +exit $RETVAL diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.spec b/mandriva/2010.2/dependencies/resmgr/resmgr.spec new file mode 100644 index 000000000..a657321dc --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr.spec @@ -0,0 +1,212 @@ +%define major 1 +%define libname %mklibname %{name} %{major} +%define develname %mklibname %{name} -d + +Summary: A program to allow arbitrary access to device files +Name: resmgr +Version: 1.0 +Release: %mkrel 14 +License: GPLv2 +Group: System/Servers +URL: http://www.lst.de/~okir/resmgr/ +Source: ftp://ftp.lst.de/pub/people/okir/%{name}/%{name}-%{version}.tar.bz2 +Source1: resmgr.init +Source2: resmgr.conf +Source3: desktopdev +Patch0: resmgr-1.0-syslog.patch +Patch1: resmgr-va_list.patch +Patch2: resmgr-glibc28.diff +Patch3: resmgr-linkage_fix.diff +Patch4: resmgr-permission_fix.diff +Requires(post): rpm-helper +Requires(preun): rpm-helper +BuildRequires: pam-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +%description +The resource manager is a framework to give user applications access +to certain device files. The resource manager daemon can be configured +to give certain users access to different resource classes. + +It supports hotplugging devices (i.e. new devices can be added to +and removed from resource classes at run time), and it provides +transparent access to the raw SCSI device corresponding to +a CD writer or a scanner. + +%package -n %{libname} +Summary: Shared libraries for %{name} +Group: System/Libraries + +%description -n %{libname} +The resource manager is a framework to give user applications access +to certain device files. The resource manager daemon can be configured +to give certain users access to different resource classes. + +It supports hotplugging devices (i.e. new devices can be added to +and removed from resource classes at run time), and it provides +transparent access to the raw SCSI device corresponding to +a CD writer or a scanner. + +%package -n %{develname} +Summary: Development headers and libraries for %{name} +Group: Development/C +Requires: %{libname} = %{version} +Provides: lib%{name}-devel = %{version}-%{release} +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: %{mklibname resmgr 1 -d} + +%description -n %{develname} +The resource manager is a framework to give user applications access +to certain device files. The resource manager daemon can be configured +to give certain users access to different resource classes. + +It supports hotplugging devices (i.e. new devices can be added to +and removed from resource classes at run time), and it provides +transparent access to the raw SCSI device corresponding to +a CD writer or a scanner. + +%prep + +%setup -q +%patch0 -p1 -b .syslog +%patch1 -p1 -b .va_list +%patch2 -p0 -b .glibc28 +%patch3 -p0 -b .linkage_fix +%patch4 -p0 -b .permission_fix + +%build +%make CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{ldflags}" + +%install +rm -rf %{buildroot} + +%makeinstall_std LIBDIR=%{buildroot}/%{_lib} PAMDIR=%{buildroot}/%{_lib}/security + +ln -sf libresmgr.so.* %{buildroot}/%{_lib}/libresmgr.so +install -m755 %{SOURCE1} -D %{buildroot}%{_initrddir}/%{name} +mkdir -p %{buildroot}/usr/sbin/ +ln -s ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} +# install config file +install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.conf +install -c -m755 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/udev/agents.d/usb/desktopdev + +%post +%_post_service %{name} + +%preun +%_preun_service %{name} + +%if %mdkversion < 200900 +%post -n %{libname} -p /sbin/ldconfig +%endif + +%if %mdkversion < 200900 +%postun -n %{libname} -p /sbin/ldconfig +%endif + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc README TODO ANNOUNCE +%config(noreplace) %{_sysconfdir}/%{name}.conf +%{_initrddir}/%{name} +%{_sysconfdir}/udev/agents.d/usb/desktopdev +%{_sbindir}/rc%{name} +/sbin/%{name} +/sbin/%{name}d +%{_mandir}/man*/* + +%files -n %{libname} +%defattr(-,root,root) +/%{_lib}/*.so.* +/%{_lib}/security/* + +%files -n %{develname} +%defattr(-,root,root) +/%{_lib}/*.so +%{_includedir}/%{name}.h + + +%changelog +* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.0-14mdv2010.2 ++ Rebuild for Trinity + +* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 1.0-13mdv2010.0 ++ Revision: 426907 +- rebuild + +* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-12mdv2009.1 ++ Revision: 317576 +- use %%ldflags + +* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-11mdv2009.0 ++ Revision: 238350 +- fix linkage +- fix errors in the init script +- fix permissions (for strip + debug packaging) + +* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-10mdv2009.0 ++ Revision: 238102 +- added P1 from pld +- fix build, P2 + -D_GNU_SOURCE + + + Thierry Vignaud <tvignaud@mandriva.com> + - rebuild + + + Pixel <pixel@mandriva.com> + - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers + +* Wed Mar 05 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-8mdv2008.1 ++ Revision: 179431 +- rebuild + + + Olivier Blin <oblin@mandriva.com> + - restore BuildRoot + + + Thierry Vignaud <tvignaud@mandriva.com> + - kill re-definition of %%buildroot on Pixel's request + +* Wed Aug 01 2007 Adam Williamson <awilliamson@mandriva.org> 1.0-7mdv2008.0 ++ Revision: 57363 +- rebuild for 2008 +- new devel policy +- spec clean + + +* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com> ++ 2006-07-31 20:51:47 (42877) +- Increase release number + +* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com> ++ 2006-07-31 20:50:48 (42876) +- Fix for http://qa.mandriva.com/show_bug.cgi?id=23968 ( wrong init services ) + +* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com> ++ 2006-07-26 03:39:04 (42167) +- Moved to subversion +- Added patch from Jan Ciger to fix syslog defines + +* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com> ++ 2006-07-26 03:11:36 (42165) +- import resmgr-1.0-4mdk + +* Wed Jan 18 2006 Olivier Blin <oblin@mandriva.com> 1.0-4mdk +- fix pam files installation on x86_64 +- buildrequire pam-devel +- drop hotplug requirement + +* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 1.0-3mdk +- move hotplug script to in udev agents.d directory +- update Source4 to explain how it should be handled with udev + +* Sun Jun 12 2005 Per Øyvind Karlsen <pkarlsen@mandriva.com> 1.0-2mdk +- rebuild +- fix requires +- do not mark init file as config file +- %%{1}mdv2007.0 + +* Fri May 21 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 1.0-1mdk +- initial mdk release (based on suse package) + |