summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2011-06-02 15:27:09 +0200
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:59 +0000
commit4f1683623eb94557c348c9433a56a7641c5b9cbe (patch)
treef5da0a74e72f5075cfc27de28e65f2b2652b6aed
parenteb2d7e4cf8eebc85bb69b8a6fb646acc6192ccbb (diff)
Imported Debian patch 0.998-2debian/0.998-2
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rw-r--r--debian/patches/fix_tighten_default_umask.patch20
-rw-r--r--debian/patches/series1
4 files changed, 32 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4be7fe4..5e530f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xsane (0.998-2) unstable; urgency=low
+
+ * debian/control:
+ + Bump Standards-Version to 3.9.2 (no changes).
+
+ * debian/patches/fix_tighten_default_umask.patch:
+ + Added; tighten default umask, going to 0077 from 0007 (closes: #592972).
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 02 Jun 2011 15:27:09 +0200
+
xsane (0.998-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 83d8d45..48e404a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xsane
Section: graphics
Priority: optional
Maintainer: Julien BLACHE <jblache@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Build-Depends: debhelper (>= 5), libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, liblcms1-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
Package: xsane
diff --git a/debian/patches/fix_tighten_default_umask.patch b/debian/patches/fix_tighten_default_umask.patch
new file mode 100644
index 0000000..96e6342
--- /dev/null
+++ b/debian/patches/fix_tighten_default_umask.patch
@@ -0,0 +1,20 @@
+Description: Change default XSane umask from 0007 to 0077
+ A default umask of 0007 can be mildly insecure in a multiuser environment,
+ so tighten things up a bit and go with 0077 instead.
+Author: Adrien Thebo
+Bug-Debian: http://bugs.debian.org/592972
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/611950
+
+Index: xsane-0.998/src/xsane.h
+===================================================================
+--- xsane-0.998.orig/src/xsane.h 2011-02-04 19:50:32.653016002 +0100
++++ xsane-0.998/src/xsane.h 2011-06-02 15:26:56.869664052 +0200
+@@ -104,7 +104,7 @@
+ #define XSANE_DEBUG_ENVIRONMENT "XSANE_DEBUG"
+
+ #define XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT 0.025
+-#define XSANE_DEFAULT_UMASK 0007
++#define XSANE_DEFAULT_UMASK 0077
+ #define XSANE_HOLD_TIME 200
+ #define XSANE_CONTINUOUS_HOLD_TIME 10
+ #define XSANE_DEFAULT_DEVICE "SANE_DEFAULT_DEVICE"
diff --git a/debian/patches/series b/debian/patches/series
index 1bf2ac2..7842754 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ i18n_po_update_es_add_gl.patch
i18n_po_update_fr.patch
fix_preview_mouse_events.patch
fix_spin_button_pagesize.patch
+fix_tighten_default_umask.patch