| 1 |
matsuu 08/12/30 01:33:22 |
| 2 |
|
| 3 |
Added: libtrash-3.2-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bumped, bug #252771. |
| 6 |
(Portage version: 2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-libs/libtrash/files/libtrash-3.2-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libtrash-3.2-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur libtrash-3.2.orig/cleanTrash/ct2.pl libtrash-3.2/cleanTrash/ct2.pl |
| 17 |
--- libtrash-3.2.orig/cleanTrash/ct2.pl 2003-12-08 04:11:49.000000000 +0900 |
| 18 |
+++ libtrash-3.2/cleanTrash/ct2.pl 2008-12-30 10:13:12.000000000 +0900 |
| 19 |
@@ -39,7 +39,8 @@ |
| 20 |
### CONFIGURATION |
| 21 |
########################################################################## |
| 22 |
# Trash-directory relative to home-dir |
| 23 |
-$TRASH_DIR = '/Desktop/Trash'; |
| 24 |
+#$TRASH_DIR = '/Desktop/Trash'; |
| 25 |
+$TRASH_DIR = '/Trash'; |
| 26 |
|
| 27 |
# Trash-history file relative to home-dir |
| 28 |
$TRASH_HIST_FILE = '/.trashhist'; |
| 29 |
@@ -52,7 +53,8 @@ |
| 30 |
|
| 31 |
# minimum user number (by convention on many Linux systems, 'real' users |
| 32 |
# have UIDs >= 500). Set to zero to process all users |
| 33 |
-$MIN_USER = 500; |
| 34 |
+#$MIN_USER = 500; |
| 35 |
+$MIN_USER = 1000; |
| 36 |
|
| 37 |
########################################################################## |
| 38 |
### PROGRAM |
| 39 |
diff -Naur libtrash-3.2.orig/libtrash.conf libtrash-3.2/libtrash.conf |
| 40 |
--- libtrash-3.2.orig/libtrash.conf 2007-12-04 08:33:34.000000000 +0900 |
| 41 |
+++ libtrash-3.2/libtrash.conf 2008-12-30 10:16:12.000000000 +0900 |
| 42 |
@@ -286,8 +286,8 @@ |
| 43 |
# through the use of the UNCOVER_DIRS environmental variable (see |
| 44 |
# below). |
| 45 |
|
| 46 |
-UNREMOVABLE_DIRS = |
| 47 |
-#UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr |
| 48 |
+#UNREMOVABLE_DIRS = |
| 49 |
+UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/lib32;/lib64;/sbin;/usr;/opt |
| 50 |
|
| 51 |
# This is a convenience configuration variable: it simply instructs |
| 52 |
# libtrash to temporarily remove the listed directory(ies) from the |
| 53 |
diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile |
| 54 |
--- libtrash-3.2.orig/src/Makefile 2008-01-23 21:41:24.000000000 +0900 |
| 55 |
+++ libtrash-3.2/src/Makefile 2008-12-30 10:21:10.000000000 +0900 |
| 56 |
@@ -1,5 +1,5 @@ |
| 57 |
CC=gcc |
| 58 |
-CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT |
| 59 |
+CFLAGS+=-Wall -W -Wmissing-prototypes -D_REENTRANT |
| 60 |
|
| 61 |
INSTLIBDIR=/usr/local/lib |
| 62 |
SYSCONFFILE=/etc/libtrash.conf |
| 63 |
@@ -32,10 +32,10 @@ |
| 64 |
-o libtrash.so.${VERSION} -ldl |
| 65 |
|
| 66 |
install-libtrash: |
| 67 |
- TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION} |
| 68 |
- TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so |
| 69 |
- TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE} |
| 70 |
- ldconfig |
| 71 |
+ TRASH_OFF=YES install libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.${VERSION} |
| 72 |
+ TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so |
| 73 |
+ TRASH_OFF=YES install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE} |
| 74 |
+# ldconfig |
| 75 |
|
| 76 |
clean: |
| 77 |
rm -f *~ |
Archives