update 0.4.5

3 files changed, 75 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a30587524d3..24effa91a15d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pwman
 	pkgdesc = A text-based application for securely storing and managing passwords
-	pkgver = 0.4.4
+	pkgver = 0.4.5
 	pkgrel = 1
 	url = http://pwman.sourceforge.net/
 	arch = i686
@@ -10,8 +10,11 @@ pkgbase = pwman
 	depends = libxml2
 	depends = ncurses
 	depends = gnupg
-	source = http://downloads.sourceforge.net/pwman/pwman-0.4.4.tar.gz
-	md5sums = 29ddc5028391e224995151b4f959c51a
+	options = !buildflags
+	options = !lto
+	source = http://downloads.sourceforge.net/pwman/pwman-0.4.5.tar.gz
+	source = pwman.patch
+	md5sums = 091a97b23bea2f5e02f28f66814df55b
+	md5sums = 0fb7751695b8b0609db5699b213f3cb7
 
 pkgname = pwman
-
diff --git a/PKGBUILD b/PKGBUILD
index 47ed3a677836..93073352a356 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: portix <portix@gmx.net>
 
 pkgname=pwman
-pkgver=0.4.4
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="A text-based application for securely storing and managing passwords"
 arch=('i686' 'x86_64')
@@ -11,15 +11,25 @@ url="http://pwman.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'ncurses' 'gnupg')
 makedepends=('glib2')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('29ddc5028391e224995151b4f959c51a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+pwman.patch
+)
+md5sums=('091a97b23bea2f5e02f28f66814df55b'
+         '0fb7751695b8b0609db5699b213f3cb7')
+
+options=(!buildflags !lto)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+   patch --strip=1 < ../${pkgname}.patch
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man
-  make  
+  make 
+
+}
+package(){
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
 
diff --git a/pwman.patch b/pwman.patch
new file mode 100644
index 000000000000..3115c9c3ebe4
--- /dev/null
+++ b/pwman.patch
@@ -0,0 +1,54 @@
+diff --git a/src/actions.c b/src/actions.c
+index e5a6b64..0254440 100644
+--- a/src/actions.c
++++ b/src/actions.c
+@@ -29,6 +29,11 @@ extern PWList * pwlist_new(char*);
+ extern PWSearchResult * uilist_get_highlighted_searchresult();
+ extern char *pwgen_ask();
+ 
++Options *options;
++PWList *pwlist;
++PWList *current_pw_sublist;
++PWSearchResult *search_results;
++
+ int disp_h = 15, disp_w = 60;
+ extern int curitem;
+ extern WINDOW *bottom;
+diff --git a/src/gnupg.c b/src/gnupg.c
+index d42c7ce..d320bbf 100644
+--- a/src/gnupg.c
++++ b/src/gnupg.c
+@@ -52,7 +52,9 @@
+ 
+ int passphrase_good = 0;
+ extern int errno;
+-extern int write_options;
++
++int write_options;
++time_t time_base;
+ 
+ int gnupg_hit_sigpipe = 0;
+ static void gnupg_sigpipe_handler()
+diff --git a/src/pwman.h b/src/pwman.h
+index 0827254..f952cd7 100644
+--- a/src/pwman.h
++++ b/src/pwman.h
+@@ -112,12 +112,12 @@ typedef struct {
+ 	int sign_db;
+ } Options;
+ 
+-Options *options;
+-int write_options;
+-PWList *pwlist;
+-PWList *current_pw_sublist;
+-PWSearchResult *search_results;
+-time_t time_base;
++extern Options *options;
++extern int write_options;
++extern PWList *pwlist;
++extern PWList *current_pw_sublist;
++extern PWSearchResult *search_results;
++extern time_t time_base;
+ 
+ char *trim_ws(char*);
+ void debug(char*, ...);