OBS User unknown 2007-03-20 23:39:36 +00:00 committed by Git OBS Bridge
parent 757e3bdf11
commit 2418efb2a5
4 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,12 @@
--- ecryptfs-utils-10/src/utils/io.c.xx 2007-03-20 15:18:40.000000000 +0100
+++ ecryptfs-utils-10/src/utils/io.c 2007-03-20 15:18:52.000000000 +0100
@@ -211,8 +211,7 @@
if (!(nvp->next)) {
printf("No PKI parameters required\n");
- rc = 0;
- goto out;
+ return 0;
}
val_input = malloc(MAX_PKI_VALUE_SIZE + 1);
if (!val_input) {

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 20 15:21:00 CET 2007 - meissner@suse.de
- build on IA64
- fixed compiler warnings
-------------------------------------------------------------------
Tue Mar 6 14:20:50 CET 2007 - meissner@suse.de

View File

@ -17,8 +17,10 @@ Group: Productivity/Security
Autoreqprov: on
Summary: Userspace utilities for ecryptfs
Version: 10
Release: 2
Release: 4
Source0: http://downloads.sourceforge.net/ecryptfs/%{name}-%{version}.tar.bz2
Patch0: ia64.patch
Patch1: ecryptfs-utils-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel keyutils-devel keyutils-libs libgcrypt-devel openssl-devel
@ -37,8 +39,12 @@ Authors:
%prep
%setup -q
%patch0
%patch1 -p1
%build
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
autoreconf -i -f
%configure
make
make check
@ -60,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ecryptfs*
%changelog
* Tue Mar 20 2007 - meissner@suse.de
- build on IA64
- fixed compiler warnings
* Tue Mar 06 2007 - meissner@suse.de
- fixed build on lib64
* Mon Mar 05 2007 - meissner@suse.de

11
ia64.patch Normal file
View File

@ -0,0 +1,11 @@
--- configure.in
+++ configure.in
@@ -170,7 +170,7 @@
AC_PROG_RANLIB
case $target in
- *64* | *s390x)
+ *x86_64* | *power64* | *ppc64* | *s390x)
CFLAGS="$CFLAGS -m64 -DECRYPTFS_DEFAULT_PKI_DIR=\\\"$prefix/lib64/ecryptfs\\\""
LDFLAGS="$LDFLAGS -m64" ;;
*)