blob: 87f4e887ad8e3d556c29ddcab6f591e2ec4b0fe5 (
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
|
diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/checks/Makefile.in gnupg-1.4.2.2/checks/Makefile.in
--- gnupg-1.4.2.2.orig/checks/Makefile.in 2006-03-08 15:14:42.000000000 -0300
+++ gnupg-1.4.2.2/checks/Makefile.in 2006-03-08 15:16:53.000000000 -0300
@@ -517,9 +517,11 @@
./gpg_dearmor:
echo '#!/bin/sh' >./gpg_dearmor
- echo "../g10/gpg --no-options --no-greeting \
+ echo "../g10/gpg --no-options --no-greeting --homedir . \
--no-secmem-warning --batch --dearmor" >>./gpg_dearmor
chmod 755 ./gpg_dearmor
+ if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
+ if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/g10/openfile.c gnupg-1.4.2.2/g10/openfile.c
--- gnupg-1.4.2.2.orig/g10/openfile.c 2006-03-08 15:14:42.000000000 -0300
+++ gnupg-1.4.2.2/g10/openfile.c 2006-03-08 15:17:31.000000000 -0300
@@ -399,8 +399,10 @@
* To cope with HOME, we do compare only the suffix if we see that
* the default homedir does start with a tilde.
*/
+#ifndef ENABLE_SELINUX_HACKS
if( opt.dry_run || opt.no_homedir_creation )
return;
+#endif
if ( ( *defhome == '~'
&& ( strlen(fname) >= strlen (defhome+1)
|