rpms/acoustid-fingerprinter/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/acoustid-fingerprinter/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsh27931/rpms/acoustid-fingerprinter/devel
Log Message:
Directory /cvs/free/rpms/acoustid-fingerprinter/devel added to the repository
12 years, 9 months
rpms/acoustid-fingerprinter - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/acoustid-fingerprinter
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsh27931/rpms/acoustid-fingerprinter
Log Message:
Directory /cvs/free/rpms/acoustid-fingerprinter added to the repository
12 years, 9 months
rpms/chromaprint-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/chromaprint-tools/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsg27005/rpms/chromaprint-tools/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module chromaprint-tools
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: chromaprint-tools
# $Id: Makefile,v 1.1 2012/01/18 20:32:19 kwizart Exp $
NAME := chromaprint-tools
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 9 months
rpms/chromaprint-tools Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/chromaprint-tools
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsg27005/rpms/chromaprint-tools
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module chromaprint-tools
--- NEW FILE Makefile ---
# Top level Makefile for module chromaprint-tools
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
12 years, 9 months
rpms/chromaprint-tools/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/chromaprint-tools/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsg27005/rpms/chromaprint-tools/devel
Log Message:
Directory /cvs/free/rpms/chromaprint-tools/devel added to the repository
12 years, 9 months
rpms/chromaprint-tools - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/chromaprint-tools
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsg27005/rpms/chromaprint-tools
Log Message:
Directory /cvs/free/rpms/chromaprint-tools added to the repository
12 years, 9 months
rpms/openafs/F-15 openafs-1.6.0-setserverprefs.patch, NONE, 1.1 openafs-1.6.0-xstat-cm-test.patch, NONE, 1.1 openafs.init, 1.2, 1.3 openafs.spec, 1.17, 1.18
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28100
Modified Files:
openafs.init openafs.spec
Added Files:
openafs-1.6.0-setserverprefs.patch
openafs-1.6.0-xstat-cm-test.patch
Log Message:
* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
- Log an error if we couldn't load the kernel module (RF BZ #2006)
- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
openafs-1.6.0-setserverprefs.patch:
afs_pioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.0-setserverprefs.patch ---
commit 552d59186b135af55eeaa6136a9cbb8965dd2f04
Author: Jeffrey Altman <jaltman(a)your-file-system.com>
Date: Mon Sep 19 10:35:11 2011 -0400
Fix input size computation in SetSPrefs pioctl
Patchset 718f85a8b69a78ac77beb5c8471af20657be2a53 contained
a small typo that prevents the SetSPrefs pioctl processing from
functioning in all cases. fs setserverprefs continues to work
for non-DB preference lists because fs.c pokeServers() attempts
to try the old SetSPrefs33 pioctl in the non-DB server case.
Change-Id: I2e06dccb51c53ba312418fb5f51be3d621a2004c
Reviewed-on: http://gerrit.openafs.org/5465
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 2d46ac2..cf432d6 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -4022,7 +4022,7 @@ DECL_PIOCTL(PSetSPrefs)
ssp = (struct setspref *)ainPtr;
if (ainSize < (sizeof(struct setspref)
- + sizeof(struct spref) * ssp->num_servers-1))
+ + sizeof(struct spref) * (ssp->num_servers-1)))
return EINVAL;
afs_setsprefs(&(ssp->servers[0]), ssp->num_servers,
openafs-1.6.0-xstat-cm-test.patch:
afs_osi.h | 6 ++++++
afs_stats.h | 21 ++++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE openafs-1.6.0-xstat-cm-test.patch ---
commit 130144850c6d05bc69e06257a5d7219eb98697d8
Author: Michael Meffie <mmeffie(a)sinenomine.net>
Date: Fri Aug 12 14:29:48 2011 -0400
xstat: cm xstat time values are 32 bit
The kernel space cm xstat time structures are implemented as 32
bit values in memory and on the wire. Define the client side
xstat userspace structures as 32 bit time values as well to avoid
size mismatches on systems with native 64 bit time values.
Change-Id: I857ea48bf8e12ec006ef24affb2e65a105ce27bb
Reviewed-on: http://gerrit.openafs.org/5237
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman(a)openafs.org>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 3205a7b..6dd7e61 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -179,10 +179,16 @@ typedef struct {
afs_int32 tv_sec;
afs_int32 tv_usec;
} osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#elif defined(AFS_SUN5_ENV)
typedef struct timeval32 osi_timeval_t;
+typedef struct timeval32 osi_timeval32_t;
#else
typedef struct timeval osi_timeval_t;
+typedef struct timeval osi_timeval32_t;
#endif /* AFS_SGI61_ENV */
#ifndef UKERNEL
diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index 661e283..60f2e93 100644
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -43,7 +43,10 @@
#define AFS_STATS(arg) arg
#ifndef KERNEL
/* NOTE: Ensure this is the same size in user and kernel mode. */
-typedef struct timeval osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#endif /* !KERNEL */
#define XSTATS_DECLS struct afs_stats_opTimingData *opP = NULL; \
@@ -888,10 +891,10 @@ struct afs_stats_CMPerf {
struct afs_stats_opTimingData {
afs_int32 numOps; /*Number of operations executed */
afs_int32 numSuccesses; /*Number of successful ops */
- osi_timeval_t sumTime; /*Sum of sample timings */
- osi_timeval_t sqrTime; /*Sum of squares of sample timings */
- osi_timeval_t minTime; /*Minimum timing value observed */
- osi_timeval_t maxTime; /*Minimum timing value observed */
+ osi_timeval32_t sumTime; /*Sum of sample timings */
+ osi_timeval32_t sqrTime; /*Sum of squares of sample timings */
+ osi_timeval32_t minTime; /*Minimum timing value observed */
+ osi_timeval32_t maxTime; /*Minimum timing value observed */
};
/*
@@ -914,10 +917,10 @@ struct afs_stats_opTimingData {
struct afs_stats_xferData {
afs_int32 numXfers; /*Number of successful xfers */
afs_int32 numSuccesses; /*Number of successful xfers */
- osi_timeval_t sumTime; /*Sum of timing values */
- osi_timeval_t sqrTime; /*Sum of squares of timing values */
- osi_timeval_t minTime; /*Minimum xfer time recorded */
- osi_timeval_t maxTime; /*Maximum xfer time recorded */
+ osi_timeval32_t sumTime; /*Sum of timing values */
+ osi_timeval32_t sqrTime; /*Sum of squares of timing values */
+ osi_timeval32_t minTime; /*Minimum xfer time recorded */
+ osi_timeval32_t maxTime; /*Maximum xfer time recorded */
afs_int32 sumBytes; /*Sum of KBytes transferred */
afs_int32 minBytes; /*Minimum value observed */
afs_int32 maxBytes; /*Maximum value observed */
Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/openafs.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.init 30 Jun 2010 18:31:08 -0000 1.2
+++ openafs.init 16 Jan 2012 22:13:49 -0000 1.3
@@ -79,7 +79,10 @@
action $"Loading AFS kernel module: " /sbin/modprobe openafs
RETVAL=$?
- [ $RETVAL -eq 0 ] || return $RETVAL
+ if [ $RETVAL -ne 0 ] ; then
+ logger -p daemon.error "OpenAFS Kernel Module didn't load in the init script. Do you have it installed?"
+ return $RETVAL
+ fi
touch /var/lock/subsys/openafs
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/openafs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openafs.spec 6 Jan 2012 23:50:41 -0000 1.17
+++ openafs.spec 16 Jan 2012 22:13:49 -0000 1.18
@@ -15,7 +15,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 0.%{pre}%{?dist}
+Release: 0.%{pre}.1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -32,6 +32,10 @@
Patch0: openafs-1.6.0-fPIC.patch
+# Already merged in master, awaiting 1.6.
+Patch1: openafs-1.6.0-setserverprefs.patch
+Patch2: openafs-1.6.0-xstat-cm-test.patch
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
allowing cross-platform sharing of files among multiple computers.
@@ -97,6 +101,8 @@
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
+# These patches are already merged in master.
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -321,6 +327,11 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
+- Log an error if we couldn't load the kernel module (RF BZ #2006)
+- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
+- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
+
* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
12 years, 9 months
rpms/openafs/F-16 openafs-1.6.0-setserverprefs.patch, NONE, 1.1 openafs-1.6.0-xstat-cm-test.patch, NONE, 1.1 openafs.init, 1.2, 1.3 openafs.spec, 1.11, 1.12
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27417
Modified Files:
openafs.init openafs.spec
Added Files:
openafs-1.6.0-setserverprefs.patch
openafs-1.6.0-xstat-cm-test.patch
Log Message:
* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
- Log an error if we couldn't load the kernel module (RF BZ #2006)
- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
openafs-1.6.0-setserverprefs.patch:
afs_pioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.0-setserverprefs.patch ---
commit 552d59186b135af55eeaa6136a9cbb8965dd2f04
Author: Jeffrey Altman <jaltman(a)your-file-system.com>
Date: Mon Sep 19 10:35:11 2011 -0400
Fix input size computation in SetSPrefs pioctl
Patchset 718f85a8b69a78ac77beb5c8471af20657be2a53 contained
a small typo that prevents the SetSPrefs pioctl processing from
functioning in all cases. fs setserverprefs continues to work
for non-DB preference lists because fs.c pokeServers() attempts
to try the old SetSPrefs33 pioctl in the non-DB server case.
Change-Id: I2e06dccb51c53ba312418fb5f51be3d621a2004c
Reviewed-on: http://gerrit.openafs.org/5465
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 2d46ac2..cf432d6 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -4022,7 +4022,7 @@ DECL_PIOCTL(PSetSPrefs)
ssp = (struct setspref *)ainPtr;
if (ainSize < (sizeof(struct setspref)
- + sizeof(struct spref) * ssp->num_servers-1))
+ + sizeof(struct spref) * (ssp->num_servers-1)))
return EINVAL;
afs_setsprefs(&(ssp->servers[0]), ssp->num_servers,
openafs-1.6.0-xstat-cm-test.patch:
afs_osi.h | 6 ++++++
afs_stats.h | 21 ++++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE openafs-1.6.0-xstat-cm-test.patch ---
commit 130144850c6d05bc69e06257a5d7219eb98697d8
Author: Michael Meffie <mmeffie(a)sinenomine.net>
Date: Fri Aug 12 14:29:48 2011 -0400
xstat: cm xstat time values are 32 bit
The kernel space cm xstat time structures are implemented as 32
bit values in memory and on the wire. Define the client side
xstat userspace structures as 32 bit time values as well to avoid
size mismatches on systems with native 64 bit time values.
Change-Id: I857ea48bf8e12ec006ef24affb2e65a105ce27bb
Reviewed-on: http://gerrit.openafs.org/5237
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman(a)openafs.org>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 3205a7b..6dd7e61 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -179,10 +179,16 @@ typedef struct {
afs_int32 tv_sec;
afs_int32 tv_usec;
} osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#elif defined(AFS_SUN5_ENV)
typedef struct timeval32 osi_timeval_t;
+typedef struct timeval32 osi_timeval32_t;
#else
typedef struct timeval osi_timeval_t;
+typedef struct timeval osi_timeval32_t;
#endif /* AFS_SGI61_ENV */
#ifndef UKERNEL
diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index 661e283..60f2e93 100644
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -43,7 +43,10 @@
#define AFS_STATS(arg) arg
#ifndef KERNEL
/* NOTE: Ensure this is the same size in user and kernel mode. */
-typedef struct timeval osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#endif /* !KERNEL */
#define XSTATS_DECLS struct afs_stats_opTimingData *opP = NULL; \
@@ -888,10 +891,10 @@ struct afs_stats_CMPerf {
struct afs_stats_opTimingData {
afs_int32 numOps; /*Number of operations executed */
afs_int32 numSuccesses; /*Number of successful ops */
- osi_timeval_t sumTime; /*Sum of sample timings */
- osi_timeval_t sqrTime; /*Sum of squares of sample timings */
- osi_timeval_t minTime; /*Minimum timing value observed */
- osi_timeval_t maxTime; /*Minimum timing value observed */
+ osi_timeval32_t sumTime; /*Sum of sample timings */
+ osi_timeval32_t sqrTime; /*Sum of squares of sample timings */
+ osi_timeval32_t minTime; /*Minimum timing value observed */
+ osi_timeval32_t maxTime; /*Minimum timing value observed */
};
/*
@@ -914,10 +917,10 @@ struct afs_stats_opTimingData {
struct afs_stats_xferData {
afs_int32 numXfers; /*Number of successful xfers */
afs_int32 numSuccesses; /*Number of successful xfers */
- osi_timeval_t sumTime; /*Sum of timing values */
- osi_timeval_t sqrTime; /*Sum of squares of timing values */
- osi_timeval_t minTime; /*Minimum xfer time recorded */
- osi_timeval_t maxTime; /*Maximum xfer time recorded */
+ osi_timeval32_t sumTime; /*Sum of timing values */
+ osi_timeval32_t sqrTime; /*Sum of squares of timing values */
+ osi_timeval32_t minTime; /*Minimum xfer time recorded */
+ osi_timeval32_t maxTime; /*Maximum xfer time recorded */
afs_int32 sumBytes; /*Sum of KBytes transferred */
afs_int32 minBytes; /*Minimum value observed */
afs_int32 maxBytes; /*Maximum value observed */
Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/F-16/openafs.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.init 30 Jun 2010 18:31:08 -0000 1.2
+++ openafs.init 16 Jan 2012 22:10:34 -0000 1.3
@@ -79,7 +79,10 @@
action $"Loading AFS kernel module: " /sbin/modprobe openafs
RETVAL=$?
- [ $RETVAL -eq 0 ] || return $RETVAL
+ if [ $RETVAL -ne 0 ] ; then
+ logger -p daemon.error "OpenAFS Kernel Module didn't load in the init script. Do you have it installed?"
+ return $RETVAL
+ fi
touch /var/lock/subsys/openafs
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-16/openafs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openafs.spec 6 Jan 2012 23:26:54 -0000 1.11
+++ openafs.spec 16 Jan 2012 22:10:34 -0000 1.12
@@ -15,7 +15,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 0.%{pre}%{?dist}
+Release: 0.%{pre}.1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -32,6 +32,10 @@
Patch0: openafs-1.6.0-fPIC.patch
+# Already merged in master, awaiting 1.6.
+Patch1: openafs-1.6.0-setserverprefs.patch
+Patch2: openafs-1.6.0-xstat-cm-test.patch
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
allowing cross-platform sharing of files among multiple computers.
@@ -97,6 +101,8 @@
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
+# These patches are already merged in master.
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -321,6 +327,11 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
+- Log an error if we couldn't load the kernel module (RF BZ #2006)
+- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
+- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
+
* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
12 years, 9 months
rpms/openafs/devel openafs-1.6.0-setserverprefs.patch, NONE, 1.1 openafs-1.6.0-xstat-cm-test.patch, NONE, 1.1 openafs.init, 1.2, 1.3 openafs.spec, 1.14, 1.15
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26537
Modified Files:
openafs.init openafs.spec
Added Files:
openafs-1.6.0-setserverprefs.patch
openafs-1.6.0-xstat-cm-test.patch
Log Message:
* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
- Log an error if we couldn't load the kernel module (RF BZ #2006)
- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
openafs-1.6.0-setserverprefs.patch:
afs_pioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.0-setserverprefs.patch ---
commit 552d59186b135af55eeaa6136a9cbb8965dd2f04
Author: Jeffrey Altman <jaltman(a)your-file-system.com>
Date: Mon Sep 19 10:35:11 2011 -0400
Fix input size computation in SetSPrefs pioctl
Patchset 718f85a8b69a78ac77beb5c8471af20657be2a53 contained
a small typo that prevents the SetSPrefs pioctl processing from
functioning in all cases. fs setserverprefs continues to work
for non-DB preference lists because fs.c pokeServers() attempts
to try the old SetSPrefs33 pioctl in the non-DB server case.
Change-Id: I2e06dccb51c53ba312418fb5f51be3d621a2004c
Reviewed-on: http://gerrit.openafs.org/5465
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 2d46ac2..cf432d6 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -4022,7 +4022,7 @@ DECL_PIOCTL(PSetSPrefs)
ssp = (struct setspref *)ainPtr;
if (ainSize < (sizeof(struct setspref)
- + sizeof(struct spref) * ssp->num_servers-1))
+ + sizeof(struct spref) * (ssp->num_servers-1)))
return EINVAL;
afs_setsprefs(&(ssp->servers[0]), ssp->num_servers,
openafs-1.6.0-xstat-cm-test.patch:
afs_osi.h | 6 ++++++
afs_stats.h | 21 ++++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE openafs-1.6.0-xstat-cm-test.patch ---
commit 130144850c6d05bc69e06257a5d7219eb98697d8
Author: Michael Meffie <mmeffie(a)sinenomine.net>
Date: Fri Aug 12 14:29:48 2011 -0400
xstat: cm xstat time values are 32 bit
The kernel space cm xstat time structures are implemented as 32
bit values in memory and on the wire. Define the client side
xstat userspace structures as 32 bit time values as well to avoid
size mismatches on systems with native 64 bit time values.
Change-Id: I857ea48bf8e12ec006ef24affb2e65a105ce27bb
Reviewed-on: http://gerrit.openafs.org/5237
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman(a)openafs.org>
Reviewed-by: Derrick Brashear <shadow(a)dementix.org>
diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 3205a7b..6dd7e61 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -179,10 +179,16 @@ typedef struct {
afs_int32 tv_sec;
afs_int32 tv_usec;
} osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#elif defined(AFS_SUN5_ENV)
typedef struct timeval32 osi_timeval_t;
+typedef struct timeval32 osi_timeval32_t;
#else
typedef struct timeval osi_timeval_t;
+typedef struct timeval osi_timeval32_t;
#endif /* AFS_SGI61_ENV */
#ifndef UKERNEL
diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index 661e283..60f2e93 100644
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -43,7 +43,10 @@
#define AFS_STATS(arg) arg
#ifndef KERNEL
/* NOTE: Ensure this is the same size in user and kernel mode. */
-typedef struct timeval osi_timeval_t;
+typedef struct {
+ afs_int32 tv_sec;
+ afs_int32 tv_usec;
+} osi_timeval32_t;
#endif /* !KERNEL */
#define XSTATS_DECLS struct afs_stats_opTimingData *opP = NULL; \
@@ -888,10 +891,10 @@ struct afs_stats_CMPerf {
struct afs_stats_opTimingData {
afs_int32 numOps; /*Number of operations executed */
afs_int32 numSuccesses; /*Number of successful ops */
- osi_timeval_t sumTime; /*Sum of sample timings */
- osi_timeval_t sqrTime; /*Sum of squares of sample timings */
- osi_timeval_t minTime; /*Minimum timing value observed */
- osi_timeval_t maxTime; /*Minimum timing value observed */
+ osi_timeval32_t sumTime; /*Sum of sample timings */
+ osi_timeval32_t sqrTime; /*Sum of squares of sample timings */
+ osi_timeval32_t minTime; /*Minimum timing value observed */
+ osi_timeval32_t maxTime; /*Minimum timing value observed */
};
/*
@@ -914,10 +917,10 @@ struct afs_stats_opTimingData {
struct afs_stats_xferData {
afs_int32 numXfers; /*Number of successful xfers */
afs_int32 numSuccesses; /*Number of successful xfers */
- osi_timeval_t sumTime; /*Sum of timing values */
- osi_timeval_t sqrTime; /*Sum of squares of timing values */
- osi_timeval_t minTime; /*Minimum xfer time recorded */
- osi_timeval_t maxTime; /*Maximum xfer time recorded */
+ osi_timeval32_t sumTime; /*Sum of timing values */
+ osi_timeval32_t sqrTime; /*Sum of squares of timing values */
+ osi_timeval32_t minTime; /*Minimum xfer time recorded */
+ osi_timeval32_t maxTime; /*Maximum xfer time recorded */
afs_int32 sumBytes; /*Sum of KBytes transferred */
afs_int32 minBytes; /*Minimum value observed */
afs_int32 maxBytes; /*Maximum value observed */
Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.init 30 Jun 2010 18:31:08 -0000 1.2
+++ openafs.init 16 Jan 2012 22:03:25 -0000 1.3
@@ -79,7 +79,10 @@
action $"Loading AFS kernel module: " /sbin/modprobe openafs
RETVAL=$?
- [ $RETVAL -eq 0 ] || return $RETVAL
+ if [ $RETVAL -ne 0 ] ; then
+ logger -p daemon.error "OpenAFS Kernel Module didn't load in the init script. Do you have it installed?"
+ return $RETVAL
+ fi
touch /var/lock/subsys/openafs
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openafs.spec 6 Jan 2012 23:40:41 -0000 1.14
+++ openafs.spec 16 Jan 2012 22:03:25 -0000 1.15
@@ -15,7 +15,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 0.%{pre}%{?dist}
+Release: 0.%{pre}.1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -32,6 +32,10 @@
Patch0: openafs-1.6.0-fPIC.patch
+# Already merged in master, awaiting 1.6.
+Patch1: openafs-1.6.0-setserverprefs.patch
+Patch2: openafs-1.6.0-xstat-cm-test.patch
+
%description
The AFS distributed filesystem. AFS is a distributed filesystem
allowing cross-platform sharing of files among multiple computers.
@@ -97,6 +101,8 @@
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
+# These patches are already merged in master.
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -321,6 +327,11 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
+- Log an error if we couldn't load the kernel module (RF BZ #2006)
+- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
+- Fix xstat_cm_test (http://gerrit.openafs.org/5237)
+
* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
12 years, 9 months
rpms/mame/F-15 .cvsignore, 1.46, 1.47 mame.spec, 1.54, 1.55 sources, 1.46, 1.47
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27137
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Jan 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u6-1
- Updated to 0.144u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 10 Jan 2012 13:34:09 -0000 1.46
+++ .cvsignore 16 Jan 2012 08:33:49 -0000 1.47
@@ -4,3 +4,4 @@
0144u3_diff.zip
0144u4_diff.zip
0144u5_diff.zip
+0144u6_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mame.spec 10 Jan 2012 13:34:09 -0000 1.54
+++ mame.spec 16 Jan 2012 08:33:49 -0000 1.55
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-%global sourceupdate 5
+%global sourceupdate 6
Name: mame
%if 0%{?sourceupdate}
@@ -27,7 +27,7 @@
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
-#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
+Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
@@ -250,6 +250,9 @@
%changelog
+* Mon Jan 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u6-1
+- Updated to 0.144u6
+
* Tue Jan 10 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u5-1
- Updated to 0.144u5
- Fixed building with gcc-4.7
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 10 Jan 2012 13:34:09 -0000 1.46
+++ sources 16 Jan 2012 08:33:49 -0000 1.47
@@ -4,3 +4,4 @@
5bb7dbbb8e37b151dce8f4824a95ed12 0144u3_diff.zip
fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip
2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip
+006609c0896cb3c2d65d501123e277be 0144u6_diff.zip
12 years, 9 months