[Pkg-erlang-commits] r1392 - in yaws/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Dec 24 13:25:56 UTC 2011
Author: sgolovan
Date: 2011-12-24 13:25:55 +0000 (Sat, 24 Dec 2011)
New Revision: 1392
Removed:
yaws/trunk/debian/patches/dirtraversal.diff
yaws/trunk/debian/patches/driver.diff
yaws/trunk/debian/patches/mime.diff
Modified:
yaws/trunk/debian/changelog
yaws/trunk/debian/control
yaws/trunk/debian/patches/clean.diff
yaws/trunk/debian/patches/series
yaws/trunk/debian/rules
Log:
[yaws]
* New upstream release.
* Removed patches which fix directory traversal bug and loading external
drivers for Erlang R15B because they are included into this upstream
release.
* Removed patch which uses external mime.types.
Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/changelog 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,8 +1,13 @@
-yaws (1.91-4) unstable; urgency=low
+yaws (1.92-1) unstable; urgency=low
+ * New upstream release.
+ * Removed patches which fix directory traversal bug and loading external
+ drivers for Erlang R15B because they are included into this upstream
+ release.
* Added a few more fixes for compatibility with Erlang R15B.
+ * Removed patch which uses external mime.types.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 23 Dec 2011 17:18:31 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 24 Dec 2011 14:13:53 +0400
yaws (1.91-3) experimental; urgency=low
Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/control 2011-12-24 13:25:55 UTC (rev 1392)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Erlang Packagers <pkg-erlang-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, mime-support, libpam0g-dev,
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libpam0g-dev,
erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia,
texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended,
texlive-font-utils, texlive-extra-utils, ghostscript, quilt
Modified: yaws/trunk/debian/patches/clean.diff
===================================================================
--- yaws/trunk/debian/patches/clean.diff 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/patches/clean.diff 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,15 +1,5 @@
Patch fixes cleaning up after build process.
---- yaws-1.91.orig/Makefile
-+++ yaws-1.91/Makefile
-@@ -45,6 +45,7 @@
-
- conf_clean:
- -rm include.mk config.cache config.status config.log 2> /dev/null
-+ -rm test/support/include.mk test/support/include.sh $(PKGCONFIG_FILES) 2> /dev/null
-
- local_install: all
- (cd scripts && $(MAKE) local_install)
--- yaws-1.91.orig/doc/Makefile
+++ yaws-1.91/doc/Makefile
@@ -41,6 +41,7 @@
Deleted: yaws/trunk/debian/patches/dirtraversal.diff
===================================================================
--- yaws/trunk/debian/patches/dirtraversal.diff 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/patches/dirtraversal.diff 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,29 +0,0 @@
-Author: Uwe Dauernheim
-Description: The patch offers a quickfix for directory traversal vulnerability.
-Bug: https://github.com/klacke/yaws/issues/69
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650009
-Last-updated: Sat, 26 Nov 2011 19:30:04 +0400
-
---- yaws-1.91.orig/src/yaws_api.erl
-+++ yaws-1.91/src/yaws_api.erl
-@@ -818,12 +818,14 @@
- path_norm_reverse("/" ++ T) -> start_dir(0, "/", T);
- path_norm_reverse( T) -> start_dir(0, "", T).
-
--start_dir(N, Path, [$\\|T] ) -> start_dir(N, Path, [$/|T]);
--start_dir(N, Path, ".." ) -> rest_dir(N, Path, "");
--start_dir(N, Path, "/" ++ T ) -> start_dir(N , Path, T);
--start_dir(N, Path, "./" ++ T ) -> start_dir(N , Path, T);
--start_dir(N, Path, "../" ++ T ) -> start_dir(N + 1, Path, T);
--start_dir(N, Path, T ) -> rest_dir (N , Path, T).
-+start_dir(N, Path, [$\\|T] ) -> start_dir(N, Path, [$/|T]);
-+start_dir(N, Path, ".." ) -> rest_dir(N, Path, "");
-+start_dir(N, Path, "/" ++ T ) -> start_dir(N , Path, T);
-+start_dir(N, Path, "./" ++ T ) -> start_dir(N , Path, T);
-+start_dir(N, Path, ".\\" ++ T ) -> start_dir(N , Path, T);
-+start_dir(N, Path, "../" ++ T ) -> start_dir(N + 1, Path, T);
-+start_dir(N, Path, "..\\" ++ T ) -> start_dir(N + 1, Path, T);
-+start_dir(N, Path, T ) -> rest_dir (N , Path, T).
-
- rest_dir (_N, Path, [] ) -> case Path of
- [] -> "/";
Deleted: yaws/trunk/debian/patches/driver.diff
===================================================================
--- yaws/trunk/debian/patches/driver.diff 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/patches/driver.diff 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,117 +0,0 @@
-Patch by upstream fixes compatibility with Erlang R15B.
-
---- yaws-1.91.orig/c_src/setuid_drv.c
-+++ yaws-1.91/c_src/setuid_drv.c
-@@ -131,6 +131,17 @@
- setuid_driver_entry.finish = NULL;
- setuid_driver_entry.control = NULL;
- setuid_driver_entry.outputv = NULL;
-+ setuid_driver_entry.ready_async = NULL;
-+ setuid_driver_entry.flush = NULL;
-+ setuid_driver_entry.call = NULL;
-+ setuid_driver_entry.event = NULL;
-+ setuid_driver_entry.extended_marker = ERL_DRV_EXTENDED_MARKER;
-+ setuid_driver_entry.major_version = ERL_DRV_EXTENDED_MAJOR_VERSION;
-+ setuid_driver_entry.minor_version = ERL_DRV_EXTENDED_MINOR_VERSION;
-+ setuid_driver_entry.driver_flags = 0;
-+ setuid_driver_entry.handle2 = NULL;
-+ setuid_driver_entry.process_exit = NULL;
-+ setuid_driver_entry.stop_select = NULL;
- return (ErlDrvEntry*) &setuid_driver_entry;
- }
-
---- yaws-1.91.orig/c_src/yaws_sendfile_drv.c
-+++ yaws-1.91/c_src/yaws_sendfile_drv.c
-@@ -24,6 +24,15 @@
- #include "erl_driver_compat.h"
- #endif
-
-+/*
-+ * previously drv_output(..., int len)
-+ * since R15B drv_output(..., ErlDrvSizeT len)
-+ * use int if OTP < R15B
-+ */
-+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
-+typedef int ErlDrvSizeT;
-+#endif
-+
- #include "hashtable.h"
-
- #define lshift_index(s, i, shift, t) (((t)((unsigned char*)(s))[i]) << (shift))
-@@ -130,10 +139,10 @@
- }* result;
- } Buffer;
-
--static size_t set_error_buffer(Buffer* b, int socket_fd, int err)
-+static ErlDrvSizeT set_error_buffer(Buffer* b, int socket_fd, int err)
- {
- char* s, *t;
-- size_t result_size = sizeof *(b->result);
-+ ErlDrvSizeT result_size = sizeof *(b->result);
- memset(b->result, 0, result_size);
- put_int32(socket_fd, &(b->result->out_fd));
- s = erl_errno_id(err);
-@@ -185,7 +194,8 @@
- #endif
- }
-
--static void yaws_sendfile_drv_output(ErlDrvData handle, char* buf, int buflen)
-+static void yaws_sendfile_drv_output(ErlDrvData handle, char* buf,
-+ ErlDrvSizeT buflen)
- {
- int fd, socket_fd;
- Desc* d = (Desc*)handle;
-@@ -194,7 +204,7 @@
- socket_fd = get_int32(&(b.args->out_fd));
- fd = open(b.args->filename, O_RDONLY | O_NONBLOCK);
- if (fd < 0) {
-- int out_buflen = set_error_buffer(&b, socket_fd, errno);
-+ ErlDrvSizeT out_buflen = set_error_buffer(&b, socket_fd, errno);
- driver_output(d->port, buf, out_buflen);
- } else {
- Transfer* xfer;
-@@ -206,12 +216,14 @@
- driver stops, or if an insertion error occurs below. */
- xfer = (Transfer*)malloc(sizeof(Transfer));
- if (xfer == NULL) {
-- int out_buflen = set_error_buffer(&b, socket_fd, ENOMEM);
-+ ErlDrvSizeT out_buflen = set_error_buffer(&b, socket_fd,
-+ ENOMEM);
- driver_output(d->port, buf, out_buflen);
- return;
- }
- if (!hashtable_insert(d->xfer_table, sfd.hashkey, xfer)) {
-- int out_buflen = set_error_buffer(&b, socket_fd, ENOMEM);
-+ ErlDrvSizeT out_buflen = set_error_buffer(&b, socket_fd,
-+ ENOMEM);
- driver_output(d->port, buf, out_buflen);
- free(xfer);
- return;
-@@ -254,7 +266,7 @@
- }
- } else {
- int save_errno = errno;
-- int out_buflen;
-+ ErlDrvSizeT out_buflen;
- char buf[36];
- Buffer b;
- b.buffer = buf;
-@@ -292,6 +304,18 @@
- NULL,
- NULL,
- NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ ERL_DRV_EXTENDED_MARKER,
-+ ERL_DRV_EXTENDED_MAJOR_VERSION,
-+ ERL_DRV_EXTENDED_MINOR_VERSION,
-+ 0,
-+ NULL,
-+ NULL,
- NULL
- };
-
Deleted: yaws/trunk/debian/patches/mime.diff
===================================================================
--- yaws/trunk/debian/patches/mime.diff 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/patches/mime.diff 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,14 +0,0 @@
-Patch makes using system wide mime.types instead of possibly outdated
-mime.types, supplied by upstream.
-
---- yaws-1.91.orig/src/mime_type_c.erl
-+++ yaws-1.91/src/mime_type_c.erl
-@@ -21,7 +21,7 @@
-
-
- c() ->
-- {ok, F} = file:open("mime.types", [read]),
-+ {ok, F} = file:open("/etc/mime.types", [read]),
- io:format("Compiling mime.types ... > mime_types.erl ~n", []),
- {ok, B} = file:read_file("charset.def"),
- case string:tokens(binary_to_list(B)," \r\n\t" ++ [0, 12]) of
Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/patches/series 2011-12-24 13:25:55 UTC (rev 1392)
@@ -1,5 +1,4 @@
clean.diff
-mime.diff
install.diff
installapps.diff
gnu.diff
@@ -7,7 +6,5 @@
ctl.diff
docs.diff
m32m64.diff
-dirtraversal.diff
-driver.diff
mailr15.diff
wikir15.diff
Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules 2011-12-23 19:54:32 UTC (rev 1391)
+++ yaws/trunk/debian/rules 2011-12-24 13:25:55 UTC (rev 1392)
@@ -6,7 +6,7 @@
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
-VSN=1.91
+VSN=1.92
export HOME := $(CURDIR)/debian
More information about the Pkg-erlang-commits
mailing list