diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/librpcsecgss/Makefile | 5 | ||||
| -rw-r--r-- | package/librpcsecgss/patches/libtirpc.patch | 61 | ||||
| -rw-r--r-- | package/mpd/Makefile | 2 | ||||
| -rw-r--r-- | package/mpd/files/mpd.init | 4 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-utils_blkmapd_device-process_c | 11 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-utils_gssd_Makefile_in | 4 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-utils_mountd_fsloc_c | 6 |
7 files changed, 86 insertions, 7 deletions
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 6c32cb10c..cc0c8d3bd 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= librpcsecgss PKG_VERSION:= 0.19 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b45ed565bdc3099023aa35830ec92997 PKG_DESCR:= Secure RPC library for NFSv4 PKG_SECTION:= libs @@ -17,6 +17,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_LDFLAGS+= -ltirpc + post-install: $(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib $(CP) $(WRKINST)/usr/lib/librpcsecgss.so* $(IDIR_LIBRPCSECGSS)/usr/lib/ diff --git a/package/librpcsecgss/patches/libtirpc.patch b/package/librpcsecgss/patches/libtirpc.patch new file mode 100644 index 000000000..06e14286d --- /dev/null +++ b/package/librpcsecgss/patches/libtirpc.patch @@ -0,0 +1,61 @@ +--- librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h~ 2013-02-22 08:35:29.949005794 +0100 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h 2013-02-22 08:35:31.199005887 +0100 +@@ -71,13 +71,6 @@ + + __BEGIN_DECLS + +-/* Global variables, protected for multi-threaded applications. */ +-extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__)); +-#define svc_fdset (*__rpc_thread_svc_fdset ()) +- +-extern struct rpc_createerr *__rpc_thread_createerr (void) +- __attribute__ ((__const__)); +-#define get_rpc_createerr() (*__rpc_thread_createerr ()) + /* The people who "engineered" RPC should bee punished for naming the + data structure and the variable the same. We cannot always define the + macro 'rpc_createerr' because this would prevent people from defining +--- librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h~ 2013-02-22 08:35:34.064007047 +0100 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h 2013-02-22 08:35:35.309007979 +0100 +@@ -83,8 +83,6 @@ + #define rpc_createerr rpcsecgss_rpc_createerr + #define svc_auth_none rpcsecgss_svc_auth_none + #define svc_auth_none_ops rpcsecgss_svc_auth_none_ops +-#define __svc_fdset rpcsecgss___svc_fdset +-#define __svc_fdsetsize rpcsecgss___svc_fdsetsize + #define svc_maxfd rpcsecgss_svc_maxfd + + #endif /* _RPCSECGSS_RENAME_H_ */ +--- librpcsecgss-0.19/src/clnt_generic.c~ 2013-02-22 08:35:43.705020289 +0100 ++++ librpcsecgss-0.19/src/clnt_generic.c 2013-02-22 08:35:44.853022749 +0100 +@@ -47,8 +47,8 @@ static char *rcsid = "$OpenBSD: clnt_gen + CLIENT * + clnt_create(hostname, prog, vers, proto) + __const char *hostname; +- __const u_long prog; +- __const u_long vers; ++ __const rpcprog_t prog; ++ __const rpcvers_t vers; + __const char *proto; + { + struct hostent *h; +--- librpcsecgss-0.19/src/Makefile.am~ 2009-05-13 23:33:08.000000000 +0200 ++++ librpcsecgss-0.19/src/Makefile.am 2013-02-22 08:38:04.829048549 +0100 +@@ -1,7 +1,7 @@ + lib_LTLIBRARIES = librpcsecgss.la + librpcsecgss_la_CPPFLAGS = $(GSSGLUE_CFLAGS) + librpcsecgss_la_LDFLAGS = -version-info 3:0:0 +-librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) ++librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) -ltirpc + librpcsecgss_la_SOURCES = \ + auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \ + svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \ +--- librpcsecgss-0.19/src/rpc_commondata.c~ 2013-02-22 08:35:39.195012386 +0100 ++++ librpcsecgss-0.19/src/rpc_commondata.c 2013-02-22 08:35:40.523014417 +0100 +@@ -36,6 +36,4 @@ static char *rcsid = "$OpenBSD: rpc_comm + * by public interfaces + */ + struct opaque_auth _null_auth; +-fd_set svc_fdset; + int svc_maxfd = -1; +-struct rpc_createerr rpc_createerr; + diff --git a/package/mpd/Makefile b/package/mpd/Makefile index e1e4cad3c..0ac1d9d0b 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.17.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= ab408a61f49f215ce77ed0cf1deed6e1 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index 1e7cf871f..582aa3ebf 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -17,6 +17,10 @@ start) echo "mpd user must be in group audio." exit 1 fi + if [ ! -d /etc/mpd ];then + mkdir -p /etc/mpd/playlists + chown -R mpd:mpd /etc/mpd + fi if [ ! -d /var/run/mpd ];then mkdir -p /var/run/mpd chown mpd:mpd /var/run/mpd diff --git a/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c new file mode 100644 index 000000000..b6536e14e --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c @@ -0,0 +1,11 @@ +--- nfs-utils-1.2.5.orig/utils/blkmapd/device-process.c 2011-09-24 13:55:15.000000000 +0200 ++++ nfs-utils-1.2.5/utils/blkmapd/device-process.c 2013-07-11 11:02:58.000000000 +0200 +@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_ + off_t stripe_unit = vol->param.bv_stripe_unit; + /* Check limitations imposed by device-mapper */ + if ((stripe_unit & (stripe_unit - 1)) != 0 +- || stripe_unit < (off_t) (PAGE_SIZE >> 9)) ++ || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9)) + return -EIO; + BLK_READBUF(p, end, 4); + READ32(vol->bv_vol_n); diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in index 5b77024e6..1c98ccb16 100644 --- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in +++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in @@ -1,6 +1,6 @@ --- nfs-utils-1.2.5.orig/utils/gssd/Makefile.in 2011-09-24 14:13:16.000000000 +0200 -+++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2012-02-27 17:39:34.000000000 +0100 -@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a ++++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2013-07-11 11:01:30.000000000 +0200 +@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS) gssd_LDFLAGS = $(KRBLDFLAGS) diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c index e5569c82f..4ec4d3813 100644 --- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c +++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c @@ -1,6 +1,6 @@ ---- nfs-utils-1.2.1.orig/utils/mountd/fsloc.c 2009-11-04 12:13:56.000000000 +0100 -+++ nfs-utils-1.2.1/utils/mountd/fsloc.c 2009-12-25 19:26:25.000000000 +0100 -@@ -126,7 +126,7 @@ static struct servers *method_list(char +--- nfs-utils-1.2.5.orig/utils/mountd/fsloc.c 2011-09-24 13:55:15.000000000 +0200 ++++ nfs-utils-1.2.5/utils/mountd/fsloc.c 2013-07-11 11:01:30.000000000 +0200 +@@ -126,7 +126,7 @@ static struct servers *method_list(char struct servers *rv=NULL; xlog(L_NOTICE, "method_list(%s)\n", data); |