4 files changed, 12 insertions, 63 deletions
diff --git a/source/n/popa3d/popa3d-1.0.2-crypt.diff b/source/n/popa3d/popa3d-1.0.2-crypt.diff
deleted file mode 100644
index c6c006c7a..000000000
--- a/source/n/popa3d/popa3d-1.0.2-crypt.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- Owl/packages/popa3d/popa3d/auth_passwd.c	2002/03/20 17:08:45	1.1
-+++ Owl/packages/popa3d/popa3d/auth_passwd.c	2012/08/15 09:06:39	1.2
-@@ -26,9 +26,11 @@ struct passwd *auth_userpass(char *user,
- 	if (!pw || !*pw->pw_passwd ||
- 	    *pw->pw_passwd == '*' || *pw->pw_passwd == '!')
- 		crypt(pass, AUTH_DUMMY_SALT);
--	else
--	if (!strcmp(crypt(pass, pw->pw_passwd), pw->pw_passwd))
--		result = pw;
-+	else {
-+		char *hash = crypt(pass, pw->pw_passwd);
-+		if (hash && !strcmp(hash, pw->pw_passwd))
-+			result = pw;
-+	}
- 
- 	if (pw)
- 		memset(pw->pw_passwd, 0, strlen(pw->pw_passwd));
---- Owl/packages/popa3d/popa3d/auth_shadow.c	2006/03/05 13:18:32	1.2
-+++ Owl/packages/popa3d/popa3d/auth_shadow.c	2012/08/15 09:06:39	1.3
-@@ -52,9 +52,11 @@ struct passwd *auth_userpass(char *user,
- 		if (!(spw = getspnam(user)) || !pw || !*spw->sp_pwdp ||
- 		    *spw->sp_pwdp == '*' || *spw->sp_pwdp == '!')
- 			crypt(pass, AUTH_DUMMY_SALT);
--		else
--		if (!strcmp(crypt(pass, spw->sp_pwdp), spw->sp_pwdp))
--			result = 1;
-+		else {
-+			char *hash = crypt(pass, spw->sp_pwdp);
-+			if (hash && !strcmp(hash, spw->sp_pwdp))
-+				result = 1;
-+		}
- 		write(channel[1], &result, 1);
- 		exit(0);
- 	}
---- Owl/packages/popa3d/popa3d/virtual.c	2006/03/07 03:30:15	1.3
-+++ Owl/packages/popa3d/popa3d/virtual.c	2012/08/15 09:06:39	1.4
-@@ -175,8 +175,11 @@ struct passwd *virtual_userpass(char *us
- 	endpwent();
- 
- 	result = NULL;
--	if (!strcmp(crypt(pass, passwd), passwd) && !fail)
--		result = pw;
-+	{
-+		char *computed_hash = crypt(pass, passwd);
-+		if (computed_hash && !strcmp(computed_hash, passwd) && !fail)
-+			result = pw;
-+	}
- 
- 	memset(auth, 0, sizeof(auth));
- 
diff --git a/source/n/popa3d/popa3d-1.0.2.tar.gz.sign b/source/n/popa3d/popa3d-1.0.2.tar.gz.sign
deleted file mode 100644
index 44b2913bb..000000000
--- a/source/n/popa3d/popa3d-1.0.2.tar.gz.sign
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: 2.6.3ia
-Comment: http://www.openwall.com/signatures/
-
-iQCVAwUARHJblHK5fbEpUCnxAQEjyAP9HEydFlz7lFGoHI4SqBLlH7XRNFgs/sKg
-biNYMBlohgU2YHilrX1wNiActrLqvv+wr1en6KZVKHhG7QtLZo0MWQsypylEIxVT
-UVANL0wybUOnx+XRuQKKpCnkinS9Pic1dHXLTaXx1NkeHAYlUM6YRvdWSRpvkNHR
-eAHZO3LYaWI=
-=IGmS
------END PGP MESSAGE-----
diff --git a/source/n/popa3d/popa3d-1.0.3.tar.gz.sign b/source/n/popa3d/popa3d-1.0.3.tar.gz.sign
new file mode 100644
index 000000000..0e67ad15b
--- /dev/null
+++ b/source/n/popa3d/popa3d-1.0.3.tar.gz.sign
@@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+Comment: http://www.openwall.com/signatures/
+
+iQCVAwUAUmU8wHK5fbEpUCnxAQIrvwP9F/DskhIFt/e2kUVSe5C43zfeIY/4kE1f
+7TJj/Ip+ILiOqqNsKtYICx4JXQoDIuKTWU6EHUBOrrNYMwGeAfzl5Y/pKwx9IOa8
+7Fst2/ESOOsmz/na880JCosrMzJ8KjTAqhU6LxlUFvJfFqC14O1F8fjePQ2rhbZw
+hdeg+PLw8nA=
+=32vI
+-----END PGP SIGNATURE-----
diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild
index 3767fae6a..78932c70e 100755
--- a/source/n/popa3d/popa3d.SlackBuild
+++ b/source/n/popa3d/popa3d.SlackBuild
@@ -20,8 +20,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.0.2
-BUILD=${BUILD:-4}
+VERSION=1.0.3
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -47,7 +47,6 @@ tar xvf $CWD/popa3d-$VERSION.tar.gz || exit 1
 cd popa3d-$VERSION || exit 1
 
 zcat $CWD/popa3d.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/popa3d-1.0.2-crypt.diff.gz | patch -p4 --verbose || exit 1
 
 chown -R root:root .
 find . \