public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-libs/libtrash/files: libtrash-3.2-gentoo.patch
@ 2008-12-30  1:33 Matsuu Takuto (matsuu)
  0 siblings, 0 replies; 2+ messages in thread
From: Matsuu Takuto (matsuu) @ 2008-12-30  1:33 UTC (permalink / raw
  To: gentoo-commits

matsuu      08/12/30 01:33:22

  Added:                libtrash-3.2-gentoo.patch
  Log:
  Version bumped, bug #252771.
  (Portage version: 2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64)

Revision  Changes    Path
1.1                  sys-libs/libtrash/files/libtrash-3.2-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?rev=1.1&view=markup
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

Index: libtrash-3.2-gentoo.patch
===================================================================
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,10 @@
         -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 install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE}
+#	ldconfig	
 
 clean:
 	rm -f *~






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/libtrash/files: libtrash-3.2-gentoo.patch
@ 2013-02-25 20:45 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 2+ messages in thread
From: Sergey Popov (pinkbyte) @ 2013-02-25 20:45 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    13/02/25 20:45:09

  Modified:             libtrash-3.2-gentoo.patch
  Log:
  Add creation of missing symlink
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.2                  sys-libs/libtrash/files/libtrash-3.2-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch?r1=1.1&r2=1.2

Index: libtrash-3.2-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtrash-3.2-gentoo.patch	30 Dec 2008 01:33:22 -0000	1.1
+++ libtrash-3.2-gentoo.patch	25 Feb 2013 20:45:09 -0000	1.2
@@ -45,7 +45,7 @@
  
  INSTLIBDIR=/usr/local/lib
  SYSCONFFILE=/etc/libtrash.conf
-@@ -32,10 +32,10 @@
+@@ -32,10 +32,11 @@
          -o libtrash.so.${VERSION} -ldl
  
  install-libtrash: 
@@ -55,6 +55,7 @@
 -	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	
  





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-02-25 20:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-30  1:33 [gentoo-commits] gentoo-x86 commit in sys-libs/libtrash/files: libtrash-3.2-gentoo.patch Matsuu Takuto (matsuu)
  -- strict thread matches above, loose matches on Subject: below --
2013-02-25 20:45 Sergey Popov (pinkbyte)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox