blob: f1dba6b03917eab71224af54df00ede67d968e88 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff -Naur libtrash-3.2.orig/cleanTrash/ct2.pl libtrash-3.2/cleanTrash/ct2.pl
--- libtrash-3.2.orig/cleanTrash/ct2.pl 2003-12-08 04:11:49.000000000 +0900
+++ libtrash-3.2/cleanTrash/ct2.pl 2008-12-30 10:13:12.000000000 +0900
@@ -39,7 +39,8 @@
### CONFIGURATION
##########################################################################
# Trash-directory relative to home-dir
-$TRASH_DIR = '/Desktop/Trash';
+#$TRASH_DIR = '/Desktop/Trash';
+$TRASH_DIR = '/Trash';
# Trash-history file relative to home-dir
$TRASH_HIST_FILE = '/.trashhist';
@@ -52,7 +53,8 @@
# minimum user number (by convention on many Linux systems, 'real' users
# have UIDs >= 500). Set to zero to process all users
-$MIN_USER = 500;
+#$MIN_USER = 500;
+$MIN_USER = 1000;
##########################################################################
### PROGRAM
diff -Naur libtrash-3.2.orig/libtrash.conf libtrash-3.2/libtrash.conf
--- libtrash-3.2.orig/libtrash.conf 2007-12-04 08:33:34.000000000 +0900
+++ libtrash-3.2/libtrash.conf 2008-12-30 10:16:12.000000000 +0900
@@ -286,8 +286,8 @@
# through the use of the UNCOVER_DIRS environmental variable (see
# below).
-UNREMOVABLE_DIRS =
-#UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr
+#UNREMOVABLE_DIRS =
+UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/lib32;/lib64;/sbin;/usr;/opt
# This is a convenience configuration variable: it simply instructs
# libtrash to temporarily remove the listed directory(ies) from the
diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile
--- libtrash-3.2.orig/src/Makefile 2008-01-23 21:41:24.000000000 +0900
+++ libtrash-3.2/src/Makefile 2008-12-30 10:21:10.000000000 +0900
@@ -1,5 +1,5 @@
CC=gcc
-CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
+CFLAGS+=-Wall -W -Wmissing-prototypes -D_REENTRANT
INSTLIBDIR=/usr/local/lib
SYSCONFFILE=/etc/libtrash.conf
@@ -32,10 +32,11 @@
-o libtrash.so.${VERSION} -ldl
install-libtrash:
- TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
- TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so
- TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
- ldconfig
+ TRASH_OFF=YES install libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.${VERSION}
+ TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so
+ TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.3
+ TRASH_OFF=YES install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE}
+# ldconfig
clean:
rm -f *~
|
GitWeb
