osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

illumos-nfs (4.3) unstable; urgency=medium 

* New upstream snapshot fixing:
    4576 mountd(1m) needs to be able to set listen backlog
    4484 lockd: SMF property reading and cli options are incorrect
    4552 mountd(1m): Remove limit of FDs in RPC server
    4551 mountd: Busy do_logging_queue() eats memory
    4533 mountd(1m) leaks nd_hostservlist in do_logging_queue()
    4226 mountd(1m) could run out of file descriptors
    3485 statd is not handling incoming SM_NOTIFY properly when the hostname is not resolvable
  * Removed nfs-lib-smfcfg.c.patch (applied upstream)
  * Removed illumos-195-lockd.patch (applied upstream)
  * Updated nfs_tbind.c-integer-overflow.patch
  * Updated nfs-do-not-install-fstypes.patch
  * Refreshed nfs-statd-sm_proc.c.patch
  * Refreshed nfs-statd-sm_statd.c.patch
  * Refreshed nfs-umount-compile-fslib.o.patch
  * Refreshed nfs-mount-no-etc.patch
  * Build depends on dtrace-dev and libshare-dev
  * Added nfsref-missing-UUID_PRINTABLE_STRING_LENGTH.patch
This commit is contained in:
Igor Pashev 2014-05-03 21:48:44 +04:00
parent 068d1ebeb9
commit 3191236802
12 changed files with 76 additions and 1598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
illumos-nfs/debian/changelog
View File

@ -1,3 +1,26 @@
illumos-nfs (4.3) unstable; urgency=medium
* New upstream snapshot fixing:
4576 mountd(1m) needs to be able to set listen backlog
4484 lockd: SMF property reading and cli options are incorrect
4552 mountd(1m): Remove limit of FDs in RPC server
4551 mountd: Busy do_logging_queue() eats memory
4533 mountd(1m) leaks nd_hostservlist in do_logging_queue()
4226 mountd(1m) could run out of file descriptors
3485 statd is not handling incoming SM_NOTIFY properly when the hostname is not resolvable
* Removed nfs-lib-smfcfg.c.patch (applied upstream)
* Removed illumos-195-lockd.patch (applied upstream)
* Updated nfs_tbind.c-integer-overflow.patch
* Updated nfs-do-not-install-fstypes.patch
* Refreshed nfs-statd-sm_proc.c.patch
* Refreshed nfs-statd-sm_statd.c.patch
* Refreshed nfs-umount-compile-fslib.o.patch
* Refreshed nfs-mount-no-etc.patch
* Build depends on dtrace-dev and libshare-dev
* Added nfsref-missing-UUID_PRINTABLE_STRING_LENGTH.patch
-- Igor Pashev <pashev.igor@gmail.com> Sat, 03 May 2014 21:30:01 +0400
illumos-nfs (2.10+2) unstable; urgency=low
* Added man pages to illumos-nfs-common

23
illumos-nfs/debian/control
View File

@ -1,12 +1,12 @@
Source: illumos-nfs
Section: admin
Priority: standard
Section: net
Priority: optional
Maintainer: Igor Pashev <pashev.igor@gmail.com>
Build-Depends:
illumos-source-2.10,
dh-illumos,
dh-smf,
dtrace,
dtrace-dev,
illumos-source-4.3,
libbsm-dev,
libdtrace-dev,
libidmap-dev,
@ -16,24 +16,22 @@ Build-Depends:
libnvpair-dev,
libreparse-dev,
libscf-dev,
libshare-dev,
libtsnet-dev,
libtsol-dev,
libumem-dev,
quilt,
symlinks,
Standards-Version: 3.9.3
Standards-Version: 3.9.5
Homepage: https://www.illumos.org
Package: libreparse-nfs-basic1
Section: net
Priority: optional
Multi-Arch: same
Architecture: illumos-any
Depends: ${shlibs:Depends}, ${misc:Depends},
Description: NFS Basic plugin for libreparse
Package: nfsref
Section: net
Architecture: illumos-any
Recommends: illumos-reparsed
Depends: ${shlibs:Depends}, ${misc:Depends},
@ -44,22 +42,20 @@ Description: NFS referral utility
systems. Referrals are based on reparse points
Package: illumos-nfs-common
Section: net
Architecture: illumos-any
Provides: nfs-common, nfs-client
Replaces: sharemgr (<< 2.10+2)
Depends: ${shlibs:Depends}, ${misc:Depends}, illumos-kernel (>= 2.10+7),
Depends: ${shlibs:Depends}, ${misc:Depends}, illumos-kernel (>= 4.3),
netbase (>= 5.0+dyson2)
Description: NFS support files common to client and server
Package: illumos-nfs-server
Section: net
Architecture: illumos-any
Provides: nfs-server
Suggests: illumos-nfslogd
Depends: ${shlibs:Depends}, ${misc:Depends},
sharemgr, libshare-nfs1, illumos-rpcbind | rpcbind,
illumos-nfs-common
illumos-nfs-common (>= 4.3)
Description: support for NFS kernel server
This package contains the user-space support needed to use the
NFS kernel server. Most administrators wishing to set up an NFS server
@ -68,10 +64,9 @@ Description: support for NFS kernel server
This packages include nfsd, mountd and lockd daemons and their SMF services.
Package: illumos-nfslogd
Section: net
Architecture: illumos-any
Provides: nfslogd
Depends: ${shlibs:Depends}, ${misc:Depends}, illumos-nfs-server
Depends: ${shlibs:Depends}, ${misc:Depends}, illumos-nfs-server (>= 4.3)
Description: nfs logging daemon
The nfslogd daemon provides operational logging to the Illumos NFS server. It
is the nfslogd daemon's job to generate the activity log by analyzing the

1525
illumos-nfs/debian/patches/illumos-195-lockd.patch
View File

File diff suppressed because it is too large Load Diff

10
illumos-nfs/debian/patches/nfs-do-not-install-fstypes.patch
View File

@ -1,13 +1,13 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/Makefile
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/Makefile 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/Makefile 2013-09-28 00:18:33.590208659 +0400
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/Makefile 2014-03-01 16:17:54.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/Makefile 2014-05-03 20:54:29.955675865 +0400
@@ -33,7 +33,7 @@
SUBDIR1= exportfs nfsd rquotad \
statd nfsstat mountd dfshares \
- nfsfind nfs4cbd share
+ nfsfind nfs4cbd
SUBDIR2= clear_locks umount showmount \
mount dfmounts nfslog nfsmapid \
nfsref rp_basic
# These do "make catalog"
SUBDIR2= clear_locks lockd umount showmount \

29
illumos-nfs/debian/patches/nfs-lib-smfcfg.c.patch
View File

@ -1,29 +0,0 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/lib/smfcfg.c
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/lib/smfcfg.c 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/lib/smfcfg.c 2013-09-27 17:09:54.810230218 +0400
@@ -104,12 +104,12 @@
fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf,
char *instance, scf_type_t sctype, char *fmri)
{
- fs_smfhandle_t *phandle;
+ fs_smfhandle_t *phandle = NULL;
scf_handle_t *handle;
scf_propertygroup_t *pg;
scf_property_t *prop;
- scf_transaction_t *tran;
- scf_transaction_entry_t *entry;
+ scf_transaction_t *tran = NULL;
+ scf_transaction_entry_t *entry = NULL;
scf_instance_t *inst;
scf_value_t *val;
int valint;
@@ -238,7 +238,7 @@
fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf,
char *instance, scf_type_t sctype, char *fmri, int *bufsz)
{
- fs_smfhandle_t *phandle;
+ fs_smfhandle_t *phandle = NULL;
scf_handle_t *handle;
scf_propertygroup_t *pg;
scf_property_t *prop;

6
illumos-nfs/debian/patches/nfs-mount-no-etc.patch
View File

@ -1,7 +1,7 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/mount/Makefile
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/mount/Makefile 2013-09-28 14:11:43.754055966 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/mount/Makefile 2013-09-28 14:19:25.318596229 +0400
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/mount/Makefile 2014-05-03 20:55:51.616988612 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/mount/Makefile 2014-05-03 20:56:06.125446638 +0400
@@ -24,13 +24,6 @@
FSTYPE= nfs
@ -24,4 +24,4 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/mount/Makefile
-
lint: webnfs.h webnfs_xdr.c webnfs_client.c lint_SRCS
clean:
clean:

12
illumos-nfs/debian/patches/nfs-statd-sm_proc.c.patch
View File

@ -1,8 +1,8 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/statd/sm_proc.c 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c 2013-09-27 17:51:30.834803315 +0400
@@ -451,8 +451,8 @@
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/statd/sm_proc.c 2014-03-01 16:17:54.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c 2014-05-03 20:53:05.415988404 +0400
@@ -445,8 +445,8 @@
}
if (debug)
@ -13,7 +13,7 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c
/*
* Record the name, and all addresses which have been registered
@@ -616,8 +616,8 @@
@@ -610,8 +610,8 @@
my_idp->my_proc == nl_idp->my_proc) {
/* found */
if (debug)
@ -24,7 +24,7 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c
mon_name : "<NULL>");
/*
* Remove the monitor name from the
@@ -871,8 +871,8 @@
@@ -878,8 +878,8 @@
}
(void) printf("*****monitor_q:\n ");
while (nl != (mon_entry *)NULL) {
@ -35,7 +35,7 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_proc.c
nl = nl->nxt;
}
mutex_unlock(&mon_table[hash].lock);
@@ -887,8 +887,8 @@
@@ -894,8 +894,8 @@
} else {
(void) printf("*****monitor_q:\n ");
while (nl != (mon_entry *)NULL) {

8
illumos-nfs/debian/patches/nfs-statd-sm_statd.c.patch
View File

@ -1,8 +1,8 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_statd.c
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/statd/sm_statd.c 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_statd.c 2013-09-27 17:54:09.235269143 +0400
@@ -1535,7 +1535,7 @@
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/statd/sm_statd.c 2014-05-03 20:53:22.273114174 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_statd.c 2014-05-03 20:53:30.269048823 +0400
@@ -1537,7 +1537,7 @@
mutex_lock(&record_table[hash].lock);
nl = record_table[hash].sm_rechdp;
while (nl != (name_entry *)NULL) {
@ -11,7 +11,7 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/statd/sm_statd.c
nl = nl->nxt;
}
mutex_unlock(&record_table[hash].lock);
@@ -1544,7 +1544,7 @@
@@ -1546,7 +1546,7 @@
mutex_lock(&recov_q.lock);
nl = recov_q.sm_recovhdp;
while (nl != (name_entry *)NULL) {

8
illumos-nfs/debian/patches/nfs-umount-compile-fslib.o.patch
View File

@ -1,8 +1,8 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/umount/Makefile
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/umount/Makefile 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/umount/Makefile 2013-09-28 00:21:53.964605415 +0400
@@ -32,7 +32,7 @@
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/umount/Makefile 2014-03-01 16:17:54.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/umount/Makefile 2014-05-03 20:55:30.392399082 +0400
@@ -30,7 +30,7 @@
include ../../Makefile.fstype
@ -11,7 +11,7 @@ Index: illumos-nfs/usr/src/cmd/fs.d/nfs/umount/Makefile
OBJS= $(LIBPROG).o $(COMMON)
SRCS= $(LIBPROG).c $(FSLIBSRC) ../lib/replica.c
@@ -58,6 +58,8 @@
@@ -56,6 +56,8 @@
sed "/^domain/d" messages.po > $@
$(RM) messages.po $(POFILE).i

12
illumos-nfs/debian/patches/nfs_tbind.c-integer-overflow.patch
View File

@ -1,13 +1,13 @@
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c 2012-10-08 04:25:23.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c 2013-09-27 17:02:45.729764495 +0400
@@ -1743,7 +1743,7 @@
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c 2014-03-01 16:17:54.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c 2014-05-03 20:51:21.897709868 +0400
@@ -1742,7 +1742,7 @@
*/
/* LINTED pointer alignment */
((struct sockaddr_in *)mask->buf)->sin_addr.s_addr =
- (ulong_t)~0;
+ (uint32_t)~0;
- (ulong_t)~0;
+ (uint32_t)~0;
/* LINTED pointer alignment */
((struct sockaddr_in *)mask->buf)->sin_family =
(ushort_t)~0;
(ushort_t)~0;

15
illumos-nfs/debian/patches/nfsref-missing-UUID_PRINTABLE_STRING_LENGTH.patch Normal file
View File

@ -0,0 +1,15 @@
Description: UUID_PRINTABLE_STRING_LENGTH is illumos specific
and defined in sys/uuid.h. We don't need any uuid functions.
Index: illumos-nfs/usr/src/cmd/fs.d/nfs/nfsref/nfsref.c
===================================================================
--- illumos-nfs.orig/usr/src/cmd/fs.d/nfs/nfsref/nfsref.c 2014-03-01 16:17:54.000000000 +0400
+++ illumos-nfs/usr/src/cmd/fs.d/nfs/nfsref/nfsref.c 2014-05-03 21:17:30.025921957 +0400
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <sys/fs_reparse.h>
#include <rp_plugin.h>
-#include <uuid/uuid.h>
+#include <sys/uuid.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>

3
illumos-nfs/debian/patches/series
View File

@ -1,7 +1,6 @@
nfsd.c.patch
nfs_tbind.c-integer-overflow.patch
nfs-lib-thrpool.c.patch
nfs-lib-smfcfg.c.patch
Makefile.fstype-install.patch
nfs-use-system-rquota.x.patch
nfs-statd-sm_proc.c.patch
@ -22,4 +21,4 @@ nfsref-ref_subr.c.patch
nfs-reparse-plugin.patch
nfs-mount-no-etc.patch
nfs-server-ipfilter-is-optional.patch
illumos-195-lockd.patch
nfsref-missing-UUID_PRINTABLE_STRING_LENGTH.patch