Update to ccrypt 1.9.

Support user-destdir, install Emacs Lisp file but don't require Emacs.
This commit is contained in:
Aleksej Saushev 2009-09-05 20:33:58 +00:00 committed by Thomas Klausner
parent 88a996b04e
commit 3baaba1d7b
10 changed files with 39 additions and 205 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2006/10/29 08:32:39 shattered Exp $
# $NetBSD: Makefile,v 1.5 2009/09/05 20:33:58 asau Exp $
#
DISTNAME= ccrypt-1.4
DISTNAME= ccrypt-1.9
CATEGORIES= security
MASTER_SITES= http://www.mathstat.dal.ca/~selinger/ccrypt/download/
@ -9,6 +9,11 @@ MAINTAINER= poff@sixbit.org
HOMEPAGE= http://www.mathstat.dal.ca/~selinger/ccrypt/
COMMENT= Encrypts/decrypts files using Rijndael block cipher
GNU_CONFIGURE= yes
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS= perl intltool
USE_PKGLOCALEDIR= yes
CONFIGURE_ENV= EMACS=: # don't require Emacs
.include "../../mk/bsd.pkg.mk"

View file

@ -1,11 +1,14 @@
@comment $NetBSD: PLIST,v 1.2 2003/08/02 18:21:21 amadeus_z Exp $
@comment $NetBSD: PLIST,v 1.3 2009/09/05 20:33:58 asau Exp $
bin/ccat
bin/ccdecrypt
bin/ccencrypt
bin/ccrypt
lib/charset.alias
man/man1/ccat.1
man/man1/ccdecrypt.1
man/man1/ccencrypt.1
man/man1/ccrypt.1
share/doc/html/ccrypt/ccrypt.html
@dirrm share/doc/html/ccrypt
share/emacs/site-lisp/ps-ccrypt.el
share/locale/de/LC_MESSAGES/ccrypt.mo
share/locale/fr/LC_MESSAGES/ccrypt.mo
share/locale/locale.alias

View file

@ -1,6 +1 @@
Check for restricted export due to encryption.
Less patches? There are only 2 needed:
remove make emacs
change doc/Makefile.am to point to ${PREFIX}/share/doc/html instead

View file

@ -1,10 +1,6 @@
$NetBSD: distinfo,v 1.6 2005/09/28 06:41:09 rillig Exp $
$NetBSD: distinfo,v 1.7 2009/09/05 20:33:58 asau Exp $
SHA1 (ccrypt-1.4.tar.gz) = d3a55097c0681cf02a0c5626aaebfcbaeb5a4aca
RMD160 (ccrypt-1.4.tar.gz) = f80c1a24889d4dcffb852c8e02455f095896eeda
Size (ccrypt-1.4.tar.gz) = 165797 bytes
SHA1 (patch-ab) = ec1bc807704b32783ac1aa5e1f019ef96f505069
SHA1 (patch-ad) = b5ce3306a010ab30d23eec9556acdf8257a99357
SHA1 (patch-ae) = 919633e63465cea9d0203041a8120d6e92ce9fb3
SHA1 (patch-af) = 8b34aaf980ba364def40129afe60241290e97709
SHA1 (patch-ag) = fb61cd453d31aa09300258894e3e8f3219b64092
SHA1 (ccrypt-1.9.tar.gz) = 5ad1889c71be905c3004c80dc011948c9c35c814
RMD160 (ccrypt-1.9.tar.gz) = 2e7ec037dcfab82ad6963b8644a52017ac6c003e
Size (ccrypt-1.9.tar.gz) = 667059 bytes
SHA1 (patch-ah) = a5c08375daf92a3bf770bc6168338abaed42dd0b

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.1 2003/08/02 18:57:49 amadeus_z Exp $
--- Makefile.in.orig Sun Mar 30 05:38:07 2003
+++ Makefile.in
@@ -72,7 +72,7 @@ SUF = @SUF@
VERSION = @VERSION@
lispdir = @lispdir@
-SUBDIRS = src emacs doc check
+SUBDIRS = src doc check
EXTRA_DIST = README.win

View file

@ -1,97 +0,0 @@
$NetBSD: patch-ad,v 1.1 2003/08/02 18:57:49 amadeus_z Exp $
--- configure.orig Sun Mar 30 05:37:35 2003
+++ configure
@@ -778,76 +778,6 @@ DATE="March 2003"
-# If set to t, that means we are running in a shell under Emacs.
- # If you have an Emacs named "t", then use the full path.
- test "$EMACS" = t && EMACS=
- for ac_prog in emacs xemacs
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:790: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$EMACS" in
- /*)
- ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_EMACS="$EMACS" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_EMACS="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-EMACS="$ac_cv_path_EMACS"
-if test -n "$EMACS"; then
- echo "$ac_t""$EMACS" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$EMACS" && break
-done
-test -n "$EMACS" || EMACS="no"
-
- if test $EMACS != "no"; then
- echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:828: checking where .elc files should go" >&5
- lispdir="\$(datadir)/emacs/site-lisp"
- emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
- if test "x$prefix" = "xNONE"; then
- if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then
- lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
- else
- if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then
- lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
- fi
- fi
- else
- if test -d $prefix/share/$emacs_flavor/site-lisp; then
- lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
- else
- if test -d $prefix/lib/$emacs_flavor/site-lisp; then
- lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
- fi
- fi
- fi
- echo "$ac_t""$lispdir" 1>&6
- fi
-
-
NAME=ccrypt
NAMEENCRYPT=ccencrypt
@@ -1564,7 +1494,6 @@ ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "doc/ccrypt.1
Makefile
src/Makefile
- emacs/Makefile
check/Makefile
doc/Makefile
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -1667,7 +1596,6 @@ cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"doc/ccrypt.1
Makefile
src/Makefile
- emacs/Makefile
check/Makefile
doc/Makefile
"}

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ae,v 1.1 2003/08/02 18:57:49 amadeus_z Exp $
--- doc/Makefile.am.orig Sat Mar 29 07:46:25 2003
+++ doc/Makefile.am
@@ -6,7 +6,7 @@
EXTRA_DIST = ccrypt.1.in man2html.sed cypfaq01.txt
-htmldir = $(prefix)/doc/ccrypt
+htmldir = $(prefix)/share/doc/html/ccrypt
DISTCLEANFILES = ccrypt.ps ccrypt.html

View file

@ -1,13 +0,0 @@
$NetBSD: patch-af,v 1.1 2003/08/02 18:57:49 amadeus_z Exp $
--- doc/Makefile.in.orig Sun Mar 30 05:38:10 2003
+++ doc/Makefile.in
@@ -75,7 +75,7 @@ lispdir = @lispdir@
EXTRA_DIST = ccrypt.1.in man2html.sed cypfaq01.txt
-htmldir = $(prefix)/doc/ccrypt
+htmldir = $(prefix)/share/doc/html/ccrypt
DISTCLEANFILES = ccrypt.ps ccrypt.html

View file

@ -1,49 +0,0 @@
$NetBSD: patch-ag,v 1.1 2003/08/02 18:57:49 amadeus_z Exp $
--- doc/ccrypt.1.in.orig Sun Mar 30 01:36:31 2003
+++ doc/ccrypt.1.in
@@ -382,44 +382,6 @@ potentially unsafe for the same reason,
\fBps\fP don't tend to display environment information to other users.
The use of the \fB-T\fP option is unsafe for encryption because the
original plaintext will remain in unused sectors of the file system.
-.SH EMACS PACKAGE
-
-There is an emacs package for reading and writing encrypted files.
-(Note that this package currently only works with emacs, not with
-xemacs.) This package hooks into the low-level file I/O functions of
-emacs, prompting the user for a password where appropriate. It is
-implemented in much the same way as support for compressed files; in
-fact, the package, whose name is jka-compr-ccrypt, is based directly
-on the jka-compr package which is part of GNU Emacs. It handles both
-encrypted and compressed files (although currently not encrypted
-compressed files).
-
-To use the package, simply load jka-compr-ccrypt and edit as usual.
-When you open a file with the ".cpt" extension, emacs will prompt you
-for a password for the file. It will remember the password for the
-buffer, and when you save the file later, it will be automatically
-encrypted again (provided you save it with a ".cpt" extension). Except
-for the password prompt, the operation of the package should be
-transparent to the user. The package also handles compressed ".gz",
-".bz2", and ".Z" files, and it should be used instead of, not in
-addition to, jka-compr. The command M-x ccrypt-set-buffer-password can
-be used to change the current password of a buffer.
-
-The simplest way to use this package is to include the lines
-.IP
-.nf
- (setq load-path (cons "\fIpath\fP" load-path))
- (require 'jka-compr-ccrypt "jka-compr-ccrypt.el")
-.fi
-.LP
-in your .emacs file, where \fIpath\fP is the directory which holds the
-file jka-compr-ccrypt.el.
-
-Limitations of the emacs package: there is no guarantee that
-unencrypted information cannot leak to the file system; in fact, the
-package sometimes writes unencrypted data to temporary files. However,
-auto-saved files are normally treated correctly (i.e., encrypted).
-For details, see the comments in the file jka-compr-ccrypt.el.
.SH EXIT STATUS
The exit status is 0 on successful completion, and non-zero otherwise.

20
ccrypt/patches/patch-ah Normal file
View file

@ -0,0 +1,20 @@
--- emacs/Makefile.in.orig 2009-08-29 05:30:12.000000000 +0400
+++ emacs/Makefile.in 2009-09-06 00:25:41.000000000 +0400
@@ -309,7 +309,7 @@
test -f elc-stamp; exit $$?; \
fi; \
else : ; fi
-install-lispLISP: $(lisp_LISP) $(ELCFILES)
+install-lispLISP: $(lisp_LISP)
@$(NORMAL_INSTALL)
@if test "$(EMACS)" != no; then \
test -z "$(lispdir)" || $(mkdir_p) "$(DESTDIR)$(lispdir)"; \
@@ -373,7 +373,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LISP) $(ELCFILES)
+all-am: Makefile $(LISP)
installdirs:
for dir in "$(DESTDIR)$(lispdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \