diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-03-04 20:29:52 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-03-04 20:29:52 +0000 |
| commit | 0a2190d1d5572ba5ef20b2fa0d77c7d26da9f11d (patch) | |
| tree | a04eae6b708c480cee77930bef2892c370480e5a /uts | |
| parent | 72de5b7d4d43b9b6164b0d8b09addb880456be5d (diff) | |
| download | illumos-packaging-0a2190d1d5572ba5ef20b2fa0d77c7d26da9f11d.tar.gz | |
* Define MIN() and MAX() in sys/param.h
* Define UID_NOBODY = 65534 in sys/param.h (Debian)
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/changelog | 2 | ||||
| -rw-r--r-- | uts/debian/patches/add-MIN-MAX.patch | 14 | ||||
| -rw-r--r-- | uts/debian/patches/dyson-nobody-uid-is-65534.patch | 13 | ||||
| -rw-r--r-- | uts/debian/patches/series | 2 |
4 files changed, 31 insertions, 0 deletions
diff --git a/uts/debian/changelog b/uts/debian/changelog index 5d44a28..24a011b 100644 --- a/uts/debian/changelog +++ b/uts/debian/changelog @@ -5,6 +5,8 @@ uts (2.10-2) UNRELEASED; urgency=low * Define #define LOG_AUTHPRIV (10<<3) in sys/syslog.h * Add macros and prototype for flock() to sys/file.h * Typedef loff_t in sys/types.h + * Define MIN() and MAX() in sys/param.h + * Define UID_NOBODY = 65534 in sys/param.h (Debian) -- Igor Pashev <pashev.igor@gmail.com> Mon, 04 Mar 2013 18:11:05 +0000 diff --git a/uts/debian/patches/add-MIN-MAX.patch b/uts/debian/patches/add-MIN-MAX.patch new file mode 100644 index 0000000..91ad376 --- /dev/null +++ b/uts/debian/patches/add-MIN-MAX.patch @@ -0,0 +1,14 @@ +Index: uts/usr/src/uts/common/sys/param.h +=================================================================== +--- uts.orig/usr/src/uts/common/sys/param.h 2012-10-08 00:26:00.000000000 +0000 ++++ uts/usr/src/uts/common/sys/param.h 2013-03-04 20:15:01.953857582 +0000 +@@ -195,6 +195,9 @@ + #define MAXSYMLINKS 20 + #define MAXNAMELEN 256 + ++#define MIN(a,b) (((a)<(b))?(a):(b)) ++#define MAX(a,b) (((a)>(b))?(a):(b)) ++ + /* + * MAXLINKNAMELEN defines the longest possible permitted datalink name, + * including the terminating NUL. Note that this must not be larger diff --git a/uts/debian/patches/dyson-nobody-uid-is-65534.patch b/uts/debian/patches/dyson-nobody-uid-is-65534.patch new file mode 100644 index 0000000..817cfce --- /dev/null +++ b/uts/debian/patches/dyson-nobody-uid-is-65534.patch @@ -0,0 +1,13 @@ +Index: uts/usr/src/uts/common/sys/param.h +=================================================================== +--- uts.orig/usr/src/uts/common/sys/param.h 2013-03-04 20:15:01.953857582 +0000 ++++ uts/usr/src/uts/common/sys/param.h 2013-03-04 20:27:57.764468719 +0000 +@@ -76,7 +76,7 @@ + #define MAX_CANON 256 /* Maximum bytes for canonical processing */ + #endif + +-#define UID_NOBODY 60001 /* user ID no body */ ++#define UID_NOBODY 65534 /* user ID no body */ + #define GID_NOBODY UID_NOBODY + #define UID_UNKNOWN 96 + #define GID_UNKNOWN UID_UNKNOWN diff --git a/uts/debian/patches/series b/uts/debian/patches/series index ec7fa56..027791c 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -60,3 +60,5 @@ dyson-split-system-AVL-headers.patch sys_syslog.h-LOG_AUTHPRIV.patch flock.patch add-loff_t.patch +add-MIN-MAX.patch +dyson-nobody-uid-is-65534.patch |