rpms/pmount/EL-5 pmount-0.9.13-keeppublic.patch, NONE, 1.1 pmount-0.9.13-nosetuid.patch, NONE, 1.1 pmount.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/pmount/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12584/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	pmount-0.9.13-keeppublic.patch pmount-0.9.13-nosetuid.patch 
	pmount.spec 
Log Message:
Add FC-6 and EL-5 branches

pmount-0.9.13-keeppublic.patch:

--- NEW FILE pmount-0.9.13-keeppublic.patch ---
--- pmount-0.9.13/src/pmount-hal.c.keeppublic	2007-02-06 16:03:00.000000000 +0100
+++ pmount-0.9.13/src/pmount-hal.c	2007-02-06 16:04:18.000000000 +0100
@@ -361,7 +361,11 @@
     /* shut down hal connection */
     libhal_ctx_shutdown( hal_ctx, &error );
     libhal_ctx_free( hal_ctx );
+    /* shouldn't close public connections, see
+    http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html#ge130c33da29477897d362ab89f068191 */
+/*
     dbus_connection_close( dbus_conn );
+*/
     dbus_connection_unref( dbus_conn );
 
     /* go */

pmount-0.9.13-nosetuid.patch:

--- NEW FILE pmount-0.9.13-nosetuid.patch ---
--- pmount-0.9.13/src/Makefile.in.nosetuid	2006-08-15 23:42:43.000000000 +0200
+++ pmount-0.9.13/src/Makefile.in	2006-09-29 10:09:10.000000000 +0200
@@ -260,7 +260,7 @@
 	policy.h \
 	utils.h
 
-INSTALL_DIR = $(DESTDIR)/$(prefix)/bin
+INSTALL_DIR = $(DESTDIR)/$(bindir)
 INSTALL_SRC = $(top_builddir)/src
 all: all-am
 
@@ -570,8 +570,8 @@
 
 install-data-hook:
 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+	$(INSTALL_DATA) -m 755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
 
 uninstall-hook:
 	rm -f $(INSTALL_DIR)/pmount


--- NEW FILE pmount.spec ---
Name:           pmount
Version:        0.9.13
Release:        1%{?dist}
Summary:        Enable normal user mount

Group:          System Environment/Base
License:        GPL
URL:            http://www.piware.de/projects.shtml
Source0:        http://www.piware.de/projects/pmount-%{version}.tar.gz
# don't set the setuid bits during make install
Patch0:         pmount-0.9.13-nosetuid.patch
Patch1:         pmount-0.9.13-keeppublic.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  intltool gettext pkgconfig
BuildRequires:  libsysfs-devel hal-devel
Requires:       cryptsetup-luks

%description
pmount  ("policy mount") is a wrapper around the standard mount program
which permits normal users to mount removable devices without a  
matching /etc/fstab entry.

Be warned that pmount is installed setuid root.

%prep
%setup -q
%patch0 -p1 -b .nosetuid
%patch1 -p1 -b .keeppublic

%build
# mount, umount and cryptsetup path are right and don't use rpm macros,
# so the corresponding configure options are not used.
%configure \
  --with-lock-dir=%{_localstatedir}/lock/pmount \
  --with-whitelist=%{_sysconfdir}/pmount.allow

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README.devel TODO COPYING ChangeLog
%config(noreplace) %{_sysconfdir}/pmount.allow
%attr(4755,root,root) %{_bindir}/pmount
%attr(4755,root,root) %{_bindir}/pumount
%{_bindir}/pmount-hal
%{_mandir}/man1/p*mount*.1*

%changelog
* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.9.13-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pmount/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 May 2007 23:05:30 -0000	1.1
+++ .cvsignore	10 May 2007 07:14:08 -0000	1.2
@@ -0,0 +1 @@
+pmount-0.9.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pmount/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 May 2007 23:05:30 -0000	1.1
+++ sources	10 May 2007 07:14:08 -0000	1.2
@@ -0,0 +1 @@
+978d1c996fb7f74e8bb953d5674ab691  pmount-0.9.13.tar.gz