[arch-commits] Commit in thttpd/trunk (PKGBUILD crypt.patch)

[Gaetan Bisson]

    Date: Sunday, October 19, 2014 @ 22:38:36
  Author: bisson
Revision: 120988

fix the fix

Modified:
  thttpd/trunk/PKGBUILD
  thttpd/trunk/crypt.patch

-------------+
 PKGBUILD    |    4 ++--
 crypt.patch |   19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-19 20:36:41 UTC (rev 120987)
+++ PKGBUILD	2014-10-19 20:38:36 UTC (rev 120988)
@@ -5,7 +5,7 @@
 
 pkgname=thttpd
 pkgver=2.26
-pkgrel=3
+pkgrel=4
 pkgdesc='Simple, small, portable, fast, and secure HTTP server'
 url='http://www.acme.com/software/thttpd/'
 license=('custom:BSD')
@@ -20,7 +20,7 @@
 sha1sums=('6acdc827203ab5878743cf0efee818d796ff740e'
           '1293fbaf83a489c65d6d2b107d797c687233d96a'
           'b954028d4360ad856f7fb1edc8534f0652f33d20'
-          'f943575eaa53043df9344a81acb932a4977eacee'
+          '603007a9292e84eea864b9ffb3bdf34c7e4dd8c9'
           '73bd76de0e89a9cc31e5605659837d83b3c8dfde'
           '7a6413491b6ba68625d450caa3c6f071af0ca1ac')
 

Modified: crypt.patch
===================================================================
--- crypt.patch	2014-10-19 20:36:41 UTC (rev 120987)
+++ crypt.patch	2014-10-19 20:38:36 UTC (rev 120988)
@@ -1,11 +1,24 @@
 diff -Naur old/extras/htpasswd.c new/extras/htpasswd.c
---- old/extras/htpasswd.c	2014-10-18 11:18:43.299358982 -1000
-+++ new/extras/htpasswd.c	2014-10-18 11:19:05.859440475 -1000
-@@ -8,6 +8,7 @@
+--- old/extras/htpasswd.c	2014-10-19 10:28:39.782856897 -1000
++++ new/extras/htpasswd.c	2014-10-19 10:29:12.842911168 -1000
+@@ -8,6 +8,8 @@
  ** if stdin is a pipe or file.  This is necessary for use from CGI.
  */
  
 +#define _XOPEN_SOURCE
++
  #include <sys/types.h>
  #include <stdio.h>
  #include <string.h>
+diff -Naur old/libhttpd.c new/libhttpd.c
+--- old/libhttpd.c	2014-10-19 10:28:39.782856897 -1000
++++ new/libhttpd.c	2014-10-19 10:29:01.679559501 -1000
+@@ -39,6 +39,8 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ 
++#define __USE_XOPEN
++
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>